[SCM] Samba Shared Repository - branch master updated

[Bo Yang]

The branch, master has been updated
       via  dde1c42... s3: Fix kerberos refresh chain.
      from  170d6a3... Fix debug comment (brain wasn't working...). Jeremy.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit dde1c420037bfea48741ba1f600c047cca788a21
Author: Bo Yang <boyang at samba.org>
Date:   Fri Nov 6 08:20:25 2009 +0800

    s3: Fix kerberos refresh chain.
    
    Signed-off-by: Bo Yang <boyang at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 source3/winbindd/winbindd_pam.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index fe64855..43f81f7 100644
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -986,7 +986,9 @@ static NTSTATUS winbindd_dual_pam_auth_cached(struct winbindd_domain *domain,
 #ifdef HAVE_KRB5
 		if ((state->request->flags & WBFLAG_PAM_KRB5) &&
 		    ((tdc_domain = wcache_tdc_fetch_domain(state->mem_ctx, name_domain)) != NULL) &&
-		    (tdc_domain->trust_type & NETR_TRUST_TYPE_UPLEVEL)) {
+		    ((tdc_domain->trust_type & NETR_TRUST_TYPE_UPLEVEL) ||
+		    /* used to cope with the case winbindd starting without network. */
+		    !strequal(tdc_domain->domain_name, tdc_domain->dns_name))) {
 
 			uid_t uid = -1;
 			const char *cc = NULL;


-- 
Samba Shared Repository