[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-28-17-g864175b

Jeremy Allison jra at samba.org
Tue Dec 11 20:13:19 GMT 2007


The branch, v3-0-test has been updated
       via  864175b3dc671e95afa2b6007b7f78778766384b (commit)
      from  46a780679b87132dbf76af3e684c2124b33a1edc (commit)

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


- Log -----------------------------------------------------------------
commit 864175b3dc671e95afa2b6007b7f78778766384b
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Dec 11 12:12:48 2007 -0800

    Add patches for bug #4866 from jiri sasek - Sun Microsystems - Prague Czech Republic <Jiri.Sasek at Sun.COM>
    to allow Solaris to get passwords > 8 chars.
    Jeremy.

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

Summary of changes:
 source/lib/replace/getpass.c         |   15 +++++++++++++++
 source/lib/replace/getpass.m4        |   10 ++++++++++
 source/nsswitch/winbind_nss_config.h |    2 +-
 3 files changed, 26 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/replace/getpass.c b/source/lib/replace/getpass.c
index 2ccbf7b..90f9af9 100644
--- a/source/lib/replace/getpass.c
+++ b/source/lib/replace/getpass.c
@@ -20,6 +20,19 @@ Cambridge, MA 02139, USA.  */
 
 #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)
 /* POSIX terminal handling. */
 #include <termios.h>
@@ -210,3 +223,5 @@ char *getsmbpass(const char *prompt)
  void getsmbpasswd_dummy(void);
  void getsmbpasswd_dummy(void) {;}
 #endif
+
+#endif /* REPLACE_GETPASS_BY_GETPASSPHRASE */
diff --git a/source/lib/replace/getpass.m4 b/source/lib/replace/getpass.m4
index 20d04a6..9e3a5e1 100644
--- a/source/lib/replace/getpass.m4
+++ b/source/lib/replace/getpass.m4
@@ -1,3 +1,11 @@
+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"
 CPPFLAGS="$CPPFLAGS -I$libreplacedir/"
@@ -15,3 +23,5 @@ if test x"$samba_cv_REPLACE_GETPASS" = x"yes"; then
 	AC_DEFINE(REPLACE_GETPASS,1,[Whether getpass should be replaced])
 	LIBREPLACEOBJ="${LIBREPLACEOBJ} getpass.o"
 fi
+
+fi
diff --git a/source/nsswitch/winbind_nss_config.h b/source/nsswitch/winbind_nss_config.h
index c36d4e7..3722db6 100644
--- a/source/nsswitch/winbind_nss_config.h
+++ b/source/nsswitch/winbind_nss_config.h
@@ -36,9 +36,9 @@
 #include "lib/replace/replace.h"
 #endif
 
-#include "system/passwd.h"
 #include "system/filesys.h"
 #include "system/network.h"
+#include "system/passwd.h"
 
 #include "nsswitch/winbind_nss.h"
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list