[SCM] Samba Shared Repository - branch v3-6-test updated

[Karolin Seeger]

The branch, v3-6-test has been updated
       via  6b4169a libreplace: Bug 8107, Fix poll replacement to become a msleep replacement
       via  757dc4d replace: add some includes for poll.h
      from  1bc9a20 Correct fix for bug #9222 - smbd ignores the "server signing = no" setting for SMB2.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 6b4169a75fb3180dec1f57b0eb39312ca82cd1ac
Author: Joachim Schmitz <schmitz at hp.com>
Date:   Mon Sep 17 05:26:31 2012 -0700

    libreplace: Bug 8107, Fix poll replacement to become a msleep replacement
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    (cherry picked from commit 7542b63188f7e73588c9abb40e36a910c87bc534)

commit 757dc4d753275d42b8dbf2710290b3dbfb9f3cda
Author: Björn Jacke <bj at sernet.de>
Date:   Sun Sep 16 02:21:39 2012 +0200

    replace: add some includes for poll.h
    
    See bug #8107
    
    Autobuild-User(master): Björn Jacke <bj at sernet.de>
    Autobuild-Date(master): Sun Sep 16 04:05:08 CEST 2012 on sn-devel-104
    (cherry picked from commit 520c9b0b0ae33e6e8fb78034cfff685f5491aab3)
    (cherry picked from commit ea96d79e21a549204a7f64307059ea877bfb9fd5)

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

Summary of changes:
 lib/replace/poll.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/poll.c b/lib/replace/poll.c
index e41548d..1105617 100644
--- a/lib/replace/poll.c
+++ b/lib/replace/poll.c
@@ -30,6 +30,12 @@
 
 #include "replace.h"
 #include "system/select.h"
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif
 
 
 int rep_poll(struct pollfd *fds, nfds_t nfds, int timeout)
@@ -40,7 +46,7 @@ int rep_poll(struct pollfd *fds, nfds_t nfds, int timeout)
 	int rc;
 	nfds_t i;
 
-	if (fds == NULL) {
+	if ((fds == NULL) && (nfds != 0)) {
 		errno = EFAULT;
 		return -1;
 	}


-- 
Samba Shared Repository