[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  f8b491f cli_credentials: Fix a return value
       via  5b53254 lib: Fix 1417431 Unchecked return value from library
       via  970f78e Remove misleading entry from vfs_streams_xattr man page
      from  d1c96dc messaging: Avoid a socket leak after fork

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit f8b491fac42b95cecad419e1a54fd5e7ee6cb9e3
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Sep 5 16:43:18 2017 +0200

    cli_credentials: Fix a return value
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Tue Sep  5 23:06:42 CEST 2017 on sn-devel-144

commit 5b53254ffcc9b5bd4e754969e8c74b50c44cd90c
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Sep 5 13:17:54 2017 +0200

    lib: Fix 1417431 Unchecked return value from library
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

commit 970f78ea2e0934014cfb317f83cd218d62d229ce
Author: Anoop C S <anoopcs at redhat.com>
Date:   Thu Aug 31 17:30:46 2017 +0530

    Remove misleading entry from vfs_streams_xattr man page
    
    The line which is being removed says that streams_xattr vfs module
    cannot be used when kernel oplocks is enabled. But the underlying
    bug(#7537) and another dependant bug(#12791) has been resolved
    sometime back.
    
    Signed-off-by: Anoop C S <anoopcs at redhat.com>
    Reviewed-by: Ralph Böhme <slow at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 auth/credentials/credentials.c            |  2 +-
 docs-xml/manpages/vfs_streams_xattr.8.xml |  4 ----
 lib/pthreadpool/tests.c                   | 12 ++++++++++--
 3 files changed, 11 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/auth/credentials/credentials.c b/auth/credentials/credentials.c
index 2342d72..152df96 100644
--- a/auth/credentials/credentials.c
+++ b/auth/credentials/credentials.c
@@ -534,7 +534,7 @@ _PUBLIC_ struct samr_Password *cli_credentials_get_nt_hash(struct cli_credential
 					  password, password_len);
 		if (converted != sizeof(nt_hash->hash)) {
 			TALLOC_FREE(nt_hash);
-			return false;
+			return NULL;
 		}
 	} else {
 		E_md4hash(password, nt_hash->hash);
diff --git a/docs-xml/manpages/vfs_streams_xattr.8.xml b/docs-xml/manpages/vfs_streams_xattr.8.xml
index e2b9130..0f9dab4 100644
--- a/docs-xml/manpages/vfs_streams_xattr.8.xml
+++ b/docs-xml/manpages/vfs_streams_xattr.8.xml
@@ -46,10 +46,6 @@
 	the size of xattrs. So this module might work for applications like IE
 	that stores small zone information in streams but will fail for
 	applications that store serious amounts of data in ADSs.</para>
-
-	<para>CAUTION: Make sure to set "kernel oplocks = no" in smb.conf if
-	if you use this module because this combination is currently broken.
-	See Bug 7537 for details.</para>
 </refsect1>
 
 <refsect1>
diff --git a/lib/pthreadpool/tests.c b/lib/pthreadpool/tests.c
index 9991182..1aab80c 100644
--- a/lib/pthreadpool/tests.c
+++ b/lib/pthreadpool/tests.c
@@ -232,7 +232,11 @@ static int test_busyfork(void)
 		return -1;
 	}
 
-	poll(NULL, 0, 200);
+	ret = poll(NULL, 0, 200);
+	if (ret == -1) {
+		perror("poll failed");
+		return -1;
+	}
 
 	child = fork();
 	if (child < 0) {
@@ -278,7 +282,11 @@ static int test_busyfork(void)
 		return -1;
 	}
 
-	poll(NULL, 0, 200);
+	ret = poll(NULL, 0, 200);
+	if (ret == -1) {
+		perror("poll failed");
+		return -1;
+	}
 
 	waitret = waitpid(child, &wstatus, WNOHANG);
 	if (waitret != child) {


-- 
Samba Shared Repository