diff options
| author | Alexandre Oliva <oliva@samba.org> | 1998-09-21 11:34:44 +0000 |
|---|---|---|
| committer | Alexandre Oliva <oliva@samba.org> | 1998-09-21 11:34:44 +0000 |
| commit | ac39ce3eba28eed97942e915f7b4cd77cdfd9e2d (patch) | |
| tree | 0d1a85c8a7cb40edc812ae51b0fd9dee94bcff00 /source3/include | |
| parent | e649750cb4d2d2577f0577b1d7a87ae4daf8fb6f (diff) | |
| download | samba-ac39ce3eba28eed97942e915f7b4cd77cdfd9e2d.tar.gz samba-ac39ce3eba28eed97942e915f7b4cd77cdfd9e2d.tar.bz2 samba-ac39ce3eba28eed97942e915f7b4cd77cdfd9e2d.zip | |
replace getpass() with getsmbpass() if getsmbpass.c compiles
(This used to be commit 9a5bdf5c1bef689fe0d6879949df869efbc34783)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/config.h.in | 1 | ||||
| -rw-r--r-- | source3/include/includes.h | 11 | ||||
| -rw-r--r-- | source3/include/proto.h | 2 | ||||
| -rw-r--r-- | source3/include/stamp-h.in | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/source3/include/config.h.in b/source3/include/config.h.in index 7b536afc31..da545486f0 100644 --- a/source3/include/config.h.in +++ b/source3/include/config.h.in @@ -109,6 +109,7 @@ #undef WITH_AUTOMOUNT #undef HAVE_PAM_AUTHENTICATE #undef HAVE_BROKEN_GETGROUPS +#undef REPLACE_GETPASS #undef REPLACE_INET_NTOA #undef HAVE_FILE_MACRO #undef HAVE_FUNCTION_MACRO diff --git a/source3/include/includes.h b/source3/include/includes.h index 3f99574c64..5b47e6fa35 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -21,7 +21,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifndef NO_CONFIG_H /* for some tests */ #include "config.h" +#endif #include "local.h" #ifdef AIX @@ -37,15 +39,10 @@ #endif #ifdef SUNOS4 -#define REPLACE_GETPASS /* on SUNOS4 termios.h conflicts with sys/ioctl.h */ #undef HAVE_TERMIOS_H #endif -#ifdef SUNOS5 -#define REPLACE_GETPASS -#endif - #include <sys/types.h> @@ -661,4 +658,8 @@ int setresgid(gid_t rgid, gid_t egid, gid_t sgid); #define bzero(a,b) memset((a),'\0',(b)) #endif +#ifdef REPLACE_GETPASS +#define getpass(prompt) getsmbpass((prompt)) +#endif + #endif /* _INCLUDES_H */ diff --git a/source3/include/proto.h b/source3/include/proto.h index 161e6a6bed..c2d5c0e1ff 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -521,7 +521,6 @@ void kill_async_dns_child(void); /*The following definitions come from nmbd/nmbd.c */ BOOL reload_services(BOOL test); -int main(int argc,char *argv[]); /*The following definitions come from nmbd/nmbd_become_dmb.c */ @@ -2013,5 +2012,4 @@ void status_page(void); /*The following definitions come from web/swat.c */ -int main(int argc, char *argv[]); #endif /* _PROTO_H_ */ diff --git a/source3/include/stamp-h.in b/source3/include/stamp-h.in index 1214bd37f5..75ac934484 100644 --- a/source3/include/stamp-h.in +++ b/source3/include/stamp-h.in @@ -1,2 +1,2 @@ --rw-r--r-- 1 oliva pos 1371 Sep 19 00:48 acconfig.h --rw-r--r-- 1 oliva pos 24197 Sep 20 07:11 configure.in +-rw-r--r-- 1 oliva pos 1394 Sep 21 08:00 acconfig.h +-rw-r--r-- 1 oliva pos 24688 Sep 21 08:11 configure.in |