[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 2073635 traffic: ensure we are using the same division in py 2 and 3 via cb40e2b autobuild: do not try to send email to no recipient via 406284b samba_kcc: remove an unused variable via 2c6cac9 sambatool tests: make assertMatch use assertIn via ac053b1 .gitignore .agignore via e6669d1 gitignore .gdb_history anywhere in the tree via 6b7494f perftest: ad_dc_medley failing base search failed to catch exception via 4eeb43d autobuild: add compiler version to results tarball via f94c9a1 auth/ntlmssp_client: correct spelling of response via a66f941 auth/pycredentials: correct spelling of reponse from 54f2989 tests: libsmbclient: Add a readdirplus() test suite. https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 2073635d5818aa3fc844ee40dde0c8ae42ac5abd Author: Douglas BagnallDate: Thu Apr 19 14:13:47 2018 +1200 traffic: ensure we are using the same division in py 2 and 3 Signed-off-by: Douglas Bagnall Reviewed-by: Gary Lockyer Autobuild-User(master): Douglas Bagnall Autobuild-Date(master): Sat May 5 07:25:13 CEST 2018 on sn-devel-144 commit cb40e2bbc8a34a1ec3584ab585c5bf44c037ef0e Author: Douglas Bagnall Date: Fri Mar 23 11:24:16 2018 +1300 autobuild: do not try to send email to no recipient Signed-off-by: Douglas Bagnall Reviewed-by: Gary Lockyer commit 406284be95d38d9fbdfb970fbe6cb17f25c63bf6 Author: Douglas Bagnall Date: Thu Mar 15 11:55:40 2018 +1300 samba_kcc: remove an unused variable Signed-off-by: Douglas Bagnall Reviewed-by: Gary Lockyer commit 2c6cac990e64983c7fdb5beb3316ef956fa0b0bc Author: Douglas Bagnall Date: Fri Mar 9 15:20:53 2018 +1300 sambatool tests: make assertMatch use assertIn With a note to tidy this up at some point Signed-off-by: Douglas Bagnall Reviewed-by: Gary Lockyer commit ac053b1493157c752d7c7c802e95b5222d61b71c Author: Douglas Bagnall Date: Thu Aug 10 12:00:45 2017 +1200 .gitignore .agignore .agingore is used by "the silver searcher", ag, which is a form of grep with more useful defaults and prettier colours for searching source trees. Signed-off-by: Douglas Bagnall Reviewed-by: Gary Lockyer commit e6669d126472091fb0b012fe2371557aa5bc4c6c Author: Douglas Bagnall Date: Thu Aug 10 11:59:44 2017 +1200 gitignore .gdb_history anywhere in the tree For when you run gdb in places like lib/ldb/ and it decides to leave behind a history file. Signed-off-by: Douglas Bagnall Reviewed-by: Gary Lockyer commit 6b7494f5e7f72a29350d5fbbf2dbae866ded9b63 Author: Douglas Bagnall Date: Thu Aug 24 15:02:43 2017 +1200 perftest: ad_dc_medley failing base search failed to catch exception This meant it only happened once. Signed-off-by: Douglas Bagnall Reviewed-by: Gary Lockyer commit 4eeb43d06c7bfe1e3661c954586eed0b88315ee8 Author: Douglas Bagnall Date: Fri May 4 15:26:47 2018 +1200 autobuild: add compiler version to results tarball Signed-off-by: Douglas Bagnall Reviewed-by: Gary Lockyer commit f94c9a135785414d6fed8785369c0c16e1fcb9b9 Author: Douglas Bagnall Date: Thu Apr 19 16:21:06 2018 +1200 auth/ntlmssp_client: correct spelling of response Signed-off-by: Douglas Bagnall Reviewed-by: Gary Lockyer commit a66f941619ecf4f2cae8680143e990307f42e264 Author: Douglas Bagnall Date: Thu Apr 19 16:20:25 2018 +1200 auth/pycredentials: correct spelling of reponse Signed-off-by: Douglas Bagnall Reviewed-by: Gary Lockyer --- Summary of changes: .gitignore| 4 ++-- auth/credentials/pycredentials.c | 2 +- auth/ntlmssp/ntlmssp_client.c | 6 +-
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 54f2989 tests: libsmbclient: Add a readdirplus() test suite. via 2166c2d s3: libsmbclient: Add new function SMBC_readdirplus_ctx(). via dd3f019 s3: libsmbclient: Add function add_dirplus() to fill the list from a returned file info. via 3fc5a79 s3: libsmbclient: Add readdirplus cleanup code on directory close. via bf13fe0 s3: libsmbclient: Add internal/external structures needed for readdirplus. via abb80ce s3: client: Add btime_ts to struct finfo. from 30e6b59 s3: VFS: Remove SMB_VFS_WRITE() function and all implementations. https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 54f29891090edb0a26120d8ad6ed0485c31516ab Author: Jeremy AllisonDate: Tue Apr 24 13:47:54 2018 -0700 tests: libsmbclient: Add a readdirplus() test suite. Signed-off-by: Jeremy Allison Reviewed-by: Andreas Schneider Reviewed-by: Alexander Bokovoy Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Sat May 5 04:31:18 CEST 2018 on sn-devel-144 commit 2166c2d3ee84ea2fde840c261d6401abc58650b5 Author: Puran Chand Date: Mon Apr 9 10:10:28 2018 -0700 s3: libsmbclient: Add new function SMBC_readdirplus_ctx(). New ABI function, move to library version 0.33. Signed-off-by: Puran Chand Reviewed-by: Jeremy Allison Reviewed-by: Andreas Schneider Reviewed-by: Alexander Bokovoy commit dd3f019d588ee71a06985da2c1abe84391d95b0e Author: Puran Chand Date: Fri Apr 6 14:50:39 2018 -0700 s3: libsmbclient: Add function add_dirplus() to fill the list from a returned file info. Not yet externally visible. Signed-off-by: Puran Chand Reviewed-by: Jeremy Allison Reviewed-by: Andreas Schneider Reviewed-by: Alexander Bokovoy commit 3fc5a79750c443087ac0968085fadba74cce555d Author: Puran Chand Date: Fri Apr 6 14:17:35 2018 -0700 s3: libsmbclient: Add readdirplus cleanup code on directory close. Signed-off-by: Puran Chand Reviewed-by: Jeremy Allison Reviewed-by: Andreas Schneider Reviewed-by: Alexander Bokovoy commit bf13fe0f2226844123cfb090e0ab82c8ce24e09b Author: Puran Chand Date: Fri Apr 6 14:08:03 2018 -0700 s3: libsmbclient: Add internal/external structures needed for readdirplus. Not yet used. Signed-off-by: Puran Chand Reviewed-by: Jeremy Allison Reviewed-by: Andreas Schneider Reviewed-by: Alexander Bokovoy commit abb80ce44c41759306be3ff1cca6bea532bdf45f Author: Jeremy Allison Date: Fri Apr 6 13:35:05 2018 -0700 s3: client: Add btime_ts to struct finfo. Fill it in when available, else return it as zero. Based on a patch from Puran Chand . Signed-off-by: Jeremy Allison Reviewed-by: Andreas Schneider Reviewed-by: Alexander Bokovoy --- Summary of changes: examples/fuse/clifuse.c| 1 + source3/include/client.h | 1 + source3/include/libsmb_internal.h | 9 ++ source3/include/libsmbclient.h | 69 ++ .../{smbclient-0.3.2.sigs => smbclient-0.3.3.sigs} | 3 + source3/libsmb/cli_smb2_fnum.c | 1 + source3/libsmb/clilist.c | 19 +++ source3/libsmb/libsmb_compat.c | 6 + source3/libsmb/libsmb_context.c| 1 + source3/libsmb/libsmb_dir.c| 140 + source3/libsmb/libsmb_setget.c | 10 ++ source3/libsmb/wscript | 2 +- source3/selftest/tests.py | 8 +- source4/selftest/tests.py | 3 +- source4/torture/libsmbclient/libsmbclient.c| 96 ++ 15 files changed, 365 insertions(+), 4 deletions(-) copy source3/libsmb/ABI/{smbclient-0.3.2.sigs => smbclient-0.3.3.sigs} (98%) Changeset truncated at 500 lines: diff --git a/examples/fuse/clifuse.c b/examples/fuse/clifuse.c index da9dd4d..3c7e498 100644 --- a/examples/fuse/clifuse.c +++ b/examples/fuse/clifuse.c @@ -484,6 +484,7 @@ static NTSTATUS parse_finfo_id_both_directory_info(uint8_t *dir_data, return NT_STATUS_INFO_LENGTH_MISMATCH; } +
autobuild[sn-devel-144]: intermittent test failure detected
The autobuild test system (on sn-devel-144) 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-144/2018-05-05-0154/flakey.log The failure seems to be in the "samba" suite, whose build logs are available here: https://git.samba.org/autobuild.flakey.sn-devel-144/2018-05-05-0154/samba.stderr https://git.samba.org/autobuild.flakey.sn-devel-144/2018-05-05-0154/samba.stdout The top commit at the time of the failure was: commit d1730d6ff19b60ebf9f6b18aaa4afab733b18b25 Author: Garming SamDate: Tue Mar 27 12:19:31 2018 +1300 netlogon: Allow zero-GUID to act the same as NULL in GetDCNameEx2 This matches Windows behaviour and allows rpcclient to work against Samba without knowing the GUID ahead of time. Errors related to this don't appear to occur within selftest. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13365 Signed-off-by: Garming Sam Reviewed-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett Autobuild-User(master): Garming Sam Autobuild-Date(master): Fri May 4 09:11:19 CEST 2018 on sn-devel-144 and the last 50 lines of the stdout log were: [771(4644)/842 at 1h13m55s] samba4.ldap.acl.python(ad_dc_ntvfs)(ad_dc_ntvfs) [772(4696)/842 at 1h15m12s] samba4.ldap.passwords.python(ad_dc_ntvfs)(ad_dc_ntvfs) [773(4714)/842 at 1h15m34s] samba4.ldap.password_lockout.python(ad_dc_ntvfs)(ad_dc_ntvfs) [774(4727)/842 at 1h17m14s] samba4.tombstone_reanimation.python(ad_dc_ntvfs) [775(4739)/842 at 1h17m20s] samba.tests.upgradeprovisionneeddc(ad_dc_ntvfs:local) [776(4750)/842 at 1h17m22s] samba.tests.posixacl(ad_dc_no_nss:local) [777(4773)/842 at 1h17m44s] samba.tests.posixacl.python3(ad_dc_no_nss:local) [778(4796)/842 at 1h17m45s] samba4.deletetest.python(ad_dc_ntvfs)(ad_dc_ntvfs) [779(4798)/842 at 1h17m46s] samba4.blackbox.spn.py(ad_dc_ntvfs:local)(ad_dc_ntvfs:local) [780(4809)/842 at 1h17m51s] samba4.rpc.samr.large-dc.one(vampire_dc) [781(4812)/842 at 1h18m0s] samba4.rpc.samr.large-dc.two(vampire_dc) [782(4815)/842 at 1h18m10s] samba4.rpc.echo(rodc) [783(4825)/842 at 1h18m14s] samba4.rpc.echo(rodc:local) [784(4835)/842 at 1h18m18s] samba4.rpc.echo.testallowed(rodc:local) [785(4845)/842 at 1h18m21s] samba4.rpc.echo.testdenied(rodc:local) [786(4855)/842 at 1h18m24s] samba4.blackbox.smbclient(rodc:local)(rodc:local) [787(4857)/842 at 1h18m25s] samba.tests.samba_tool.rodc(rodc:local) [788(4866)/842 at 1h18m57s] samba.blackbox.rpcclient_samlogon(rodc:local) [789(4870)/842 at 1h18m58s] samba.blackbox.rpcclient_samlogon_testallowed(rodc:local) [790(4874)/842 at 1h18m59s] samba.blackbox.rpcclient_samlogon_testdenied(rodc:local) [791(4878)/842 at 1h18m59s] samba4.drs.ridalloc_exop.python(vampire_dc)(vampire_dc) [792(4889)/842 at 1h24m26s] samba4.drs.samba_tool_drs.python(vampire_dc)(vampire_dc:local) [793(4903)/842 at 1h27m56s] samba4.drs.samba_tool_drs_showrepl.python(vampire_dc)(vampire_dc:local) [794(4905)/842 at 1h27m59s] samba4.drs.replica_sync.python(vampire_dc)(vampire_dc:local) UNEXPECTED(error): samba4.drs.replica_sync.python(vampire_dc).replica_sync.DrsReplicaSyncTestCase.test_ReplConflictsRemoteWin(vampire_dc:local) REASON: Exception: Exception: Traceback (most recent call last): File "/memdisk/autobuild/fl/b1284443/samba/source4/torture/drs/python/replica_sync.py", line 190, in test_ReplConflictsRemoteWin self.ou2 = self._create_ou(self.ldb_dc2, "OU=Test Remote Conflict") File "/memdisk/autobuild/fl/b1284443/samba/source4/torture/drs/python/replica_sync.py", line 116, in _create_ou samdb.add_ldif(ldif) File "bin/python/samba/__init__.py", line 230, in add_ldif self.add(msg, controls) LdbError: (68, 'LDAP error 68 LDAP_ENTRY_ALREADY_EXISTS - <>') FAILED (0 failures, 1 errors and 0 unexpected successes in 0 testsuites) A summary with detailed information can be found in: ./bin/ab/summary TOP 10 slowest tests samba4.ldap.vlv.python(ad_dc_ntvfs)(ad_dc_ntvfs) -> 684 samba4.ldap.rodc_rwdc.python(rodc)(rodc:local) -> 422 samba4.drs.ridalloc_exop.python(vampire_dc)(vampire_dc) -> 327 samba4.rpc.samr.passwords.lockout on ncacn_np with (ad_dc_ntvfs) -> 224 samba4.drs.samba_tool_drs.python(vampire_dc)(vampire_dc:local) -> 210 samba4.rpc.samr.passwords.pwdlastset on ncacn_np with (ad_dc_ntvfs) -> 200 samba3.smbtorture_s3.vfs_aio_fork(simpleserver).RW2(simpleserver) -> 138 samba4.ldap.secdesc.python(ad_dc_ntvfs)(ad_dc_ntvfs) -> 111 samba4.raw.notify(ad_dc_ntvfs) -> 106 samba4.ldb.ldaps with options -U"$USERNAME%$PASSWORD"(ad_dc_ntvfs)(ad_dc_ntvfs) -> 103 ERROR: test failed with exit code 1
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 30e6b59 s3: VFS: Remove SMB_VFS_WRITE() function and all implementations. via 98f0306 s3: torture: Remove the last user of SMB_VFS_WRITE. via 532ff3a s3: VFS: ceph: Replace the lseek/write ftruncate extend with pwrite. via 25bad32 s3: VFS: Remove vfs_write_data(). No longer used. via 394ac90 s3: smbd: Remove the handling of offset == -1 in real_write_file(). via 23f4b3f s3: VFS: default: Remove recursion into the VFS inside the default pwrite call. via 90bd746 s3: VFS: default: Remove fallback if we don't have HAVE_PWRITE set. Samba doesn't work without pwrite. via c1bcf1e s3: VFS: Remove SMB_VFS_READ() function and all implementations. via 75fde60 s3: torture: Make cmd_read use read_file(). via 2bea110 s3: printing: Remove the LSEEK in printing_pread_data() and use read_file() instead. via 70eb533 s3: printing: Now we never pass an offset of -1, remove the off_t==-1 protections from printing_pread_data(). via 9bf5d0d s3: printing: Use offset tracking in printing_pread_data() to remove the seek in handle_ne_file(). via a87328e s3: printing: Use passed in offset, and offset tracking in printing_pread_data() to remove seeks from handle_pe_file(). via 0c736ae s3: printing: Add existing offset position as a parameter to handle_pe_file(), handle_ne_file() via 09aaed2 s3: printing: Use auto-updating of offset in printing_pread_data() to remove offset tracking in get_file_version(). via 4b580ee s3: printing: Make printing_pread_data() update the offset paramter, if not passed in as -1. via b927b53 s3: printing: Rename printing_read_data() -> printing_pread_data() and add an offset parameter. via e943c5d s3: printing: Rename vfs_read_data() -> printing_read_data(). via 43d9168 s3: printing: Move handle_ne_file code into a separate function. via 6a42a24 s3: printing: Split handling of PE file into separate function. via 631bca9 s3: printing: Reformatting of parts of this file to modern coding standards. from d1730d6 netlogon: Allow zero-GUID to act the same as NULL in GetDCNameEx2 https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 30e6b5999bf0be297de74dc991beeccfe4af6088 Author: Jeremy AllisonDate: Wed May 2 16:56:33 2018 -0700 s3: VFS: Remove SMB_VFS_WRITE() function and all implementations. All code in Samba now uses SMB_VFS_PWRITE or SMB_VFS_PWRITE_SEND. Signed-off-by: Jeremy Allison Reviewed-by: Ralph Boehme Autobuild-User(master): Ralph Böhme Autobuild-Date(master): Sat May 5 01:38:07 CEST 2018 on sn-devel-144 commit 98f03064f75466929295b8854182977c7162e360 Author: Jeremy Allison Date: Wed May 2 16:49:56 2018 -0700 s3: torture: Remove the last user of SMB_VFS_WRITE. Signed-off-by: Jeremy Allison Reviewed-by: Ralph Boehme commit 532ff3a5b9580f75ee770fc7da7ba7fc43b5a91f Author: Jeremy Allison Date: Wed May 2 16:47:22 2018 -0700 s3: VFS: ceph: Replace the lseek/write ftruncate extend with pwrite. Signed-off-by: Jeremy Allison Reviewed-by: Ralph Boehme commit 25bad32993150a49a767aca87c7d234314ba7210 Author: Jeremy Allison Date: Wed May 2 16:44:23 2018 -0700 s3: VFS: Remove vfs_write_data(). No longer used. Signed-off-by: Jeremy Allison Reviewed-by: Ralph Boehme commit 394ac908c19bd54e6869865ddff44e2382aedb48 Author: Jeremy Allison Date: Wed May 2 16:39:16 2018 -0700 s3: smbd: Remove the handling of offset == -1 in real_write_file(). All SMB1/2/3 offsets over the wire are absolute. The only caller with offset == -1 is on a print-spool file in reply_printwrite(), and write_file() redirects this to print_spool_write(), which correctly handles the -1. Signed-off-by: Jeremy Allison Reviewed-by: Ralph Boehme commit 23f4b3f0ed1b5883b50b390292e06587c2a6e27b Author: Jeremy Allison Date: Wed May 2 16:38:05 2018 -0700 s3: VFS: default: Remove recursion into the VFS inside the default pwrite call. We already know we're at the POSIX level here. Signed-off-by: Jeremy Allison Reviewed-by: Ralph Boehme commit 90bd74640f0a79c1d1c2c0a5fee92e62700232e9 Author: Jeremy Allison Date: Wed May 2 16:35:41 2018 -0700 s3: VFS: default: Remove fallback if we don't have HAVE_PWRITE set. Samba doesn't work without pwrite. Start of the changes to remove synchronous VFS write.
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via d1730d6 netlogon: Allow zero-GUID to act the same as NULL in GetDCNameEx2 via 7b56b52 netlogon: Store the client site to clobber any plausibly returned via winbind via 6d188fe netlogon: Forward GetDCNameEx2 to winbind via IRPC via 7d23177 winbindd_irpc: Add an IRPC call to trigger a DC locate via 972659e tests/getdcname: Add a number of tests for GetDCNameEx via 00cb8a3 netlogon: Allow return of error code in future asynchronous winbind forwards via 3fcb768 dsdb: Allow the disable of the Windows server site fallback via 0b6186b netlogon: Add a comment regarding one of the DC location calls from 53ff08a s3:cleanupd: sends MSG_SMB_UNLOCK twice to interested peers https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit d1730d6ff19b60ebf9f6b18aaa4afab733b18b25 Author: Garming SamDate: Tue Mar 27 12:19:31 2018 +1300 netlogon: Allow zero-GUID to act the same as NULL in GetDCNameEx2 This matches Windows behaviour and allows rpcclient to work against Samba without knowing the GUID ahead of time. Errors related to this don't appear to occur within selftest. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13365 Signed-off-by: Garming Sam Reviewed-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett Autobuild-User(master): Garming Sam Autobuild-Date(master): Fri May 4 09:11:19 CEST 2018 on sn-devel-144 commit 7b56b522d49f3e20dc2ea3819a82f742e614ea9c Author: Garming Sam Date: Mon Mar 26 14:32:07 2018 +1300 netlogon: Store the client site to clobber any plausibly returned via winbind So far, I have never observed the case where the winbind call ever bothered to return a proper site, but in case it ever does so, we clobber it here. This has implications for returning a non-local domain site name, but for now, we ignore them. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13365 Signed-off-by: Garming Sam Reviewed-by: Andrew Bartlett commit 6d188fe05b7860e3abd7cfcc21ce1390bbfd8a71 Author: Garming Sam Date: Wed Mar 21 11:25:19 2018 +1300 netlogon: Forward GetDCNameEx2 to winbind via IRPC Here we simply forward everything without alteration (the same struct is returned). This helps us to fix the case where the DC does not exist in the target site, furthermore, this is supposed to work for trusted domains. In calling out to winbind, we now also notice if you provide a site which exists in multiple domains and provide the correct domain (instead of accidentally returning ourselves). BUG: https://bugzilla.samba.org/show_bug.cgi?id=13365 Signed-off-by: Garming Sam Reviewed-by: Andrew Bartlett commit 7d23177cea2a919ec37177954448d090e84a13fe Author: Garming Sam Date: Wed Mar 21 11:25:19 2018 +1300 winbindd_irpc: Add an IRPC call to trigger a DC locate Calling the top level winbindd API would probably be more appropriate, but we lack certain structures. We introduce this call in order to return the result to NETLOGON (in order to give site-aware and domain aware DC location). BUG: https://bugzilla.samba.org/show_bug.cgi?id=13365 Signed-off-by: Garming Sam Reviewed-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett commit 972659eb29b7ae496cb2558dfc75ad7f4b9dc4ff Author: Garming Sam Date: Wed Mar 28 17:16:25 2018 +1300 tests/getdcname: Add a number of tests for GetDCNameEx This will test the winbind forwarding to deal with sites that the target DC does not exist in. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13365 Signed-off-by: Garming Sam Reviewed-by: Andrew Bartlett commit 00cb8a3e12a5f6358b11d3f9c3080e7d62fc99d1 Author: Garming Sam Date: Wed Mar 28 13:05:11 2018 +1300 netlogon: Allow return of error code in future asynchronous winbind forwards We change the naming conventions to match dcesrv_netr_*_base_call used elsewhere. This is important when we make the underlying Ex2 call asynchronous. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13365 Signed-off-by: Garming Sam Reviewed-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett commit 3fcb7680571621f229f37dc7ff6ee4df29750b85 Author: Garming Sam
[SCM] Socket Wrapper Repository - branch master updated
The branch, master has been updated via 321833e tests: Fix resouce leak in echo_srv tcp handling from 7b01e29 cmake: Run threaded tests with helgrind https://git.samba.org/?p=socket_wrapper.git;a=shortlog;h=master - Log - commit 321833e2696f1964eef6ff1bfa2455da735a372a Author: Andreas SchneiderDate: Fri May 4 08:01:29 2018 +0200 tests: Fix resouce leak in echo_srv tcp handling CID 175587 Signed-off-by: Andreas Schneider Reviewed-by: Michael Adam --- Summary of changes: tests/echo_srv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/tests/echo_srv.c b/tests/echo_srv.c index 2f877f4..771904a 100644 --- a/tests/echo_srv.c +++ b/tests/echo_srv.c @@ -534,9 +534,8 @@ static void echo_tcp(int sock) } close(s); exit(0); -} else { -close(s); } +close(s); } done: -- Socket Wrapper Repository