Changeset 124 for branches/samba-3.0/source/lib/replace

Timestamp:

Mar 12, 2008, 9:08:18 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.28a

Location:

branches/samba-3.0/source/lib/replace

Files:

• getpass.c (modified) (2 diffs)
• getpass.m4 (modified) (2 diffs)
• libreplace.m4 (modified) (1 diff)
• system/network.h (modified) (1 diff)

branches/samba-3.0/source/lib/replace/getpass.c

@@ -20 +20 @@
 
 #include "replace.h"
+
+#if defined(REPLACE_GETPASS_BY_GETPASSPHRASE)
+
+#if defined(HAVE_STDIO_H)
+#include <stdio.h>
+#endif
+
+char *getsmbpass(const char *prompt)
+{
+        return getpassphrase(prompt);
+}
+
+#else /* !REPLACE_GETPASS_BY_GETPASSPHRASE */
 
 #if defined(HAVE_TERMIOS_H)
@@ -211 +224 @@
  void getsmbpasswd_dummy(void) {;}
 #endif
+
+#endif /* REPLACE_GETPASS_BY_GETPASSPHRASE */

branches/samba-3.0/source/lib/replace/getpass.m4

@@ +1 @@
+AC_CHECK_FUNC(getpass, samba_cv_HAVE_GETPASS=yes)
+AC_CHECK_FUNC(getpassphrase, samba_cv_HAVE_GETPASSPHRASE=yes)
+if test x"$samba_cv_HAVE_GETPASS" = x"yes" -a x"$samba_cv_HAVE_GETPASSPHRASE" = x"yes"; then
+        AC_DEFINE(REPLACE_GETPASS_BY_GETPASSPHRASE, 1, [getpass returns <9 chars where getpassphrase returns <265 chars])
+        AC_DEFINE(REPLACE_GETPASS,1,[Whether getpass should be replaced])
+        LIBREPLACEOBJ="${LIBREPLACEOBJ} getpass.o"
+else
+
 AC_CACHE_CHECK([whether getpass should be replaced],samba_cv_REPLACE_GETPASS,[
 SAVE_CPPFLAGS="$CPPFLAGS"
@@ -16 +24 @@
         LIBREPLACEOBJ="${LIBREPLACEOBJ} getpass.o"
 fi
+
+fi

branches/samba-3.0/source/lib/replace/libreplace.m4

@@ -100 +100 @@
 AC_CHECK_HEADERS(netinet/ip.h netinet/tcp.h netinet/in_systm.h netinet/in_ip.h)
 AC_CHECK_HEADERS(sys/sockio.h sys/un.h)
-
+AC_CHECK_HEADERS(stropts.h)
 
 dnl we need to check that net/if.h really can be used, to cope with hpux

branches/samba-3.0/source/lib/replace/system/network.h

@@ -75 +75 @@
 #endif
 
+#ifdef HAVE_STROPTS_H
+#include <stropts.h>
+#endif
+
 #ifdef SOCKET_WRAPPER
 #ifndef SOCKET_WRAPPER_NOT_REPLACE