[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via eace58b539a s3:waf: Fix the detection of makdev() macro on Linux via e1ba84a5f22 s3:torture: Improve the debug message output via 9b1d79a5dd5 s3:torture: Move the init of the locking out of the loop via 16331870eed s3:smbd: Make clear that we got a suicide packet via 3eee4394cb6 libcli: Use a define for the SMB_SUICIDE_PACKET from 261ef9d5b62 dbcheck: fix the err_empty_attribute() check https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit eace58b539a382c61edd7c2be6fdfab31114719f Author: Andreas Schneider Date: Thu Mar 21 11:55:46 2019 +0100 s3:waf: Fix the detection of makdev() macro on Linux BUG: https://bugzilla.samba.org/show_bug.cgi?id=13853 Signed-off-by: Andreas Schneider Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Thu Mar 21 21:40:20 UTC 2019 on sn-devel-144 commit e1ba84a5f2217a0391d1ca0678e4b36c3e17b9f3 Author: Andreas Schneider Date: Thu Mar 21 11:55:26 2019 +0100 s3:torture: Improve the debug message output Signed-off-by: Andreas Schneider Reviewed-by: Jeremy Allison commit 9b1d79a5dd5e7caf967cf49936d2eb52175e85cf Author: Andreas Schneider Date: Thu Mar 21 11:55:01 2019 +0100 s3:torture: Move the init of the locking out of the loop Signed-off-by: Andreas Schneider Reviewed-by: Jeremy Allison commit 16331870eed8281cb85d9ea09858f14ae2b29329 Author: Andreas Schneider Date: Thu Mar 21 11:17:58 2019 +0100 s3:smbd: Make clear that we got a suicide packet Signed-off-by: Andreas Schneider Reviewed-by: Jeremy Allison commit 3eee4394cb6392f779db3ba9df3a1ab28562a7f3 Author: Andreas Schneider Date: Thu Mar 21 11:21:21 2019 +0100 libcli: Use a define for the SMB_SUICIDE_PACKET Signed-off-by: Andreas Schneider Reviewed-by: Jeremy Allison --- Summary of changes: libcli/smb/smbXcli_base.c | 2 +- libcli/smb/smbXcli_base.h | 2 ++ source3/smbd/process.c | 7 --- source3/torture/test_cleanup.c | 15 +-- source3/wscript| 3 +++ 5 files changed, 19 insertions(+), 10 deletions(-) Changeset truncated at 500 lines: diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c index 9105b7c84a4..d12e63902d9 100644 --- a/libcli/smb/smbXcli_base.c +++ b/libcli/smb/smbXcli_base.c @@ -591,7 +591,7 @@ struct tevent_req *smbXcli_conn_samba_suicide_send(TALLOC_CTX *mem_ctx, return NULL; } state->conn = conn; - SIVAL(state->buf, 4, 0x74697865); + SIVAL(state->buf, 4, SMB_SUICIDE_PACKET); SCVAL(state->buf, 8, exitcode); _smb_setlen_nbt(state->buf, sizeof(state->buf)-4); diff --git a/libcli/smb/smbXcli_base.h b/libcli/smb/smbXcli_base.h index a7256490bd1..a132fbe95af 100644 --- a/libcli/smb/smbXcli_base.h +++ b/libcli/smb/smbXcli_base.h @@ -21,6 +21,8 @@ #ifndef _SMBXCLI_BASE_H_ #define _SMBXCLI_BASE_H_ +#define SMB_SUICIDE_PACKET 0x74697865 + struct smbXcli_conn; struct smbXcli_session; struct smbXcli_tcon; diff --git a/source3/smbd/process.c b/source3/smbd/process.c index 99693ed1315..d6545101f01 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -44,6 +44,7 @@ #include "system/threads.h" #include "lib/pthreadpool/pthreadpool_tevent.h" #include "util_event.h" +#include "libcli/smb/smbXcli_base.h" /* Internal message queue for deferred opens. */ struct pending_message_list { @@ -1980,11 +1981,11 @@ static void process_smb(struct smbXsrv_connection *xconn, /* special magic for immediate exit */ if ((nread == 9) && - (IVAL(inbuf, 4) == 0x74697865) && + (IVAL(inbuf, 4) == SMB_SUICIDE_PACKET) && lp_parm_bool(-1, "smbd", "suicide mode", false)) { uint8_t exitcode = CVAL(inbuf, 8); - DEBUG(1, ("Exiting immediately with code %d\n", - (int)exitcode)); + DBG_WARNING("SUICIDE: Exiting immediately with code %d\n", + (int)exitcode); exit(exitcode); } diff --git a/source3/torture/test_cleanup.c b/source3/torture/test_cleanup.c index 8efdf35e080..4ee52d4c017 100644 --- a/source3/torture/test_cleanup.c +++ b/source3/torture/test_cleanup.c @@ -281,6 +281,11 @@ bool run_cleanup3(int dummy) { create_duplicate_batch, "create_duplicate_batch" }, }; + if (!locking_init()) { + printf("locking_init failed\n"); + return false; + } + printf("CLEANUP3: Checking that a share mode is cleaned up on " "conflict\n"); @@ -293,13
autobuild[sn-devel-184]: intermittent test failure detected
The autobuild test system (on sn-devel-184) has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: https://git.samba.org/autobuild.flakey.sn-devel-184/2019-03-21-2103/flakey.log The failure seems to be in the "tdb" suite, whose build logs are available here: https://git.samba.org/autobuild.flakey.sn-devel-184/2019-03-21-2103/tdb.stderr https://git.samba.org/autobuild.flakey.sn-devel-184/2019-03-21-2103/tdb.stdout The top commit at the time of the failure was: commit 261ef9d5b62f0d49f858717e6d8b4b41f008efb5 Author: Stefan Metzmacher Date: Tue Mar 19 13:16:59 2019 +0100 dbcheck: fix the err_empty_attribute() check ldb.bytes('') == '' is never True in python3, we nee ldb.bytes('') == b'' in order to check that on attribute has an empty value, that seems to work for python2 and python3. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13843 Signed-off-by: Stefan Metzmacher Reviewed-by: Noel Power Autobuild-User(master): Stefan Metzmacher Autobuild-Date(master): Thu Mar 21 18:15:20 UTC 2019 on sn-devel-144 and the last 50 lines of the stdout log were: shell test: BINDIR=bin test/test_tdbbackup.sh test/jenkins-be-hash.tdb time: 2019-03-21 21:03:23.940842Z test: bin/tdbbackup time: 2019-03-21 21:03:23.958357Z success: normal tdbbackup on tdb file time: 2019-03-21 21:03:23.996938Z test: cmp time: 2019-03-21 21:03:24.060728Z success: cmp between tdbdumps of original and backup time: 2019-03-21 21:03:24.091288Z test: bin/tdbbackup time: 2019-03-21 21:03:24.102730Z success: readonly tdbbackup on tdb file time: 2019-03-21 21:03:24.116720Z test: cmp time: 2019-03-21 21:03:24.140534Z success: cmp between tdbdumps of original and back dbs ...tdb1-run-3G-file ...tdb1-run-bad-tdb-header ...tdb1-run ...tdb1-run-check ...tdb1-run-corrupt ...tdb1-run-die-during-transaction ...tdb1-run-endian ...tdb1-run-incompatible ...tdb1-run-nested-transactions ...tdb1-run-nested-traverse ...tdb1-run-no-lock-during-traverse ...tdb1-run-oldhash ...tdb1-run-open-during-transaction ...tdb1-run-readonly-check ...tdb1-run-rescue ...tdb1-run-rescue-find_entry ...tdb1-run-rdlock-upgrade ...tdb1-run-rwlock-check ...tdb1-run-summary ...tdb1-run-transaction-expand ...tdb1-run-traverse-in-transaction ...tdb1-run-wronghash-fail ...tdb1-run-zero-append ...tdb1-run-fcntl-deadlock ...tdb1-run-marklock-deadlock ...tdb1-run-allrecord-traverse-deadlock tdb1-run-allrecord-traverse-deadlock failed: marklock-deadlock-fcntl.tdb tests done .do_allrecord_lock: traverse should fail ..ret should succeed .Running Python test with /usr/bin/python3: python/tests/simple.py python testsuite returned 0 Makefile:17: recipe for target 'test' failed
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 261ef9d5b62 dbcheck: fix the err_empty_attribute() check via dd6f0dad218 dbcheck: use the str() value of the "name" attribute from 52bf5c25261 s3:script: Fix running cp in modprinter.pl https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 261ef9d5b62f0d49f858717e6d8b4b41f008efb5 Author: Stefan Metzmacher Date: Tue Mar 19 13:16:59 2019 +0100 dbcheck: fix the err_empty_attribute() check ldb.bytes('') == '' is never True in python3, we nee ldb.bytes('') == b'' in order to check that on attribute has an empty value, that seems to work for python2 and python3. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13843 Signed-off-by: Stefan Metzmacher Reviewed-by: Noel Power Autobuild-User(master): Stefan Metzmacher Autobuild-Date(master): Thu Mar 21 18:15:20 UTC 2019 on sn-devel-144 commit dd6f0dad218ec1d5aa38ea8aa6848ec81035cb3f Author: Stefan Metzmacher Date: Tue Mar 19 13:05:16 2019 +0100 dbcheck: use the str() value of the "name" attribute We do the same with the rdn attribute value and we need the same logic on both in order to check they are the same. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13816 Signed-off-by: Stefan Metzmacher Reviewed-by: Noel Power --- Summary of changes: python/samba/dbchecker.py | 4 ++-- .../expected-dbcheck-link-output-lost-deleted-user1.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/python/samba/dbchecker.py b/python/samba/dbchecker.py index 98508192c10..a0500c6c578 100644 --- a/python/samba/dbchecker.py +++ b/python/samba/dbchecker.py @@ -2311,7 +2311,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base))) self.report("ERROR: Not fixing num_values(%d) for '%s' on '%s'" % (len(obj[attrname]), attrname, str(obj.dn))) else: -name_val = obj[attrname][0] +name_val = str(obj[attrname][0]) if str(attrname).lower() == str(obj.dn.get_rdn_name()).lower(): object_rdn_attr = attrname @@ -2445,7 +2445,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base))) # check for empty attributes for val in obj[attrname]: -if val == '': +if val == b'': self.err_empty_attribute(dn, attrname) error_count += 1 continue diff --git a/source4/selftest/provisions/release-4-5-0-pre1/expected-dbcheck-link-output-lost-deleted-user1.txt b/source4/selftest/provisions/release-4-5-0-pre1/expected-dbcheck-link-output-lost-deleted-user1.txt index 3c55de8fa01..1f5f2272bc1 100644 --- a/source4/selftest/provisions/release-4-5-0-pre1/expected-dbcheck-link-output-lost-deleted-user1.txt +++ b/source4/selftest/provisions/release-4-5-0-pre1/expected-dbcheck-link-output-lost-deleted-user1.txt @@ -1,7 +1,7 @@ Checking 232 objects WARNING: no target object found for GUID component link lastKnownParent in deleted object CN=fred\0ADEL:2301a64c-1234-5678-851e-12d4a711cfb4,OU=removed,DC=release-4-5-0-pre1,DC=samba,DC=corp - ;OU=removed,DC=release-4-5-0-pre1,DC=samba,DC=corp Not removing dangling one-way link on deleted object (tombstone garbage collection in progress?) -ERROR: wrong dn[CN=fred\0ADEL:2301a64c-1234-5678-851e-12d4a711cfb4,OU=removed,DC=release-4-5-0-pre1,DC=samba,DC=corp] cn='fred\nDEL:2301a64c-1234-5678-851e-12d4a711cfb4' name=b'fred\nDEL:2301a64c-1234-5678-851e-12d4a711cfb4' new_dn[CN=fred\0ADEL:2301a64c-1234-5678-851e-12d4a711cfb4,CN=Deleted Objects,DC=release-4-5-0-pre1,DC=samba,DC=corp] +ERROR: wrong dn[CN=fred\0ADEL:2301a64c-1234-5678-851e-12d4a711cfb4,OU=removed,DC=release-4-5-0-pre1,DC=samba,DC=corp] name='fred\nDEL:2301a64c-1234-5678-851e-12d4a711cfb4' new_dn[CN=fred\0ADEL:2301a64c-1234-5678-851e-12d4a711cfb4,CN=Deleted Objects,DC=release-4-5-0-pre1,DC=samba,DC=corp] Rename CN=fred\0ADEL:2301a64c-1234-5678-851e-12d4a711cfb4,OU=removed,DC=release-4-5-0-pre1,DC=samba,DC=corp to CN=fred\0ADEL:2301a64c-1234-5678-851e-12d4a711cfb4,CN=Deleted Objects,DC=release-4-5-0-pre1,DC=samba,DC=corp? [YES] Renamed CN=fred\0ADEL:2301a64c-1234-5678-851e-12d4a711cfb4,OU=removed,DC=release-4-5-0-pre1,DC=samba,DC=corp into CN=fred\0ADEL:2301a64c-1234-5678-851e-12d4a711cfb4,CN=Deleted Objects,DC=release-4-5-0-pre1,DC=samba,DC=corp WARNING: parent object not found for CN=fred\0ADEL:2301a64c-1234-5678-851e-12d4a711cfb4,OU=removed,DC=release-4-5-0-pre1,DC=samba,DC=corp -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 52bf5c25261 s3:script: Fix running cp in modprinter.pl via 883436839ae s3:script: Fix running rsync in fake_snap.pl via 312e408cfde s3:lib: Increase debug level for messaging_send_buf message from 81648d576d5 ldb: Release ldb 1.6.3 https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 52bf5c25261e343d3c1d4ea1a414ab74cf75d76c Author: Andreas Schneider Date: Thu Mar 21 16:06:05 2019 +0100 s3:script: Fix running cp in modprinter.pl We need to unset BASH_ENV or we get: Insecure $ENV{BASH_ENV} while running setgid Signed-off-by: Andreas Schneider Reviewed-by: David Disseldorp Autobuild-User(master): Andreas Schneider Autobuild-Date(master): Thu Mar 21 16:41:33 UTC 2019 on sn-devel-144 commit 883436839aeb97b68ca18ae211199faa4448b5a0 Author: Andreas Schneider Date: Thu Mar 21 14:37:28 2019 +0100 s3:script: Fix running rsync in fake_snap.pl We need to unset BASH_ENV or we get: Insecure $ENV{BASH_ENV} while running setgid This probably only happens on recent perl versions. Signed-off-by: Andreas Schneider Reviewed-by: David Disseldorp commit 312e408cfde01ae8f5aab4c269becb119385f1bf Author: Andreas Schneider Date: Thu Mar 21 10:22:26 2019 +0100 s3:lib: Increase debug level for messaging_send_buf message This is spamming the console when running 'make test' and we set the log level to 1 by default in selftest. Signed-off-by: Andreas Schneider Reviewed-by: Ralph Boehme --- Summary of changes: source3/lib/messages.c | 2 +- source3/script/tests/fake_snap.pl | 2 ++ source3/script/tests/printing/modprinter.pl | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) Changeset truncated at 500 lines: diff --git a/source3/lib/messages.c b/source3/lib/messages.c index dd19173b973..699282cff88 100644 --- a/source3/lib/messages.c +++ b/source3/lib/messages.c @@ -895,7 +895,7 @@ static int send_all_fn(pid_t pid, void *private_data) status = messaging_send_buf(state->msg_ctx, pid_to_procid(pid), state->msg_type, state->buf, state->len); if (!NT_STATUS_IS_OK(status)) { - DBG_WARNING("messaging_send_buf to %ju failed: %s\n", + DBG_NOTICE("messaging_send_buf to %ju failed: %s\n", (uintmax_t)pid, nt_errstr(status)); } diff --git a/source3/script/tests/fake_snap.pl b/source3/script/tests/fake_snap.pl index 18bbcb7142e..d88307eaecc 100755 --- a/source3/script/tests/fake_snap.pl +++ b/source3/script/tests/fake_snap.pl @@ -22,6 +22,8 @@ sub _create_snapshot my $snap_path = $base_path . "/.snapshots/\@GMT-" . $time_str; my $ret; + delete @ENV{'BASH_ENV'}; + $ENV{'PATH'} = '/bin:/usr/bin'; # untaint PATH POSIX::mkdir($base_path . "/.snapshots", 0755); diff --git a/source3/script/tests/printing/modprinter.pl b/source3/script/tests/printing/modprinter.pl index ec1ebcd7ab8..fc71e665451 100755 --- a/source3/script/tests/printing/modprinter.pl +++ b/source3/script/tests/printing/modprinter.pl @@ -131,6 +131,8 @@ if ($opt_delete && ($found_section == 0)) { die "share $share_name not found"; } +delete @ENV{'BASH_ENV'}; + $ENV{'PATH'} = '/bin:/usr/bin'; # untaint PATH system("cp", "$tmp", "$smb_conf_file"); unlink $tmp; -- Samba Shared Repository
autobuild[sn-devel-184]: intermittent test failure detected
The autobuild test system (on sn-devel-184) has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: https://git.samba.org/autobuild.flakey.sn-devel-184/2019-03-21-1610/flakey.log The failure seems to be in the "samba-ad-dc-ntvfs" suite, whose build logs are available here: https://git.samba.org/autobuild.flakey.sn-devel-184/2019-03-21-1610/samba-ad-dc-ntvfs.stderr https://git.samba.org/autobuild.flakey.sn-devel-184/2019-03-21-1610/samba-ad-dc-ntvfs.stdout The top commit at the time of the failure was: commit 81648d576d56e924945b2214ac12ca6a40679db8 Author: Andrew Bartlett Date: Mon Mar 11 10:47:30 2019 +1300 ldb: Release ldb 1.6.3 * Remove Python 2.x support except to build just the bare C library * Remove --extra-python (a build time mode to produce Python2 and Python3 bindings at the same time) Signed-off-by: Andrew Bartlett Reviewed-by: Douglas Bagnall Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Thu Mar 21 05:08:49 UTC 2019 on sn-devel-144 and the last 50 lines of the stdout log were: [216(857)/252 at 24m14s] samba4.smb.signing on with -k yes --signing=required(ad_dc_ntvfs) [217(858)/252 at 24m15s] samba4.smb.signing on with -k yes --option=gensec:fake_gssapi_krb5=yes --option=gensec:gssapi_krb5=no --signing=on(ad_dc_ntvfs) [218(859)/252 at 24m15s] samba4.smb.signing on with -k yes --option=gensec:fake_gssapi_krb5=yes --option=gensec:gssapi_krb5=no --signing=required(ad_dc_ntvfs) [219(860)/252 at 24m16s] samba4.smb.signing --signing=yes anon(ad_dc_ntvfs) [220(861)/252 at 24m17s] samba4.smb.signing --signing=required anon(ad_dc_ntvfs) [221(862)/252 at 24m18s] samba.tests.complex_expressions(ad_dc_ntvfs) [222(884)/252 at 24m28s] samba.tests.samba_tool.gpo(ad_dc_ntvfs:local) [223(896)/252 at 25m25s] samba.tests.dcerpc.registry(ad_dc_ntvfs:local) [224(899)/252 at 25m26s] samba.tests.dcerpc.dnsserver(ad_dc_ntvfs) [225(916)/252 at 25m50s] samba.tests.auth_log(ad_dc_ntvfs:local) [226(963)/252 at 26m7s] samba.tests.auth_log_pass_change(ad_dc_ntvfs) [227(971)/252 at 26m17s] samba.tests.auth_log_ncalrpc(ad_dc_ntvfs:local) [228(973)/252 at 26m18s] samba.tests.auth_log_samlogon(ad_dc_ntvfs:local) [229(974)/252 at 26m19s] samba.tests.auth_log_netlogon(ad_dc_ntvfs:local) [230(975)/252 at 26m22s] samba.tests.auth_log_netlogon_bad_creds(ad_dc_ntvfs:local) [231(979)/252 at 26m26s] samba.tests.password_hash_fl2008(ad_dc_ntvfs:local) [232(983)/252 at 26m29s] samba.tests.krb5_credentials(ad_dc_ntvfs) [233(986)/252 at 26m32s] samba.tests.py_credentials(ad_dc_ntvfs) [234(994)/252 at 26m39s] samba.tests.emulate.traffic(ad_dc_ntvfs) [235(996)/252 at 26m39s] samba.tests.emulate.traffic_packet(ad_dc_ntvfs) [236(1085)/252 at 28m41s] samba.tests.blackbox.traffic_replay(ad_dc_ntvfs) [237(1090)/252 at 29m17s] samba.tests.blackbox.traffic_learner(ad_dc_ntvfs) [238(1092)/252 at 29m18s] samba.tests.blackbox.traffic_summary(ad_dc_ntvfs) [239(1092)/252 at 29m19s] samba.tests.blackbox.smbcontrol(ad_dc_ntvfs:local) [240(1094)/252 at 29m22s] samba4.urgent_replication.python(ad_dc_ntvfs)(ad_dc_ntvfs:local) [241(1102)/252 at 29m30s] samba4.ldap.match_rules.python(ad_dc_ntvfs) [242(1136)/252 at 30m4s] samba4.ldap.notification.python(ad_dc_ntvfs)(ad_dc_ntvfs) UNEXPECTED(failure): samba4.ldap.notification.python(ad_dc_ntvfs).__main__.LDAPNotificationTest.test_simple_search(ad_dc_ntvfs) REASON: Exception: Exception: Traceback (most recent call last): File "/memdisk/autobuild/fl/b1258654/samba-ad-dc-ntvfs/source4/dsdb/tests/python/notification.py", line 151, in test_simple_search self.assertIsNotNone(msg3) AssertionError: unexpectedly None FAILED (1 failures, 0 errors and 0 unexpected successes in 0 testsuites) A summary with detailed information can be found in: ./bin/ab/summary TOP 10 slowest tests samba.tests.emulate.traffic_packet(ad_dc_ntvfs) -> 122 samba4.raw.notify(ad_dc_ntvfs) -> 115 samba4.ntvfs.cifs.krb5.base.deny2(ad_dc_ntvfs) -> 60 samba4.base.deny2(ad_dc_ntvfs) -> 59 samba.tests.samba_tool.gpo(ad_dc_ntvfs:local) -> 57 samba4.ntvfs.cifs.krb5.base.deny1(ad_dc_ntvfs) -> 55 samba4.base.deny1(ad_dc_ntvfs) -> 54 samba4.raw.oplock(ad_dc_ntvfs) -> 51 samba4.ntvfs.cifs.krb5.base.delete(ad_dc_ntvfs) -> 50 samba4.smb2.oplock(ad_dc_ntvfs) -> 48 ERROR: test failed with exit code 1 Makefile:16: recipe for target 'test' failed
[SCM] Socket Wrapper Repository - annotated tag socket_wrapper-1.2.3 created
The annotated tag, socket_wrapper-1.2.3 has been created at 02eb2ca0d325d4f00b72c3b51714d3a819c5edb3 (tag) tagging 344801fda7b2b50b1139056168b470ad656c20b5 (commit) replaces socket_wrapper-1.2.2 tagged by Andreas Schneider on Thu Mar 21 15:01:14 2019 +0100 - Log - socket_wrapper-1.2.3 * Fixed missing NULL check for socket_wrapper_dir() * Fixes building in Samba source tree -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEjf9T4Y8qvI2PPJIjfuD8TcwBTj0FAlyTmUAACgkQfuD8TcwB Tj31MQ/+NyPb7CLsBCMPxgE/ARH4E4mr/zGndI9A3mypQaIqPFmP+4WrLDk69/K/ sM7MK12xF+3CYjvXLWDhL41jKg/7h0o//U9kcNpeECVbW4VP/shPD19DDn8gAxNA otr2N3rBdFHdbYv8H4x1bj0+remFM2TP5F57ezU1NhKn5rkWfRcdR/V14ozqiVty gYIlM3eYz+GWFsM2XtQE/kd7YAqL04YK1PUCJ9wkBrkHC0Ib8Wfv0BJp2IIoWwic KzMmSG3GhU5qKBRHbHcuv2CN7w/ZYY4zhJIWZqJ12JgxRzMMcn8X7DNFIgWlR3hT o/+nN3MXJmdUXqsMdXXFfotgUoIiCz4yIMqGUDMoppBz0O7/xt9KVs1eztw+ODPy 10sYGveqTiV/PpKndFJjdqHGpv2ENYsM3XChNKruuNpsNp1fZK3u4s6GytkCC7lF 6stCq8LsiWZdiAF0tgOS+4ZyGBOPfyvWk57K4Wokxkw147zkCuis03wXusBaVQc7 fPzz/+QXavwO8u/JjPYAdySvKvlOFi3NIdsQoc+f3HQ3B49+g+KWTnmVUpeasSGV KGjDGOhAUFphPsvAFzDPVtwndNJbVYs94bWPv92BIJ6Aye57b1yGX7N3kUFA67U9 J+8MM0FPkIID25qQMtnXsJNU/4O97Ow0dVG7leI7b0TcWglPM1c= =sw1W -END PGP SIGNATURE- Andreas Schneider (4): swrap: Print a warning if SOCKET_WRAPPER_DIR is not set swrap: Add missing NULL checks to socket_wrapper_dir() Bump version to 1.2.3 swrap: Do not leak buf in swrap_sendmsg() --- -- Socket Wrapper Repository
[SCM] Socket Wrapper Repository - branch master updated
The branch, master has been updated via 344801f swrap: Do not leak buf in swrap_sendmsg() from 44d9c59 Bump version to 1.2.3 https://git.samba.org/?p=socket_wrapper.git;a=shortlog;h=master - Log - commit 344801fda7b2b50b1139056168b470ad656c20b5 Author: Andreas Schneider Date: Thu Mar 21 14:59:30 2019 +0100 swrap: Do not leak buf in swrap_sendmsg() Signed-off-by: Andreas Schneider Reviewed-by: Ralph Boehme --- Summary of changes: src/socket_wrapper.c | 1 + 1 file changed, 1 insertion(+) Changeset truncated at 500 lines: diff --git a/src/socket_wrapper.c b/src/socket_wrapper.c index 5b82e0c..a9e2a75 100644 --- a/src/socket_wrapper.c +++ b/src/socket_wrapper.c @@ -5910,6 +5910,7 @@ static ssize_t swrap_sendmsg(int s, const struct msghdr *omsg, int flags) swrap_dir = socket_wrapper_dir(); if (swrap_dir == NULL) { + free(buf); return -1; } -- Socket Wrapper Repository
[SCM] Socket Wrapper Repository - branch master updated
The branch, master has been updated via 44d9c59 Bump version to 1.2.3 via 51d8982 swrap: Add missing NULL checks to socket_wrapper_dir() via b8dc4da swrap: Print a warning if SOCKET_WRAPPER_DIR is not set from a3a3dca Bump version to 1.2.2 https://git.samba.org/?p=socket_wrapper.git;a=shortlog;h=master - Log - commit 44d9c597963c49b739c40f6364b7882eb890f194 Author: Andreas Schneider Date: Thu Mar 21 14:18:12 2019 +0100 Bump version to 1.2.3 Signed-off-by: Andreas Schneider Reviewed-by: Ralph Boehme commit 51d8982627f0da1715d196fd75ec17d6579a57b0 Author: Andreas Schneider Date: Thu Mar 21 14:09:37 2019 +0100 swrap: Add missing NULL checks to socket_wrapper_dir() This return either malloc'ed memory or NULL. Make sure there is no problem. Signed-off-by: Andreas Schneider Reviewed-by: Ralph Boehme commit b8dc4da6cb4903fce8f7b468c17caf12e3394c6b Author: Andreas Schneider Date: Thu Mar 21 14:09:19 2019 +0100 swrap: Print a warning if SOCKET_WRAPPER_DIR is not set Signed-off-by: Andreas Schneider Reviewed-by: Ralph Boehme --- Summary of changes: CMakeLists.txt | 4 ++-- ChangeLog| 4 src/socket_wrapper.c | 20 3 files changed, 26 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/CMakeLists.txt b/CMakeLists.txt index ab7254c..ef14e57 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules") include(DefineCMakeDefaults) include(DefineCompilerFlags) -project(socket_wrapper VERSION 1.2.2 LANGUAGES C) +project(socket_wrapper VERSION 1.2.3 LANGUAGES C) # global needed variables set(APPLICATION_NAME ${PROJECT_NAME}) @@ -23,7 +23,7 @@ set(APPLICATION_NAME ${PROJECT_NAME}) # Increment AGE. Set REVISION to 0 # If the source code was changed, but there were no interface changes: # Increment REVISION. -set(LIBRARY_VERSION "0.1.12") +set(LIBRARY_VERSION "0.1.13") set(LIBRARY_SOVERSION "0") # add definitions diff --git a/ChangeLog b/ChangeLog index d0a7285..04a4245 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ ChangeLog == +version 1.2.3 (released 2019-03-21) + * Fixed missing NULL check for socket_wrapper_dir() + * Fixes building in Samba source tree + version 1.2.2 (released 2019-03-21) * Added environment variable to disable deep binding * Fixed installation of socket_wrapper diff --git a/src/socket_wrapper.c b/src/socket_wrapper.c index 7841c85..5b82e0c 100644 --- a/src/socket_wrapper.c +++ b/src/socket_wrapper.c @@ -1288,6 +1288,7 @@ static char *socket_wrapper_dir(void) char *s = getenv("SOCKET_WRAPPER_DIR"); if (s == NULL) { + SWRAP_LOG(SWRAP_LOG_WARN, "SOCKET_WRAPPER_DIR not set\n"); return NULL; } @@ -1818,6 +1819,10 @@ static int convert_in_un_remote(struct socket_info *si, const struct sockaddr *i } swrap_dir = socket_wrapper_dir(); + if (swrap_dir == NULL) { + errno = EINVAL; + return -1; + } if (is_bcast) { snprintf(un->sun_path, sizeof(un->sun_path), @@ -1988,6 +1993,10 @@ static int convert_in_un_alloc(struct socket_info *si, const struct sockaddr *in } swrap_dir = socket_wrapper_dir(); + if (swrap_dir == NULL) { + errno = EINVAL; + return -1; + } if (prt == 0) { /* handle auto-allocation of ephemeral ports */ @@ -3582,6 +3591,11 @@ static int swrap_auto_bind(int fd, struct socket_info *si, int family) } swrap_dir = socket_wrapper_dir(); + if (swrap_dir == NULL) { + errno = EINVAL; + ret = -1; + goto done; + } for (i = 0; i < SOCKET_MAX_SOCKETS; i++) { port = autobind_start + i; @@ -5387,6 +5401,9 @@ static ssize_t swrap_sendto(int s, const void *buf, size_t len, int flags, type = SOCKET_TYPE_CHAR_UDP; swrap_dir = socket_wrapper_dir(); + if (swrap_dir == NULL) { + return -1; + } for(iface=0; iface <= MAX_WRAPPED_INTERFACES; iface++) { snprintf(un_addr.sa.un.sun_path, @@ -5892,6 +5909,9 @@ static ssize_t swrap_sendmsg(int s, const struct msghdr *omsg, int flags) type = SOCKET_TYPE_CHAR_UDP; swrap_dir = socket_wrapper_dir(); + if (swrap_dir == NULL) { + return -1; + } for(iface=0; iface <= MAX_WRAPPED_INTERFACES; iface++) { snprintf(un_addr.sun_path, sizeof(un_addr.sun_path),
[SCM] Samba Website Repository - branch master updated
The branch, master has been updated via 3d0f865 docs: move "implementing cifs" to "older docs" via 8614240 docs: add link to man pages again from 6873e01 Add Samba 4.10.0. https://git.samba.org/?p=samba-web.git;a=shortlog;h=master - Log - commit 3d0f86520f5de42de3876eecd4f426916d621c0f Author: Björn Jacke Date: Thu Mar 21 13:26:55 2019 +0100 docs: move "implementing cifs" to "older docs" Björn commit 8614240a7d3fac015862803e5963bbab7c3aa60d Author: Björn Jacke Date: Thu Mar 21 13:26:02 2019 +0100 docs: add link to man pages again Björn --- Summary of changes: docs/index.html | 13 - 1 file changed, 4 insertions(+), 9 deletions(-) Changeset truncated at 500 lines: diff --git a/docs/index.html b/docs/index.html index 9194934..39e5cd7 100755 --- a/docs/index.html +++ b/docs/index.html @@ -15,20 +15,15 @@ earlier version of Samba then you may find some differences. Samba. https://wiki.samba.org/index.php/Presentations;>Presentations by Samba Team members - - http://www.ubiqx.org/cifs/;>Implementing CIFS; an - on-line book describing the workings and implementation - of the CIFS protocol suite. + Samba man pages in html Samba Licensing (GNU GPL) Older (but hopefully still valid) misc docs + http://www.ubiqx.org/cifs/;>Implementing CIFS; an + on-line book describing the workings and implementation + of the CIFS protocol suite. PDF version of the Troubleshooting Techniques chapter from the second edition of Sam's Teach Yourself Samba in 24 Hours -- Samba Website Repository
[SCM] Samba Shared Repository - annotated tag ldb-1.6.3 created
The annotated tag, ldb-1.6.3 has been created at 7ef2603bca114ff6c157516ab64936b00ecd5878 (tag) tagging 81648d576d56e924945b2214ac12ca6a40679db8 (commit) replaces tevent-0.10.0 tagged by Stefan Metzmacher on Thu Mar 21 11:16:15 2019 +0100 - Log - ldb: tag release ldb-1.6.3 -BEGIN PGP SIGNATURE- iQEzBAABCgAdFiEEkUejOXGVGO6QEby1R5ORYRMIQCUFAlyTZG8ACgkQR5ORYRMI QCUEPAf+OhCck99hwhPoN8kbk2uQMsF9GYMeJZg1J6Zb3D+Osu7wgPRhvOgizyhD X8XYVFyk2FVBZW25eHOcNEOkis5rqMg//mtsY6wHuYOpH6htiqn0dCquweOMN5E6 veTtlR5+6zQby8E4cYAAWpfqeOnCOklXIYlA97neld7Ds0GdyXK8HP5YBQqAIE7/ tXPvFVENF6Q9j5e97tHRx9Kt2YMbyVK0dqjIe79Pidft/FEU4gQC5ozT91rciok/ dzsXkuqkbl+xQqSr9XYpNDYCc6xioIztKJC0UC9F3xNrvZmnFJP6fBHlJ/g98spf wYwtYv3DMtxdtK0ORQGT1bTLJf19sA== =WG50 -END PGP SIGNATURE- Andrew Bartlett (1): ldb: Release ldb 1.6.3 --- -- Samba Shared Repository
[SCM] Samba Shared Repository - annotated tag tevent-0.10.0 created
The annotated tag, tevent-0.10.0 has been created at fa5587d230bb41396e3630574448054804667ba4 (tag) tagging 6f2278018436184785e19f69efc60ec408b14aa7 (commit) replaces tdb-1.4.0 tagged by Stefan Metzmacher on Thu Mar 21 11:15:38 2019 +0100 - Log - tevent: tag release tevent-0.10.0 -BEGIN PGP SIGNATURE- iQEzBAABCgAdFiEEkUejOXGVGO6QEby1R5ORYRMIQCUFAlyTZEoACgkQR5ORYRMI QCVjHAgAiT55J/spNfBGT4Uj0PMkxmzFLMHKQKOADqMSWLrHC5/u5mJ7UTaZORH3 thogvx1MBSwkh5GdKgUDDNqBWGxPyL1BS2NvnpnN7+UxRyPtq/URDtIJnkAouH/c 3G1ELRRTCo1meQzYHclJXOEXy7zHqbqZGWzRTBgTx1yfkaegnxfwFMnPi3IjjYm9 0EL15pHMROKzo0JDx3I8JyxCUWjFAoNIx3tWWEK9AmGk8mbaTSq/JYQxP4nY1LrF 2yCs1waMmHXlDN5h6SZevhWQQn6LrJfdmmFBmXzm+q00tm8IRLs0qUOsRCsirMaJ Za/2Npw/gXVWjE4QqEU84fu5vcnhpg== =Mx1G -END PGP SIGNATURE- Andrew Bartlett (1): tevent: Release tevent 0.10.0 --- -- Samba Shared Repository
[SCM] Samba Shared Repository - annotated tag tdb-1.4.0 created
The annotated tag, tdb-1.4.0 has been created at 432055298027f1d5438201f9dbcac7ebb153f0b6 (tag) tagging fe69d807eae06cb041f25c2dfe351d4e25d541cd (commit) replaces talloc-2.2.0 tagged by Stefan Metzmacher on Thu Mar 21 11:14:24 2019 +0100 - Log - tdb: tag release tdb-1.4.0 -BEGIN PGP SIGNATURE- iQEzBAABCgAdFiEEkUejOXGVGO6QEby1R5ORYRMIQCUFAlyTZAAACgkQR5ORYRMI QCVoJAf+Ju/rV+QyT2HmMRVZacKFrXdkuqMwcevgsYAObuUAQ2juQLlb/IM+wuSa gqSCBqHCltPMJySOladcly+712u/iyry65GfeENXJ9jH9P75GtzmldZmq6c/9Nuj 1d7gr4ei7F1sQN7m1ua1fnTe0wP0KHfMSUGokIcOQitn8nWs2ccj0pcR37B0q3Wo KVxDtj5PjGKjBC7rDoqWgSPK1ddOo+iIKRaJhWj1tCwlryVqVex6BnnoXJaniTIj 33wyk1C8yrWJ0lOEEFn37DeYsFTk+086VB7CT8CxlHdXJN7yavhneGP7km3LvEKQ nDAv69u7R9aiS5uPOJSKHtS8UFH+yA== =AfHt -END PGP SIGNATURE- Andrew Bartlett (1): tdb: Release tdb 1.4.0 --- -- Samba Shared Repository
[SCM] Samba Shared Repository - annotated tag talloc-2.2.0 created
The annotated tag, talloc-2.2.0 has been created at b1b036668f28e9b759bc02204492ca05ae2c7118 (tag) tagging b80140ba00282ce67f7d394bbf684e726df1126e (commit) replaces ldb-1.6.2 tagged by Stefan Metzmacher on Thu Mar 21 11:13:42 2019 +0100 - Log - talloc: tag release talloc-2.2.0 -BEGIN PGP SIGNATURE- iQEzBAABCgAdFiEEkUejOXGVGO6QEby1R5ORYRMIQCUFAlyTY9YACgkQR5ORYRMI QCXmewgAiVETBLZ6yxjEpb4BScA+vE5OqrolmKZEnZM1aaLc1cWyK36QCJvDlnZa LFhbbpvTIJz4g4kD3ldUE9sTgNSuuJNoMmDu3O8kCVEiiKnOmvUyY1e2e910Jv2R yX+N5QhGzuW6cjM+uaXAnPzDW9hyx/GGCGNUAEFq1FiVWEu8Y8imIzj/8kgtpobo im84qa4G/f/tBP6bfGEDe7Tk9LNRU36M4TyfztNuRN8reKX0con4OOJaukq3fwmI gXMFF9mCSgmoY8tv23YWt1+EdOUaYIQdTTw8OB5B0jYK1uLK2JUCokJ5z4lcxlYn Ffy5xL5BGpI97zbBI3j0IEFVlKpXpg== =DP1W -END PGP SIGNATURE- Aaron Haslett (1): tests: Reduce likelihood of auth_log test locking up during CI Amitay Isaacs (2): ctdb-daemon: Fix maybe-uninitialized error with picky developer ctdb-version: Simplify version string usage Andreas Schneider (22): libcli:smb: Zero sensitive memory after use auth:gensec: Make sure we zero the checksum after use libcli:auth: Avoid explicit ZERO_STRUCT lib:crypto: Include only the required header files krb5_wrap: Only use the required md4 header libcli:auth: Only use the required md4 header libcli:auth: Only use the required md4 header s4:dsdb: Only use the required md4 header file s4:dsdb: Only use the required md4 and md5 header files libcli:samsync: Remove unused header file s4:dsdb: Remove unused header file s4:torture: Remove unused header file libcli:auth: Remove unused header file s4:torture: Make sure we do not create a shadow 'struct params' lib:util: Move debug message for mkdir failing to log level 1 s3:script: Fix jobid check in test_smbspool.sh s3:client: Pass DEVICE_URI and AUTH_INFO_REQUIRED env to smbspool s3:client: Evaluate the AUTH_INFO_REQUIRED variable set by cups s3:client: Make sure we work on a copy of the title s3:client: Fix smbspool device uri handling talloc: Fix alignment issues for casting pointers s4:librpc: Fix installation of Samba Andrew Bartlett (22): dsdb: Unify samdb_{get,set}_ntds_{objectGUID,invocation_id} kcc: Give a better error message when samdb_ntds_objectGUID fails dsdb: Provide better error strings in rootdse GUID attribute handling s4-server: Open and close a transaction on sam.ldb at startup modules: Add dependency on tirpc to vfs_nfs4acl_xattr samba-tool domain provision: Fix --interactive module in python3 build: Allow build when --disable-gnutls is set regfio: Update code near recent changes to match README.Coding regfio tests: Update comment style to match README.Coding pytalloc: Remove deprecated pytalloc_CObject_FromTallocPtr() build: Remove --extra-python build: Remove bld.gen_python_environments() selftest: Remove support for running multiple tests against python versions in a single run selftest: Remove obsolete py3_compatible=True markers selftest: Remove mention of --extra-python from comment build: Remove distinct .py3 ABI files ABI: Remove unused .py3*.sigs files build: Do not make python mandatory to build build: Set default minimum python version to 3.4.0 build: Remove manual specification of minimum python version build: Standardise on calling conf.SAMBA_CHECK_PYTHON() in libraries talloc: Release talloc 2.2.0 Björn Jacke (1): wafbuild: create missing private library symlinks on platforms without soname support for shared libs Christof Schmitt (4): lib/winbind_util: Move include out of ifdef lib/winbind_util: Remove winbind_[gu]id_to_sid lib/winbind_util: Add winbind_xid_to_sid for --without-winbind passdb: Increase ABI version to 0.28.0 David Disseldorp (8): vfs_ceph: add missing fallocate hook vfs_ceph: fix strict_allocate_ftruncate() vfs_ceph: remove ceph_fallocate/ceph_ftruncate fallback vfs_ceph: drop ifdef HAVE_FCHOWN/_FCHMOD docs: fix minor typo in smb.conf "log level" section ctdb_mutex_ceph_rados_helper: revert strtoull_err() usage vfs: drop lseek stat-open checks smbd: fix check_parent_access() talloc stackframe leaks Douglas Bagnall (23): s4/auth/krb: fix spelling of entries dns_hub: use python 3 shebang tests/rodc_rwdc: p.communicate() gives bytes, not str dsdb:util_links: count el->values with unsigned int dsdb/group_audit: use common get_parsed_dns_trusted() replmd/la: disambiguate error messages a bit dsdb/pytests: sanity checks for links under subtree renames dsdb:replmd: add compatible feature helper function dsdb: linked_attributes module knows about
[SCM] Socket Wrapper Repository - annotated tag socket_wrapper-1.2.2 created
The annotated tag, socket_wrapper-1.2.2 has been created at 66049e6b1c6afeb64067250f53dc1b3f03ba2db5 (tag) tagging a3a3dcac39fd9b477c497810f8c1512a2f449b8e (commit) replaces socket_wrapper-1.2.1 tagged by Andreas Schneider on Thu Mar 21 09:57:20 2019 +0100 - Log - socket_wrapper-1.2.1 * Added environment variable to disable deep binding * Fixed installation of socket_wrapper * Fixed several small bugs -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEjf9T4Y8qvI2PPJIjfuD8TcwBTj0FAlyTUgQACgkQfuD8TcwB Tj16BA//a+dg2yqmvhK7AM10Lo7xJ2fxSRUbkLtHWMPsy+GhWR+CoTvuHSIi2EZq e6Zv+QZpEyLlrp4BXeJczo5R3haprXxXsKsq7HOEZSuI4pUZzq2ER2Xw5beYYTUX SNP+kV4u6Swb4mRYq0UvdozzT/pZMaR8B5tck3H1Ya4tQ2Pg4ZU+pSpt/nOqO7qk IKnKeRmGbuQr345+TMTYHaTL4rgEbxIxDbs4zR1gdIdKEDEWBET22GVVM5mc/g3h Rv6LgbK3Vy5Ma/zbEvQO0zWDdecQiTthH4pbItW6gPEvwI2kqNTm7C1TFyEidBym wBteyrb44sG/BbmleHbBR2U7ojigjBghKL5vmaD9XiaDeqF/5QA6acTtWTF7m0Ps DUZgDByrM9/xQdwX/bfOM+T1EsYpAlRR6DcTP27PHiycLY5LCBX9vFkYb3Z2ZJmF 9THlg3wFP2ZJ7T7vbqWC9hiPvNNV5hyiFh81GwyMJvt2bGNtqxW7/BA/gTu+rYAX JGyhmTxY0ZJMIzBbiI54IXeGXbUVNzOmjiH92k37Oi4XiYa20ZXKSBnqbBasOJYY ghPSsfOtSPjuhfoayu1NNfP0B7uluYMIEjjkJzFM3Vy408ZaQUC8goS8KL5/xm+6 bS1CQgoRu4C7JN16Fy7d+2wlpnKPRQ7knjGuiyzNdi8nYuJG+cs= =Vgx1 -END PGP SIGNATURE- Amitay Isaacs (1): swrap: Do not use FALL_THROUGH for empty case statements Andreas Schneider (12): swrap: Use #ifdef instead of #if for config.h definitions swrap: Add env variable to disable deep binding cmake: Disable deep binding for helgrind cmake: Use GNUInstallDirs cmake: Remove unused config.h variables gitlab-ci: Check last 20 commits on force push README: Create a markdown file doc: Fix some typos in the manpage tests: Fix typo in echo_srv help swrap: Fix strict aliasing issues in swrap_pcap_packet_init() swrap: Add paranoia NULL checks Bump version to 1.2.2 Anoop C S (3): Remove thread-safety task from TODO swrap: Fix a TODO swrap: Fix "Value stored never used" warning Volker Lendecke (1): swrap: Add an overflow check --- -- Socket Wrapper Repository
[SCM] Socket Wrapper Repository - branch master updated
The branch, master has been updated via a3a3dca Bump version to 1.2.2 from bd951c1 swrap: Add paranoia NULL checks https://git.samba.org/?p=socket_wrapper.git;a=shortlog;h=master - Log - commit a3a3dcac39fd9b477c497810f8c1512a2f449b8e Author: Andreas Schneider Date: Thu Mar 21 08:47:24 2019 +0100 Bump version to 1.2.2 Signed-off-by: Andreas Schneider Reviewed-by: Ralph Boehme --- Summary of changes: CMakeLists.txt | 4 ++-- ChangeLog | 5 + 2 files changed, 7 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/CMakeLists.txt b/CMakeLists.txt index 1a161dc..ab7254c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules") include(DefineCMakeDefaults) include(DefineCompilerFlags) -project(socket_wrapper VERSION 1.2.1 LANGUAGES C) +project(socket_wrapper VERSION 1.2.2 LANGUAGES C) # global needed variables set(APPLICATION_NAME ${PROJECT_NAME}) @@ -23,7 +23,7 @@ set(APPLICATION_NAME ${PROJECT_NAME}) # Increment AGE. Set REVISION to 0 # If the source code was changed, but there were no interface changes: # Increment REVISION. -set(LIBRARY_VERSION "0.1.11") +set(LIBRARY_VERSION "0.1.12") set(LIBRARY_SOVERSION "0") # add definitions diff --git a/ChangeLog b/ChangeLog index c4831b9..d0a7285 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ ChangeLog == +version 1.2.2 (released 2019-03-21) + * Added environment variable to disable deep binding + * Fixed installation of socket_wrapper + * Fixed several small bugs + version 1.2.1 (released 2018-11-14) * Removed error message to fix applications doing stupid things -- Socket Wrapper Repository
[SCM] Socket Wrapper Repository - branch master updated
The branch, master has been updated via bd951c1 swrap: Add paranoia NULL checks via 6e1ed1d swrap: Fix strict aliasing issues in swrap_pcap_packet_init() via 2cfe068 swrap: Fix "Value stored never used" warning via 6f69593 tests: Fix typo in echo_srv help via 887ce58 doc: Fix some typos in the manpage from 2d53497 swrap: Do not use FALL_THROUGH for empty case statements https://git.samba.org/?p=socket_wrapper.git;a=shortlog;h=master - Log - commit bd951c1f6944011bb5585cb58c92ca5cd5b78489 Author: Andreas Schneider Date: Fri Mar 15 14:59:14 2019 +0100 swrap: Add paranoia NULL checks csbuild complains about missing NULL checks here. Signed-off-by: Andreas Schneider Reviewed-by: Ralph Boehme commit 6e1ed1da3f4372b7de69c5f8be227d85727b2b59 Author: Andreas Schneider Date: Thu Feb 28 13:00:40 2019 +0100 swrap: Fix strict aliasing issues in swrap_pcap_packet_init() Signed-off-by: Andreas Schneider Reviewed-by: Ralph Boehme commit 2cfe0686137c61edd2ff9c6fa01e5499d210c0c5 Author: Anoop C S Date: Fri Mar 15 18:48:40 2019 +0530 swrap: Fix "Value stored never used" warning Signed-off-by: Anoop C S Reviewed-by: Andreas Schneider Reviewed-by: Ralph Boehme commit 6f69593669b7d8424492da95a58d4d7cffa3c974 Author: Andreas Schneider Date: Thu Feb 28 13:02:35 2019 +0100 tests: Fix typo in echo_srv help Signed-off-by: Andreas Schneider Reviewed-by: Ralph Boehme commit 887ce58dff7d8325e01738bd099e57dbace469f8 Author: Andreas Schneider Date: Thu Feb 28 13:02:08 2019 +0100 doc: Fix some typos in the manpage Signed-off-by: Andreas Schneider Reviewed-by: Ralph Boehme --- Summary of changes: doc/socket_wrapper.1 | 6 +-- doc/socket_wrapper.1.txt | 8 +-- src/socket_wrapper.c | 123 +++ tests/echo_srv.c | 2 +- 4 files changed, 79 insertions(+), 60 deletions(-) Changeset truncated at 500 lines: diff --git a/doc/socket_wrapper.1 b/doc/socket_wrapper.1 index a064eed..9f3f75a 100644 --- a/doc/socket_wrapper.1 +++ b/doc/socket_wrapper.1 @@ -44,7 +44,7 @@ socket_wrapper aims to help client/server software development teams willing to .sp -1 .IP \(bu 2.3 .\} -Redirects all network communication to happen over unix sockets\&. +Redirects all network communication to happen over Unix sockets\&. .RE .sp .RS 4 @@ -66,13 +66,13 @@ Support for IPv4 and IPv6 socket and addressing emulation\&. .sp -1 .IP \(bu 2.3 .\} -Ablility to capture network traffic in pcap format\&. +Ability to capture network traffic in pcap format\&. .RE .SH "ENVIRONMENT VARIABLES" .PP \fBSOCKET_WRAPPER_DIR\fR .RS 4 -The user defines a directory where to put all the unix sockets using the envionment variable "SOCKET_WRAPPER_DIR=/path/to/socket_dir"\&. When a server opens a port or a client wants to connect, socket_wrapper will translate IP addresses to a special socket_wrapper name and look for the relevant unix socket in the SOCKET_WRAPPER_DIR\&. +The user defines a directory where to put all the unix sockets using the environment variable "SOCKET_WRAPPER_DIR=/path/to/socket_dir"\&. When a server opens a port or a client wants to connect, socket_wrapper will translate IP addresses to a special socket_wrapper name and look for the relevant Unix socket in the SOCKET_WRAPPER_DIR\&. .RE .PP \fBSOCKET_WRAPPER_DEFAULT_IFACE\fR diff --git a/doc/socket_wrapper.1.txt b/doc/socket_wrapper.1.txt index da16c6d..b3ba96c 100644 --- a/doc/socket_wrapper.1.txt +++ b/doc/socket_wrapper.1.txt @@ -21,9 +21,9 @@ gain full functional test coverage. It makes possible to run several instances of the full software stack on the same machine and perform locally functional testing of complex network configurations. -- Redirects all network communication to happen over unix sockets. +- Redirects all network communication to happen over Unix sockets. - Support for IPv4 and IPv6 socket and addressing emulation. -- Ablility to capture network traffic in pcap format. +- Ability to capture network traffic in pcap format. ENVIRONMENT VARIABLES - @@ -31,9 +31,9 @@ ENVIRONMENT VARIABLES *SOCKET_WRAPPER_DIR*:: The user defines a directory where to put all the unix sockets using the -envionment variable "SOCKET_WRAPPER_DIR=/path/to/socket_dir". When a server +environment variable "SOCKET_WRAPPER_DIR=/path/to/socket_dir". When a server opens a port or a client wants to connect, socket_wrapper will translate IP -addresses to a special socket_wrapper name and look for the relevant unix +addresses to a special socket_wrapper name and look for the relevant Unix socket in the SOCKET_WRAPPER_DIR. *SOCKET_WRAPPER_DEFAULT_IFACE*:: diff --git a/src/socket_wrapper.c