Attachment 595339 Details for Bug 836628 – Patch which fixes the problem

[patch] Patch which fixes the problem

dont-overrite-dns-lookup.patch (text/plain), 1.80 KB, created by Stef Walter on 2012-06-29 16:45:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stef Walter

Created: 2012-06-29 16:45:03 UTC

Size: 1.80 KB

patch

obsolete

>--- authinfo.py	2012-02-18 20:18:47.000000000 +0100
>+++ authinfo.py.mod	2012-06-29 18:36:35.548532568 +0200
>@@ -880,5 +880,7 @@
> 
> def formatBool(val):
>-	if val:
>+	if val is None:
>+		return "not set"
>+	elif val:
> 		return "enabled"
> 	else:
>@@ -3021,5 +3023,5 @@
> 					continue
> 				if section == "libdefaults" and matchLine(ls, "dns_lookup_realm"):
>-					if not wrotednsrealm:
>+					if not wrotednsrealm and self.kerberosRealmviaDNS is not None:
> 						output += " dns_lookup_realm = "
> 						output += str(bool(self.kerberosRealmviaDNS)).lower()
>@@ -3028,5 +3030,5 @@
> 					continue
> 				if section == "libdefaults" and matchLine(ls, "dns_lookup_kdc"):
>-					if not wrotednskdc:
>+					if not wrotednskdc and self.kerberosKDCviaDNS is not None:
> 						output += " dns_lookup_kdc = "
> 						output += str(bool(self.kerberosKDCviaDNS)).lower()
>@@ -3065,10 +3067,10 @@
> 							output +=  "\n"
> 							wrotedefaultrealm = True
>-						if not wrotednsrealm:
>+						if not wrotednsrealm and self.kerberosRealmviaDNS is not None:
> 							output += " dns_lookup_realm = "
> 							output += str(bool(self.kerberosRealmviaDNS)).lower()
> 							output += "\n"
> 							wrotednsrealm = True
>-						if not wrotednskdc:
>+						if not wrotednskdc and self.kerberosKDCviaDNS is not None:
> 							output += " dns_lookup_kdc = "
> 							output += str(bool(self.kerberosKDCviaDNS)).lower()
>@@ -3110,9 +3112,9 @@
> 					output += defaultrealm
> 					output +=  "\n"
>-				if not wrotednsrealm:
>+				if not wrotednsrealm and self.kerberosRealmviaDNS is not None:
> 					output += " dns_lookup_realm = "
> 					output += str(bool(self.kerberosRealmviaDNS)).lower()
> 					output += "\n"
>-				if not wrotednskdc:
>+				if not wrotednskdc and self.kerberosRealmviaDNS is not None:
> 					output += " dns_lookup_kdc = "
> 					output += str(bool(self.kerberosKDCviaDNS)).lower()

Actions: View | Diff

Attachments on bug 836628: 595339