rpms/cups/F-7 cups-CVE-2007-4045.patch, 1.1, 1.2 cups.spec, 1.348, 1.349

[Tim Waugh (twaugh)]

Author: twaugh

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

Modified Files:
	cups-CVE-2007-4045.patch cups.spec 
Log Message:
* Mon Nov 12 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.12-8
- 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/F-7/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:10:23 -0000	1.1
+++ cups-CVE-2007-4045.patch	12 Nov 2007 18:52:34 -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/F-7/cups.spec,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -r1.348 -r1.349
--- cups.spec	12 Nov 2007 18:31:44 -0000	1.348
+++ cups.spec	12 Nov 2007 18:52:34 -0000	1.349
@@ -452,6 +452,8 @@
 
 %changelog
 * Mon Nov 12 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.12-8
+- Fixed CVE-2007-4045 patch; has no effect with shipped packages since they
+  are linked with gnutls.
 - LSPP fixes (cupsdSetString/ClearString).
 
 * Wed Nov  7 2007 Tim Waugh <twaugh at redhat.com> 1:1.2.12-7