summaryrefslogtreecommitdiff
path: root/source3/passdb
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2006-04-02 19:45:42 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:15:52 -0500
commite4998337e75c5e9debe914ff4eb2c0b0fa97c156 (patch)
tree3b1aa826088fae703ed4cf590c8bfbd4a865d492 /source3/passdb
parent186f442f4cd4a8434c4e2d4e2c0de97b855c5586 (diff)
downloadsamba-e4998337e75c5e9debe914ff4eb2c0b0fa97c156.tar.gz
samba-e4998337e75c5e9debe914ff4eb2c0b0fa97c156.tar.bz2
samba-e4998337e75c5e9debe914ff4eb2c0b0fa97c156.zip
r14868: I will not write code when changing to Daylight Savings Time.
I will not write code when changing to Daylight Savings Time. I will not write code when changing to Daylight Savings Time. I will not write code when changing to Daylight Savings Time. I will not write code when changing to Daylight Savings Time. I will not write code when changing to Daylight Savings Time. I will not write code when changing to Daylight Savings Time. I will not write code when changing to Daylight Savings Time. I will not write code when changing to Daylight Savings Time. ... Fix my brain dead inverted logic for turning winbindd on and off when run on a DC or when calling pdb functions from within winbindd. (This used to be commit 021b3dc2db9fb422ede4657a1f27ef7ef2d22cee)
Diffstat (limited to 'source3/passdb')
-rw-r--r--source3/passdb/pdb_interface.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c
index 88cf387838..b6e635cca1 100644
--- a/source3/passdb/pdb_interface.c
+++ b/source3/passdb/pdb_interface.c
@@ -1509,11 +1509,13 @@ static BOOL get_memberuids(TALLOC_CTX *mem_ctx, gid_t gid, uid_t **pp_uids, size
/* We only look at our own sam, so don't care about imported stuff */
winbindd_env = getenv(WINBINDD_DONT_ENV);
- winbind_putenv("0");
+ winbind_off();
if ((grp = getgrgid(gid)) == NULL) {
- /* allow winbindd lookups */
- winbind_putenv( winbindd_env ? winbindd_env : "1" );
+ /* allow winbindd lookups, but only if they weren't already disabled */
+ if ( !(winbindd_env && strequal(winbindd_env, "1")) ) {
+ winbind_on();
+ }
return False;
}
@@ -1539,8 +1541,11 @@ static BOOL get_memberuids(TALLOC_CTX *mem_ctx, gid_t gid, uid_t **pp_uids, size
add_uid_to_array_unique(mem_ctx, pw->pw_uid, pp_uids, p_num);
}
- /* allow winbindd lookups */
- winbind_putenv( winbindd_env ? winbindd_env : "1" );
+ /* allow winbindd lookups, but only if they weren't already disabled */
+
+ if ( !(winbindd_env && strequal(winbindd_env, "1")) ) {
+ winbind_on();
+ }
return True;
}