diff options
| author | Gerald Carter <jerry@samba.org> | 2006-10-19 22:34:58 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:15:34 -0500 |
| commit | 2145eff91d5b7e16ee486b410181f4b849a3fb9e (patch) | |
| tree | f4228e9543e406c2227f2f1cf0df604e093b809b /source3/nsswitch/wb_common.c | |
| parent | 7ac5df4824f3ad464276b6deeee6cecfe9e21c76 (diff) | |
| download | samba-2145eff91d5b7e16ee486b410181f4b849a3fb9e.tar.gz samba-2145eff91d5b7e16ee486b410181f4b849a3fb9e.tar.bz2 samba-2145eff91d5b7e16ee486b410181f4b849a3fb9e.zip | |
r19419: BUG 4109: Patch from Timur Bakeyev. Fix bug causing smbd to turn off
winbindd and fail to disable the _NO_WINBIND environment.
(This used to be commit a6366b40b3967853c20ca5399021108f09ffd505)
Diffstat (limited to 'source3/nsswitch/wb_common.c')
| -rw-r--r-- | source3/nsswitch/wb_common.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/source3/nsswitch/wb_common.c b/source3/nsswitch/wb_common.c index e665a0ffd5..05238f16fb 100644 --- a/source3/nsswitch/wb_common.c +++ b/source3/nsswitch/wb_common.c @@ -525,15 +525,11 @@ int read_reply(struct winbindd_response *response) NSS_STATUS winbindd_send_request(int req_type, struct winbindd_request *request) { struct winbindd_request lrequest; - char *env; - int value; - + /* Check for our tricky environment variable */ - if ( (env = getenv(WINBINDD_DONT_ENV)) != NULL ) { - value = atoi(env); - if ( value == 1 ) - return NSS_STATUS_NOTFOUND; + if (winbind_env_set()) { + return NSS_STATUS_NOTFOUND; } if (!request) { @@ -632,3 +628,14 @@ BOOL winbind_on( void ) return putenv(s) != -1; } +BOOL winbind_env_set( void ) +{ + char *env; + + if ((env=getenv(WINBINDD_DONT_ENV)) != NULL) { + if(strequal(env, "1")) { + return True; + } + } + return False; +} |