Index: cups/adminutil.c
===================================================================
--- cups/adminutil.c	(revision 7084)
+++ cups/adminutil.c	(working copy)
@@ -956,7 +956,7 @@
     while (cupsFileGetConf(cupsd, line, sizeof(line), &value, &linenum))
     {
       if (!value && strncmp(line, "</", 2))
-        continue;
+        value = line + strlen(line);
 
       if (!strcasecmp(line, "Port") || !strcasecmp(line, "Listen"))
       {
@@ -1481,6 +1481,14 @@
 	  const char *remotep = cupsGetOption("BrowseRemoteProtocols",
 					      num_settings, settings);
 
+          if (!localp)
+	    localp = cupsGetOption("BrowseLocalProtocols", cupsd_num_settings,
+	                           cupsd_settings);
+
+          if (!remotep)
+	    remotep = cupsGetOption("BrowseRemoteProtocols", cupsd_num_settings,
+	                            cupsd_settings);
+
 	  if (new_remote_printers && new_share_printers)
 	    cupsFilePuts(temp,
 	                 "# Enable printer sharing and shared printers.\n");
@@ -1726,7 +1734,8 @@
     else if ((((in_admin_location || in_conf_location || in_root_location) &&
                remote_admin >= 0) ||
               (in_root_location && share_printers >= 0)) &&
-             (!strcasecmp(line, "Allow") || !strcasecmp(line, "Deny") ||
+             (((!strcasecmp(line, "Allow") || !strcasecmp(line, "Deny")) &&
+	       !strcasecmp(value, "@LOCAL")) ||
 	      !strcasecmp(line, "Order")))
       continue;
     else if (in_cancel_job == 2)
@@ -1900,7 +1909,7 @@
       cupsFilePuts(temp, "# Restrict access to the configuration files...\n");
 
     cupsFilePuts(temp, "<Location /admin/conf>\n"
-                       "  AuthType Basic\n"
+                       "  AuthType Default\n"
                        "  Require user @SYSTEM\n"
                        "  Order allow,deny\n");
 
@@ -1938,7 +1947,7 @@
 		       "CUPS-Add-Class CUPS-Delete-Class "
 		       "CUPS-Accept-Jobs CUPS-Reject-Jobs "
 		       "CUPS-Set-Default CUPS-Add-Device CUPS-Delete-Device>\n"
-                       "    AuthType Basic\n"
+                       "    AuthType Default\n"
 		       "    Require user @SYSTEM\n"
                        "    Order deny,allow\n"
                        "</Limit>\n");
Index: cgi-bin/admin.c
===================================================================
--- cgi-bin/admin.c	(revision 7084)
+++ cgi-bin/admin.c	(working copy)
@@ -1388,12 +1388,7 @@
     remote_printers   = cgiGetVariable("REMOTE_PRINTERS") ? "1" : "0";
     share_printers    = cgiGetVariable("SHARE_PRINTERS") ? "1" : "0";
     user_cancel_any   = cgiGetVariable("USER_CANCEL_ANY") ? "1" : "0";
-#ifdef HAVE_GSSAPI
-    default_auth_type = cgiGetVariable("KERBEROS") ? "Negotiate" : "Basic";
 
-    fprintf(stderr, "DEBUG: DefaultAuthType %s\n", default_auth_type);
-#endif /* HAVE_GSSAPI */
-
    /*
     * Get the current server settings...
     */
@@ -1409,7 +1404,25 @@
       return;
     }
 
+#ifdef HAVE_GSSAPI
    /*
+    * Get authentication settings...
+    */
+
+    if (cgiGetVariable("KERBEROS"))
+      default_auth_type = "Negotiate";
+    else
+    {
+      default_auth_type = cupsGetOption("DefaultAuthType", num_settings,
+                                        settings);
+      if (!strcasecmp(default_auth_type, "Negotiate"))
+        default_auth_type = "Basic";
+    }
+
+    fprintf(stderr, "DEBUG: DefaultAuthType %s\n", default_auth_type);
+#endif /* HAVE_GSSAPI */
+
+   /*
     * See if the settings have changed...
     */