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

[Karolin Seeger]

The branch, v3-6-test has been updated
       via  6fdeb10 Fix bug #8729 - getpass regressions on Solaris/Illumos - 3.6 and master.
      from  53109bf s3:auth: fill the sids array of the info3 in wbcAuthUserInfo_to_netr_SamInfo3() (bug #8739)

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


- Log -----------------------------------------------------------------
commit 6fdeb105904803d5402619419d4dc8bcc4423c35
Author: Ira Cooper <samba at ira.wakeful.net>
Date:   Tue Jan 31 12:15:36 2012 -0800

    Fix bug #8729 - getpass regressions on Solaris/Illumos - 3.6 and master.
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Tue Jan 31 23:28:09 CET 2012 on sn-devel-104
    (cherry picked from commit a1901b55cfa658f39a33d0ea120641f56453fe4e)

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

Summary of changes:
 lib/replace/replace.h       |   11 +++++++++++
 lib/replace/system/passwd.h |    2 ++
 2 files changed, 13 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/replace.h b/lib/replace/replace.h
index c081f23..c47cf1c 100644
--- a/lib/replace/replace.h
+++ b/lib/replace/replace.h
@@ -802,4 +802,15 @@ int fdatasync(int );
 /* prototype is in "system/network.h" */
 #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 */
diff --git a/lib/replace/system/passwd.h b/lib/replace/system/passwd.h
index aaea9c8..ee9354b 100644
--- a/lib/replace/system/passwd.h
+++ b/lib/replace/system/passwd.h
@@ -67,6 +67,7 @@
 #include <compat.h>
 #endif
 
+#if !defined(getpass)
 #ifdef REPLACE_GETPASS
 #if defined(REPLACE_GETPASS_BY_GETPASSPHRASE)
 #define getpass(prompt) getpassphrase(prompt)
@@ -75,6 +76,7 @@
 char *rep_getpass(const char *prompt);
 #endif
 #endif
+#endif
 
 #ifndef NGROUPS_MAX
 #define NGROUPS_MAX 32 /* Guess... */


-- 
Samba Shared Repository