diff options
author | Gerald Carter <jerry@samba.org> | 2006-04-02 06:25:11 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:15:51 -0500 |
commit | 4ab372f4cab22225716b5c9a9a08f0c1dbc9928d (patch) | |
tree | 01ead10e42befa0f212de6cff637564477e81ab4 /source/nsswitch/wb_common.c | |
parent | 9a763da07385bf9af437cab8dd680f2e13fca3c3 (diff) | |
download | samba-4ab372f4cab22225716b5c9a9a08f0c1dbc9928d.tar.gz samba-4ab372f4cab22225716b5c9a9a08f0c1dbc9928d.tar.xz samba-4ab372f4cab22225716b5c9a9a08f0c1dbc9928d.zip |
r14855: Various fixes:
* depreacte 'acl group control' after discussion with Jeremy
and implement functionality as part of 'dos filemode'
* fix winbindd on a non-member server to expand local groups
* prevent code previously only used by smbd from blindly
turning _NO_WINBINDD back on
Diffstat (limited to 'source/nsswitch/wb_common.c')
-rw-r--r-- | source/nsswitch/wb_common.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/source/nsswitch/wb_common.c b/source/nsswitch/wb_common.c index dfefeb9f754..05f080e73a9 100644 --- a/source/nsswitch/wb_common.c +++ b/source/nsswitch/wb_common.c @@ -618,16 +618,15 @@ NSS_STATUS winbindd_request_response(int req_type, /* Use putenv() instead of setenv() in these functions as not all environments have the latter. */ -BOOL winbind_off( void ) +BOOL winbind_putenv( const char *s ) { - static char *s = CONST_DISCARD(char *, WINBINDD_DONT_ENV "=1"); + fstring env; - return putenv(s) != -1; -} + if ( !s ) { + return False; + } -BOOL winbind_on( void ) -{ - static char *s = CONST_DISCARD(char *, WINBINDD_DONT_ENV "=0"); + snprintf( env, sizeof(env), "%s=%s", WINBINDD_DONT_ENV, s ); - return putenv(s) != -1; + return putenv(env) != -1; } |