diff options
| author | Ira Cooper <samba@ira.wakeful.net> | 2012-01-31 12:15:36 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2012-01-31 23:28:09 +0100 |
| commit | a1901b55cfa658f39a33d0ea120641f56453fe4e (patch) | |
| tree | 6ed7d2dd022b34212f0ed798d7721df606c0d759 /lib | |
| parent | 6b8a4c96e8b2294c48bbf8ad8a3422d98448dd6c (diff) | |
| download | samba-a1901b55cfa658f39a33d0ea120641f56453fe4e.tar.gz samba-a1901b55cfa658f39a33d0ea120641f56453fe4e.tar.bz2 samba-a1901b55cfa658f39a33d0ea120641f56453fe4e.zip | |
Fix bug #8729 - getpass regressions on Solaris/Illumos - 3.6 and master.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Tue Jan 31 23:28:09 CET 2012 on sn-devel-104
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/replace/replace.h | 11 | ||||
| -rw-r--r-- | lib/replace/system/passwd.h | 2 |
2 files changed, 13 insertions, 0 deletions
diff --git a/lib/replace/replace.h b/lib/replace/replace.h index c081f23c26..c47cf1c1b1 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 f630012f00..223324c4b4 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... */ |