diff options
| author | Björn Jacke <bjacke@samba.org> | 2018-01-24 10:02:13 +0100 |
|---|---|---|
| committer | Ralph Boehme <slow@samba.org> | 2018-02-21 14:19:17 +0100 |
| commit | 29aa5c93d751384829175a3ac0cc42e6905fe8b1 (patch) | |
| tree | 4aa1b45992838a8bacad0ab7125cfe1b10672bcc /source3 | |
| parent | 14f798cbcccb5712d8b31bc891c49a00a7483a95 (diff) | |
| download | samba-29aa5c93d751384829175a3ac0cc42e6905fe8b1.tar.gz | |
wscript: drop checks for setnetgrent/endnetgrent/getnetgrent
we don't use setnetgrent/endnetgrent/getnetgrent since security share passed
away.
Signed-off-by: Bjoern Jacke <bjacke@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/smbd/password.c | 11 | ||||
| -rw-r--r-- | source3/wscript | 23 |
2 files changed, 1 insertions, 33 deletions
diff --git a/source3/smbd/password.c b/source3/smbd/password.c index edff5d9d2ec..f472bda2c70 100644 --- a/source3/smbd/password.c +++ b/source3/smbd/password.c @@ -26,17 +26,6 @@ #include "auth.h" #include "../libcli/security/security.h" -/* Fix up prototypes for OSX 10.4, where they're missing */ -#ifndef HAVE_SETNETGRENT_PROTOTYPE -extern int setnetgrent(const char* netgroup); -#endif -#ifndef HAVE_GETNETGRENT_PROTOTYPE -extern int getnetgrent(char **host, char **user, char **domain); -#endif -#ifndef HAVE_ENDNETGRENT_PROTOTYPE -extern void endnetgrent(void); -#endif - enum server_allocated_state { SERVER_ALLOCATED_REQUIRED_YES, SERVER_ALLOCATED_REQUIRED_NO, SERVER_ALLOCATED_REQUIRED_ANY}; diff --git a/source3/wscript b/source3/wscript index 6d2d94bae87..2deb7ffe5d4 100644 --- a/source3/wscript +++ b/source3/wscript @@ -592,28 +592,7 @@ msg.msg_accrightslen = sizeof(fd); headers='unistd.h sys/types.h dirent.h', define='HAVE_DIRENT_D_OFF') - conf.CHECK_FUNCS('setnetgrent getnetgrent endnetgrent') - if conf.CHECK_CFLAGS('-Werror-implicit-function-declaration'): - netgrent_cflags = '-Werror-implicit-function-declaration' - else: - netgrent_cflags = '' - conf.CHECK_CODE('setnetgrent("foo")', 'HAVE_SETNETGRENT_PROTOTYPE', - msg="Checking for setnetgrent prototype", - headers='netdb.h netgroup.h', - cflags=netgrent_cflags) - conf.CHECK_CODE('getnetgrent', 'HAVE_GETNETGRENT_PROTOTYPE', - msg="Checking for getnetgrent prototype", - headers='netdb.h netgroup.h', - cflags=netgrent_cflags) - conf.CHECK_CODE('endnetgrent', 'HAVE_ENDNETGRENT_PROTOTYPE', - msg="Checking for endnetgrent prototype", - headers='netdb.h netgroup.h', - cflags=netgrent_cflags) - - if (conf.CONFIG_SET('HAVE_YP_GET_DEFAULT_DOMAIN') and - conf.CONFIG_SET('HAVE_SETNETGRENT') and - conf.CONFIG_SET('HAVE_ENDNETGRENT') and - conf.CONFIG_SET('HAVE_GETNETGRENT')): + if (conf.CONFIG_SET('HAVE_YP_GET_DEFAULT_DOMAIN')): conf.DEFINE('HAVE_NETGROUP', '1') # Look for CUPS |