svn commit: samba r5232 - in trunk/source/nsswitch: .
vlendec at samba.org
vlendec at samba.org
Fri Feb 4 15:40:29 GMT 2005
Author: vlendec
Date: 2005-02-04 15:40:29 +0000 (Fri, 04 Feb 2005)
New Revision: 5232
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5232
Log:
Don't add a domain twice.
Volker
Modified:
trunk/source/nsswitch/winbindd_util.c
Changeset:
Modified: trunk/source/nsswitch/winbindd_util.c
===================================================================
--- trunk/source/nsswitch/winbindd_util.c 2005-02-04 14:54:35 UTC (rev 5231)
+++ trunk/source/nsswitch/winbindd_util.c 2005-02-04 15:40:29 UTC (rev 5232)
@@ -248,7 +248,6 @@
while ((p != NULL) && (*p != '\0')) {
char *sidstr;
DOM_SID sid;
- struct winbindd_domain *domain;
sidstr = strchr(p, '\\');
if (sidstr == NULL) {
@@ -264,8 +263,12 @@
break;
}
- domain = add_trusted_domain(p, NULL, &cache_methods, &sid);
- setup_domain_child(&domain->child);
+ if (find_domain_from_sid_noinit(&sid) == NULL) {
+ struct winbindd_domain *domain;
+ domain = add_trusted_domain(p, NULL, &cache_methods,
+ &sid);
+ setup_domain_child(&domain->child);
+ }
p = strchr(sidstr, '\n');
if (p != NULL)
@@ -579,18 +582,15 @@
/* Given a domain sid, return the struct winbindd domain info for it */
-struct winbindd_domain *find_domain_from_sid(const DOM_SID *sid)
+struct winbindd_domain *find_domain_from_sid_noinit(const DOM_SID *sid)
{
struct winbindd_domain *domain;
/* Search through list */
for (domain = domain_list(); domain != NULL; domain = domain->next) {
- if (sid_compare_domain(sid, &domain->sid) == 0) {
- if (!domain->initialized)
- set_dc_type_and_flags(domain);
+ if (sid_compare_domain(sid, &domain->sid) == 0)
return domain;
- }
}
/* Not found */
@@ -598,6 +598,21 @@
return NULL;
}
+struct winbindd_domain *find_domain_from_sid(const DOM_SID *sid)
+{
+ struct winbindd_domain *domain;
+
+ domain = find_domain_from_sid_noinit(sid);
+
+ if (domain == NULL)
+ return NULL;
+
+ if (!domain->initialized)
+ set_dc_type_and_flags(domain);
+
+ return domain;
+}
+
/* Given a domain sid, return the struct winbindd domain info for it */
struct winbindd_domain *find_our_domain(void)
More information about the samba-cvs
mailing list