Author: jerry Date: 2007-04-21 21:39:05 +0000 (Sat, 21 Apr 2007) New Revision: 22431
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22431 Log: compiler cleanup fixes for the idmap changes that were not checked in fotr some reason Modified: branches/SAMBA_3_0_25/source/auth/auth_util.c branches/SAMBA_3_0_25/source/nsswitch/idmap.c branches/SAMBA_3_0_25/source/nsswitch/winbindd.c branches/SAMBA_3_0_25/source/nsswitch/winbindd_dual.c Changeset: Modified: branches/SAMBA_3_0_25/source/auth/auth_util.c =================================================================== --- branches/SAMBA_3_0_25/source/auth/auth_util.c 2007-04-21 21:29:31 UTC (rev 22430) +++ branches/SAMBA_3_0_25/source/auth/auth_util.c 2007-04-21 21:39:05 UTC (rev 22431) @@ -982,9 +982,7 @@ 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; Modified: branches/SAMBA_3_0_25/source/nsswitch/idmap.c =================================================================== --- branches/SAMBA_3_0_25/source/nsswitch/idmap.c 2007-04-21 21:29:31 UTC (rev 22430) +++ branches/SAMBA_3_0_25/source/nsswitch/idmap.c 2007-04-21 21:39:05 UTC (rev 22431) @@ -91,24 +91,6 @@ 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 @@ { 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 @@ (unsigned long)maps[i].xid.id, sid_string_static(maps[i].sid)); break; + case ID_TYPE_NOT_SPECIFIED: + break; } } Modified: branches/SAMBA_3_0_25/source/nsswitch/winbindd.c =================================================================== --- branches/SAMBA_3_0_25/source/nsswitch/winbindd.c 2007-04-21 21:29:31 UTC (rev 22430) +++ branches/SAMBA_3_0_25/source/nsswitch/winbindd.c 2007-04-21 21:39:05 UTC (rev 22431) @@ -1012,9 +1012,6 @@ 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()) ) { Modified: branches/SAMBA_3_0_25/source/nsswitch/winbindd_dual.c =================================================================== --- branches/SAMBA_3_0_25/source/nsswitch/winbindd_dual.c 2007-04-21 21:29:31 UTC (rev 22430) +++ branches/SAMBA_3_0_25/source/nsswitch/winbindd_dual.c 2007-04-21 21:39:05 UTC (rev 22431) @@ -923,9 +923,6 @@ child); } - /* quick hack to avoid a loop in idmap, proper fix later */ - set_idmap_in_own_child(); - while (1) { int ret;
