rpms/cups/F-7 cups-lspp.patch,1.22,1.23 cups.spec,1.347,1.348

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24967

Modified Files:
	cups-lspp.patch cups.spec 
Log Message:
* Mon Nov 12 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.12-8
- LSPP fixes (cupsdSetString/ClearString).


cups-lspp.patch:

Index: cups-lspp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-7/cups-lspp.patch,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- cups-lspp.patch	31 Jul 2007 12:27:39 -0000	1.22
+++ cups-lspp.patch	12 Nov 2007 18:31:44 -0000	1.23
@@ -1160,7 +1160,7 @@
 +      cupsdSetStringf(&audit_message, "[Config] Classification=%s", Classification);
 +      audit_log_user_message(AuditLog, AUDIT_LABEL_LEVEL_CHANGE, audit_message,
 +                             ServerName, NULL, NULL, 1);
-+      free(audit_message);
++      cupsdClearString(&audit_message);
 +    }
 +#endif /* WITH_LSPP */
 +  }
@@ -1659,7 +1659,7 @@
 +                          con->username, con->scon, printer->name);
 +          audit_log_user_message(AuditLog, AUDIT_USER_LABELED_EXPORT, audit_message,
 +                                 ServerName, NULL, NULL, 0);
-+          free(audit_message);
++          cupsdClearString(&audit_message);
 +        }
 +
 +        send_ipp_status(con, IPP_NOT_AUTHORIZED, _("SELinux prohibits access to the printer"));
@@ -1804,7 +1804,7 @@
 +            audit_log_user_message(AuditLog, AUDIT_LABEL_OVERRIDE, audit_message,
 +                                   ServerName, NULL, NULL, 0);
 +      }
-+          free(audit_message);
++          cupsdClearString(&audit_message);
        }
      }
  
@@ -2364,7 +2364,7 @@
 +                          job->auid, (job->username)?job->username:"?", job->scon, printer->name);
 +          audit_log_user_message(AuditLog, AUDIT_USER_LABELED_EXPORT, audit_message,
 +                                 ServerName, NULL, NULL, 0);
-+          free(audit_message);
++          cupsdClearString(&audit_message);
 +        }
 +
 +        cupsdCancelJob(job, 0, IPP_JOB_ABORTED);
@@ -2413,7 +2413,7 @@
 +                        job->id, job->auid, job->username, printer->name, title);
 +        audit_log_user_message(AuditLog, AUDIT_USER_UNLABELED_EXPORT, audit_message,
 +                               ServerName, NULL, NULL, 1);
-+        free(audit_message);
++        cupsdClearString(&audit_message);
 +      }
 +    }
 +    else 
@@ -2451,7 +2451,7 @@
 +                        printer->name, title, job->scon, mls_label?mls_label:"none");
 +        audit_log_user_message(AuditLog, AUDIT_USER_LABELED_EXPORT, audit_message,
 +                               ServerName, NULL, NULL, 1);
-+        free(audit_message);
++        cupsdClearString(&audit_message);
 +      }
 +      context_free(jobcon);
 +      free(label_template);
@@ -2540,7 +2540,7 @@
 +      if (printercon)
 +        context_free(printercon);
 +      free(rangestr);
-+      free(audit_message);
++      cupsdClearString(&audit_message);
 +    }
 +#endif /* WITH_LSPP */
    }


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-7/cups.spec,v
retrieving revision 1.347
retrieving revision 1.348
diff -u -r1.347 -r1.348
--- cups.spec	7 Nov 2007 21:10:23 -0000	1.347
+++ cups.spec	12 Nov 2007 18:31:44 -0000	1.348
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.12
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -451,6 +451,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Mon Nov 12 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.12-8
+- LSPP fixes (cupsdSetString/ClearString).
+
 * Wed Nov  7 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.12-7
 - Applied patch to fix CVE-2007-4045 (bug #250161).
 - Applied patch to fix CVE-2007-4352, CVE-2007-5392 and