diff --git a/cups-str2703.patch b/cups-str2703.patch new file mode 100644 index 0000000..ed07607 --- /dev/null +++ b/cups-str2703.patch @@ -0,0 +1,32 @@ +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 2007-11-30 07:00:59.000000000 +0000 ++++ cups-1.3.5/cgi-bin/admin.c 2008-02-12 16:31:37.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)) diff --git a/cups.spec b/cups.spec index 3ee09ec..e5e4a64 100644 --- a/cups.spec +++ b/cups.spec @@ -6,7 +6,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.3.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: System Environment/Daemons Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}-source.tar.bz2 @@ -47,6 +47,7 @@ Patch20: cups-getpass.patch Patch21: cups-driverd-timeout.patch Patch22: cups-strict-ppd-line-length.patch Patch23: cups-str2664.patch +Patch24: cups-str2703.patch Patch25: cups-usb-paperout.patch Patch100: cups-lspp.patch Epoch: 1 @@ -161,6 +162,7 @@ lpd emulation. %patch21 -p1 -b .driverd-timeout %patch22 -p1 -b .strict-ppd-line-length %patch23 -p1 -b .str2664 +%patch24 -p1 -b .str2703 %patch25 -p1 -b .usb-paperout %if %lspp @@ -453,6 +455,9 @@ rm -rf $RPM_BUILD_ROOT %{cups_serverbin}/daemon/cups-lpd %changelog +* Tue Feb 12 2008 Tim Waugh 1.3.5-3 +- Fixed admin.cgi handling of DefaultAuthType (bug #432478, STR #2703). + * Mon Jan 21 2008 Tim Waugh 1.3.5-2 - Rebuilt.