rpms/cups/devel cups-lspp.patch,1.3,1.4 cups.spec,1.251,1.252

[fedora-cvs-commits redhat com]

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11627

Modified Files:
	cups-lspp.patch cups.spec 
Log Message:
* Thu Aug 24 2006 Tim Waugh <twaugh redhat com> 1:1.2.2-15
- Fixed LSPP patch passing NULL to strcmp (bug #203784).


cups-lspp.patch:
 Makedefs.in                 |    2 
 config-scripts/cups-lspp.m4 |   36 +++++
 config.h.in                 |    7 +
 configure.in                |    2 
 cups/cups.h                 |    8 +
 data/Makefile               |    5 
 data/mls                    |  277 ++++++++++++++++++++++++++++++++++++++++++++
 data/selinux                |  277 ++++++++++++++++++++++++++++++++++++++++++++
 data/te                     |  277 ++++++++++++++++++++++++++++++++++++++++++++
 scheduler/Makefile          |    6 
 scheduler/client.c          |  101 +++++++++++++++-
 scheduler/client.h          |   14 ++
 scheduler/conf.c            |   46 +++++++
 scheduler/conf.h            |    8 +
 scheduler/ipp.c             |  271 +++++++++++++++++++++++++++++++++++++++++++
 scheduler/job.c             |  155 ++++++++++++++++++++++++
 scheduler/job.h             |   11 +
 scheduler/lspp-access.c     |   56 ++++++++
 scheduler/main.c            |   32 +++++
 scheduler/printers.c        |   45 +++++++
 20 files changed, 1630 insertions(+), 6 deletions(-)

Index: cups-lspp.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups-lspp.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cups-lspp.patch	21 Aug 2006 16:26:28 -0000	1.3
+++ cups-lspp.patch	24 Aug 2006 09:50:28 -0000	1.4
@@ -1430,13 +1430,13 @@
 +        userfooter = strdup(attr->values[1].string.text);
 +  
 +      if ((strcmp(userheader, Classification) == 0)
-+          && (strcmp(userfooter, Classification) == 0))
++          && userfooter &&(strcmp(userfooter, Classification) == 0))
 +      {
 +       /*
 +        * Since both values are Classification, the user is not trying to Override
 +        */
 +        free(userheader);
-+        free(userfooter);
++        if (userfooter) free(userfooter);
 +        userheader = userfooter = NULL;
 +      }
 +    }


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -r1.251 -r1.252
--- cups.spec	21 Aug 2006 16:26:28 -0000	1.251
+++ cups.spec	24 Aug 2006 09:50:28 -0000	1.252
@@ -6,7 +6,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.2
-Release: 14
+Release: 15
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -420,6 +420,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Thu Aug 24 2006 Tim Waugh <twaugh redhat com> 1:1.2.2-15
+- Fixed LSPP patch passing NULL to strcmp (bug #203784).
+
 * Mon Aug 21 2006 Tim Waugh <twaugh redhat com> 1:1.2.2-14
 - Updated LSPP patch (bug #203376).