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 aadd4a7e54bce6c9bfc6ad3f813d609281b6f815..3c10a85fa25383dbd6768aee285391f7d2697cfb 100644 (file)
--- 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 663c64bd8f6fd36108a3a37b959be4bcb93053d4..e9abb82bb31fbb3f0a406b7632a42d6bdaeb768f 100644 (file)
--- 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 &&