rpms/cups/devel cups-str2703.patch,NONE,1.1 cups.spec,1.386,1.387

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1399

Modified Files:
	cups.spec 
Added Files:
	cups-str2703.patch 
Log Message:
* Tue Feb 12 2008 Tim Waugh <twaugh at redhat.com> 1:1.3.5-5
- Fixed admin.cgi handling of DefaultAuthType (bug #432478, STR #2703).


cups-str2703.patch:

--- NEW FILE cups-str2703.patch ---
diff -up cups-1.3.5/cgi-bin/admin.c.str2703 cups-1.3.5/cgi-bin/admin.c
--- cups-1.3.5/cgi-bin/admin.c.str2703	2008-02-12 16:36:28.000000000 +0000
+++ cups-1.3.5/cgi-bin/admin.c	2008-02-12 16:37:38.000000000 +0000
@@ -1373,13 +1373,16 @@ do_config_server(http_t *http)		/* I - H
     */
 
     if (cgiGetVariable("KERBEROS"))
-      default_auth_type = "Negotiate";
+      default_auth_type = strdup ("Negotiate");
     else
     {
-      default_auth_type = cupsGetOption("DefaultAuthType", num_settings,
-                                        settings);
+      default_auth_type = strdup (cupsGetOption("DefaultAuthType", num_settings,
+						settings));
       if (!strcasecmp(default_auth_type, "Negotiate"))
-        default_auth_type = "Basic";
+      {
+	free (default_auth_type);
+        default_auth_type = strdup ("Basic");
+      }
     }
 
     fprintf(stderr, "DEBUG: DefaultAuthType %s\n", default_auth_type);
@@ -1429,6 +1432,7 @@ do_config_server(http_t *http)		/* I - H
 #ifdef HAVE_GSSAPI
       num_settings = cupsAddOption("DefaultAuthType", default_auth_type,
                                    num_settings, &settings);
+      free (default_auth_type);
 #endif /* HAVE_GSSAPI */
 
       if (!cupsAdminSetServerSettings(http, num_settings, settings))


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.386
retrieving revision 1.387
diff -u -r1.386 -r1.387
--- cups.spec	5 Feb 2008 16:58:04 -0000	1.386
+++ cups.spec	12 Feb 2008 16:40:09 -0000	1.387
@@ -42,6 +42,7 @@
 Patch15: cups-peercred.patch
 Patch16: cups-pid.patch
 Patch17: cups-foomatic-recommended.patch
+Patch18: cups-str2703.patch
 Patch19: cups-eggcups.patch
 Patch20: cups-getpass.patch
 Patch21: cups-driverd-timeout.patch
@@ -156,6 +157,7 @@
 %patch15 -p1 -b .peercred
 %patch16 -p1 -b .pid
 %patch17 -p1 -b .foomatic-recommended
+%patch18 -p1 -b .str2703
 %patch19 -p1 -b .eggcups
 %patch20 -p1 -b .getpass
 %patch21 -p1 -b .driverd-timeout
@@ -452,6 +454,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Tue Feb 12 2008 Tim Waugh <twaugh at redhat.com> 1:1.3.5-5
+- Fixed admin.cgi handling of DefaultAuthType (bug #432478, STR #2703).
+
 * Tue Feb  5 2008 Tim Waugh <twaugh at redhat.com> 1:1.3.5-4
 - Fix compilation of SO_PEERCRED support.
 - Include fixes from svn up to revision 7287.  No longer need str2650 or