diff options
| author | Karolin Seeger <kseeger@samba.org> | 2008-02-29 10:44:38 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2008-02-29 10:44:38 +0100 |
| commit | c4fbe2846231a6b322c1094c6a1dbf93b7305768 (patch) | |
| tree | 09eb77a294f4acda131b41fe4c9bec4ed175eb16 /source3/passdb/pdb_interface.c | |
| parent | 1a6415fc77c708b87c8e2ce6e7828f486ffc87ac (diff) | |
| parent | 695b6662abe64a40061bfa05ede12173fc4b1945 (diff) | |
| download | samba-c4fbe2846231a6b322c1094c6a1dbf93b7305768.tar.gz samba-c4fbe2846231a6b322c1094c6a1dbf93b7305768.tar.bz2 samba-c4fbe2846231a6b322c1094c6a1dbf93b7305768.zip | |
Merge commit 'origin/v3-2-test' into v3-2-stable
Conflicts:
WHATSNEW.txt
(This used to be commit a390bcf9403df4cf4d5eef42b35ebccbe253882e)
Diffstat (limited to 'source3/passdb/pdb_interface.c')
| -rw-r--r-- | source3/passdb/pdb_interface.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c index 0ab45bafc3..cd34c89bfc 100644 --- a/source3/passdb/pdb_interface.c +++ b/source3/passdb/pdb_interface.c @@ -168,7 +168,7 @@ NTSTATUS make_pdb_method_name(struct pdb_methods **methods, const char *selected } /****************************************************************** - Return an already initialised pdn_methods structure + Return an already initialized pdb_methods structure *******************************************************************/ static struct pdb_methods *pdb_get_methods_reload( bool reload ) @@ -1349,7 +1349,7 @@ 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 */ winbind_env = winbind_env_set(); - winbind_off(); + (void)winbind_off(); if ((grp = getgrgid(gid)) == NULL) { /* allow winbindd lookups, but only if they weren't already disabled */ @@ -1385,7 +1385,7 @@ static bool get_memberuids(TALLOC_CTX *mem_ctx, gid_t gid, uid_t **pp_uids, size /* allow winbindd lookups, but only if they weren't already disabled */ if (!winbind_env) { - winbind_on(); + (void)winbind_on(); } return ret; |