diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-01-16 09:00:04 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-01-16 09:00:04 +1100 |
| commit | c92a1d0752abf42a76e16e7c19229841ac35dc81 (patch) | |
| tree | f5702890d17180c6b33285c14b05bc53b0ca629c /source4/lib/replace/system | |
| parent | 955b110818c00170f7b93d2975de467551c8bc06 (diff) | |
| parent | b1fcae724156c2b25f41264943cf4cec8fe68821 (diff) | |
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit d8a805a2544c8864136f77e9086b2a01ae79a1d5)
Diffstat (limited to 'source4/lib/replace/system')
| -rw-r--r-- | source4/lib/replace/system/network.h | 4 | ||||
| -rw-r--r-- | source4/lib/replace/system/passwd.h | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/source4/lib/replace/system/network.h b/source4/lib/replace/system/network.h index e2fad5f686..53bef66d48 100644 --- a/source4/lib/replace/system/network.h +++ b/source4/lib/replace/system/network.h @@ -79,6 +79,10 @@ #include <sys/ioctl.h> #endif +#ifdef HAVE_STROPTS_H +#include <stropts.h> +#endif + #ifdef REPLACE_INET_NTOA /* define is in "replace.h" */ char *rep_inet_ntoa(struct in_addr ip); diff --git a/source4/lib/replace/system/passwd.h b/source4/lib/replace/system/passwd.h index 36fca7b4f8..cad3197ccb 100644 --- a/source4/lib/replace/system/passwd.h +++ b/source4/lib/replace/system/passwd.h @@ -68,9 +68,13 @@ #endif #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 #ifndef NGROUPS_MAX #define NGROUPS_MAX 32 /* Guess... */ |