From 93ee02812b0e8c4ff038e761564ebed085350fdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Jacke?= Date: Thu, 11 Jan 2018 22:13:20 +0100 Subject: [PATCH 1/3] s3: remove dead already commented code Signed-off-by: Bjoern Jacke --- source3/smbd/sesssetup.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c index e1fc7fd..56318a0 100644 --- a/source3/smbd/sesssetup.c +++ b/source3/smbd/sesssetup.c @@ -531,10 +531,7 @@ static void setup_new_vc_session(struct smbd_server_connection *sconn) { DEBUG(2,("setup_new_vc_session: New VC == 0, if NT4.x " "compatible we would close all old resources.\n")); -#if 0 - conn_close_all(); - invalidate_all_vuids(); -#endif + if (lp_reset_on_zero_vc()) { char *addr; struct shutdown_state state; -- 2.7.4 From 8ec4847ede6f88374671242cd890465bd0e3b270 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Jacke?= Date: Wed, 24 Jan 2018 10:02:13 +0100 Subject: [PATCH 2/3] wscript: drop checks for setnetgrent/endnetgrent/getnetgrent we don't use setnetgrent/endnetgrent/getnetgrent since security share passed away. Signed-off-by: Bjoern Jacke --- source3/smbd/password.c | 11 ----------- source3/wscript | 23 +---------------------- 2 files changed, 1 insertion(+), 33 deletions(-) diff --git a/source3/smbd/password.c b/source3/smbd/password.c index edff5d9..f472bda 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 8751833..feee596 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 -- 2.7.4 From 14a99da0c996bfa94a78c1e9a123cea418310ca3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Jacke?= Date: Wed, 24 Jan 2018 01:28:25 +0100 Subject: [PATCH 3/3] replace: remove some duplicate checks Signed-off-by: Bjoern Jacke --- lib/replace/system/wscript_configure | 8 -------- 1 file changed, 8 deletions(-) diff --git a/lib/replace/system/wscript_configure b/lib/replace/system/wscript_configure index 2035474..ecd9964 100644 --- a/lib/replace/system/wscript_configure +++ b/lib/replace/system/wscript_configure @@ -1,8 +1,5 @@ #!/usr/bin/env python -conf.CHECK_HEADERS('sys/capability.h') -conf.CHECK_FUNCS('getpwnam_r getpwuid_r getpwent_r') - # solaris varients of getXXent_r conf.CHECK_C_PROTOTYPE('getpwent_r', 'struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)', @@ -19,8 +16,3 @@ conf.CHECK_C_PROTOTYPE('getgrent_r', 'struct group *getgrent_r(struct group *src, char *buf, size_t buflen)', define='SOLARIS_GETGRENT_R', headers='grp.h') -conf.CHECK_FUNCS('getgrouplist') -conf.CHECK_HEADERS('ctype.h locale.h langinfo.h') -conf.CHECK_HEADERS('fnmatch.h locale.h langinfo.h') -conf.CHECK_HEADERS('sys/ipc.h sys/mman.h sys/shm.h') -conf.CHECK_HEADERS('termios.h termio.h sys/termio.h') -- 2.7.4