rpms/cups/devel cups-CVE-2007-4045.patch, 1.1, 1.2 cups.spec, 1.370, 1.371

[Tim Waugh (twaugh)]

Author: twaugh

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

Modified Files:
	cups-CVE-2007-4045.patch cups.spec 
Log Message:
* Tue Nov 13 2007 Tim Waugh <twaugh at redhat.com>
- Fixed CVE-2007-4045 patch; has no effect with shipped packages since they
  are linked with gnutls.


cups-CVE-2007-4045.patch:

Index: cups-CVE-2007-4045.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups-CVE-2007-4045.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-CVE-2007-4045.patch	7 Nov 2007 21:26:56 -0000	1.1
+++ cups-CVE-2007-4045.patch	13 Nov 2007 14:54:12 -0000	1.2
@@ -16,8 +16,8 @@
 +       c;
 +       c = (cupsd_client_t *)cupsArrayNext(Clients))
 +  {
-+    bio = SSL_get_wbio(c->http.tls);
-+    BIO_ctrl(bio, BIO_C_SET_FILE_PTR, 0, (char *)HTTP(c));
++    if (c->http.tls)
++      BIO_ctrl(SSL_get_wbio(c->http.tls), BIO_C_SET_FILE_PTR, 0, (char *)HTTP(c));
 +  }
 +  cupsArrayRestore (Clients);
 +#endif


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.370
retrieving revision 1.371
diff -u -r1.370 -r1.371
--- cups.spec	13 Nov 2007 14:53:32 -0000	1.370
+++ cups.spec	13 Nov 2007 14:54:12 -0000	1.371
@@ -450,6 +450,8 @@
 
 %changelog
 * Tue Nov 13 2007 Tim Waugh <twaugh at redhat.com>
+- Fixed CVE-2007-4045 patch; has no effect with shipped packages since they
+  are linked with gnutls.
 - LSPP cupsdSetString/ClearString fixes (bug #378451).
 
 * Wed Nov  7 2007 Tim Waugh <twaugh at redhat.com> 1:1.3.4-2