Attachment 4918 Details for Bug 6872 – patch for v3-4-test

[patch] patch for v3-4-test

krb5-refresh-chain-v3-4-test.diff (text/plain), 1.13 KB, created by Bo Yang on 2009-11-05 03:01:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bo Yang

Created: 2009-11-05 03:01:31 UTC

Size: 1.13 KB

patch

obsolete

>From 2300ec3006098536c1a615820b4774d625f82c05 Mon Sep 17 00:00:00 2001
>From: Bo Yang <boyang@samba.org>
>Date: Fri, 6 Nov 2009 08:20:25 +0800
>Subject: [PATCH] s3: Fix kerberos refresh chain.
>
>Signed-off-by: Bo Yang <boyang@samba.org>
>(cherry picked from commit dde1c420037bfea48741ba1f600c047cca788a21)
>---
> source3/winbindd/winbindd_pam.c |    4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)
>
>diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
>index d891e30..226e5be 100644
>--- a/source3/winbindd/winbindd_pam.c
>+++ b/source3/winbindd/winbindd_pam.c
>@@ -999,7 +999,9 @@ 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;
>-- 
>1.5.3
>

Actions: View

Attachments on bug 6872: 4916 | 4917 | 4918