From: mike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Date: Mon, 17 Dec 2012 22:40:54 +0000 (+0000)
Subject: Fixed a problem with local Kerberos authentication (STR #4140)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6488851f5efacef3f012c24f01ecaecc75a799da;p=thirdparty%2Fcups.git

Fixed a problem with local Kerberos authentication (STR #4140)



git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10778 7a7537e8-13f0-0310-91df-b6672ffda945
---

diff --git a/CHANGES-1.6.txt b/CHANGES-1.6.txt
index aadd4a7e54..3c10a85fa2 100644
--- a/CHANGES-1.6.txt
+++ b/CHANGES-1.6.txt
@@ -7,6 +7,7 @@ CHANGES IN CUPS V1.6.2
 	- Security: All file, directory, user, and group settings are now stored
 	  in a separate cups-files.conf configuration file that cannot be set
 	  through the CUPS web interface or APIs (STR #4223)
+	- Fixed a problem with local Kerberos authentication (STR #4140)
 	- Coverity scan: fixed some minor issues (STR #4242)
 	- The scheduler did not remove color profiles after deleting a printer
 	  (STR #4232)
diff --git a/scheduler/client.c b/scheduler/client.c
index 663c64bd8f..e9abb82bb3 100644
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -2580,14 +2580,7 @@ cupsdSendHeader(
 	       con->http.hostname);
 #ifdef HAVE_GSSAPI
     else if (auth_type == CUPSD_AUTH_NEGOTIATE)
-    {
-#  ifdef AF_LOCAL
-      if (_httpAddrFamily(con->http.hostaddr) == AF_LOCAL)
-        strlcpy(auth_str, "Basic realm=\"CUPS\"", sizeof(auth_str));
-      else
-#  endif /* AF_LOCAL */
       strlcpy(auth_str, "Negotiate", sizeof(auth_str));
-    }
 #endif /* HAVE_GSSAPI */
 
     if (con->best && auth_type != CUPSD_AUTH_NEGOTIATE &&