From: Michael Adam Date: Mon, 9 Feb 2009 22:24:31 +0000 (+0100) Subject: Revert "s3:winbindd_user: create domain connection in winbindd_fill_pwent if necessary." X-Git-Tag: samba-4.0.0alpha7~395 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ecc53d0312dbe0af85ae490e4f4953e1ad4906fb;p=thirdparty%2Fsamba.git Revert "s3:winbindd_user: create domain connection in winbindd_fill_pwent if necessary." This reverts commit 487f5e7b4768cfe9e511b0ba56f16c411e21f702. I was confused about the real meaning of find_domain_from_name_noinit() vs. find_domain_from_name(). We don't need the connection established here, just the domain struct which gets initialized by rescan_trusted_domains(). Sorry for the noise. Michael --- diff --git a/source3/winbindd/winbindd_user.c b/source3/winbindd/winbindd_user.c index 8b481f972c6..a6740b1fb86 100644 --- a/source3/winbindd/winbindd_user.c +++ b/source3/winbindd/winbindd_user.c @@ -80,7 +80,7 @@ static bool winbindd_fill_pwent(TALLOC_CTX *ctx, char *dom_name, char *user_name if (!pw || !dom_name || !user_name) return False; - domain = find_domain_from_name(dom_name); + domain = find_domain_from_name_noinit(dom_name); if (domain == NULL) { DEBUG(5,("winbindd_fill_pwent: Failed to find domain for %s.\n", dom_name));