Changeset 752 for trunk/server/lib/replace

Timestamp:

Nov 29, 2012, 2:06:31 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.9 2nd part

Location:

trunk/server

Files:

• . (modified) (1 prop)
• lib/replace/poll.c (modified) (2 diffs)
• lib/replace/replace.h (modified) (1 diff)
• lib/replace/system/passwd.h (modified) (2 diffs)

trunk/server/lib/replace/poll.c

@@ -31 +31 @@
 #include "replace.h"
 #include "system/select.h"
-
-#ifdef __OS2__
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
+#endif
+#ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif
@@ -45 +46 @@
         nfds_t i;
 
-        if (fds == NULL) {
+        if ((fds == NULL) && (nfds != 0)) {
                 errno = EFAULT;
                 return -1;

trunk/server/lib/replace/replace.h

@@ -803 +803 @@
 #endif
 
+#if !defined(getpass)
+#ifdef REPLACE_GETPASS
+#if defined(REPLACE_GETPASS_BY_GETPASSPHRASE)
+#define getpass(prompt) getpassphrase(prompt)
+#else
+#define getpass(prompt) rep_getpass(prompt)
+char *rep_getpass(const char *prompt);
+#endif
+#endif
+#endif
+
 #endif /* _LIBREPLACE_REPLACE_H */

trunk/server/lib/replace/system/passwd.h

@@ -68 +68 @@
 #endif
 
-#if defined(REPLACE_GETPASS) && !defined(__OS2__)
+#if !defined(getpass)
+#ifdef REPLACE_GETPASS
 #if defined(REPLACE_GETPASS_BY_GETPASSPHRASE)
 #define getpass(prompt) getpassphrase(prompt)
@@ -74 +75 @@
 #define getpass(prompt) rep_getpass(prompt)
 char *rep_getpass(const char *prompt);
+#endif
 #endif
 #endif