diff options
| -rw-r--r-- | source/auth/auth_util.c | 2 | ||||
| -rw-r--r-- | source/nsswitch/idmap.c | 23 | ||||
| -rw-r--r-- | source/nsswitch/winbindd.c | 3 | ||||
| -rw-r--r-- | source/nsswitch/winbindd_dual.c | 3 |
4 files changed, 2 insertions, 29 deletions
diff --git a/source/auth/auth_util.c b/source/auth/auth_util.c index 1539fc929ed..4e9e6f85f66 100644 --- a/source/auth/auth_util.c +++ b/source/auth/auth_util.c @@ -982,9 +982,7 @@ static struct nt_user_token *create_local_nt_token(TALLOC_CTX *mem_ctx, NTSTATUS create_local_token(auth_serversupplied_info *server_info) { TALLOC_CTX *mem_ctx; - struct id_map *ids; NTSTATUS status; - BOOL wb = True; size_t i; diff --git a/source/nsswitch/idmap.c b/source/nsswitch/idmap.c index 616fce5c44e..530e03089d0 100644 --- a/source/nsswitch/idmap.c +++ b/source/nsswitch/idmap.c @@ -91,24 +91,6 @@ static struct idmap_alloc_methods *get_alloc_methods(struct idmap_alloc_backend return NULL; } -/* part of a quick hack to avoid loops, need to be sorted out correctly later on */ -static BOOL idmap_in_own_child; - -static BOOL idmap_is_in_own_child(void) -{ - return idmap_in_own_child; -} - -void reset_idmap_in_own_child(void) -{ - idmap_in_own_child = False; -} - -void set_idmap_in_own_child(void) -{ - idmap_in_own_child = True; -} - BOOL idmap_is_offline(void) { return ( lp_winbind_offline_logon() && @@ -855,9 +837,6 @@ static NTSTATUS idmap_new_mapping(TALLOC_CTX *ctx, struct id_map *map) { NTSTATUS ret; struct idmap_domain *dom; - char *domname, *name; - enum lsa_SidType sid_type; - BOOL wbret; /* If we are offline we cannot lookup SIDs, deny mapping */ if (idmap_is_offline()) { @@ -1415,6 +1394,8 @@ void idmap_dump_maps(char *logfile) (unsigned long)maps[i].xid.id, sid_string_static(maps[i].sid)); break; + case ID_TYPE_NOT_SPECIFIED: + break; } } diff --git a/source/nsswitch/winbindd.c b/source/nsswitch/winbindd.c index 2a952f6d7e0..59bb04e7d2a 100644 --- a/source/nsswitch/winbindd.c +++ b/source/nsswitch/winbindd.c @@ -1012,9 +1012,6 @@ int main(int argc, char **argv, char **envp) namecache_enable(); - /* quick hack to avoid a loop in idmap, proper fix later */ - reset_idmap_in_own_child(); - /* Winbind daemon initialisation */ if ( ! NT_STATUS_IS_OK(idmap_init_cache()) ) { diff --git a/source/nsswitch/winbindd_dual.c b/source/nsswitch/winbindd_dual.c index 169332a7466..8d475e6c9f9 100644 --- a/source/nsswitch/winbindd_dual.c +++ b/source/nsswitch/winbindd_dual.c @@ -923,9 +923,6 @@ static BOOL fork_domain_child(struct winbindd_child *child) child); } - /* quick hack to avoid a loop in idmap, proper fix later */ - set_idmap_in_own_child(); - while (1) { int ret; |