rpms/cups/FC-5 cups-str1532.patch,NONE,1.1 cups.spec,1.144,1.145

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Apr 7 15:16:51 UTC 2006


Author: twaugh

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

Modified Files:
	cups.spec 
Added Files:
	cups-str1532.patch 
Log Message:
- Only warn about ACLs once (STR #1532).

cups-str1532.patch:
 0 files changed

--- NEW FILE cups-str1532.patch ---
--- cups-1.2rc1/scheduler/cert.c	(revision 5380)
+++ cups-1.2rc1/scheduler/cert.c	(working copy)
@@ -107,6 +107,8 @@
 #  ifdef HAVE_MBR_UID_TO_UUID
     uuid_t		group;		/* Group ID */
 #  endif /* HAVE_MBR_UID_TO_UUID */
+    static int		acls_not_supported = 0;
+					/* Only warn once */
 #endif /* HAVE_ACL_INIT */
 
 
@@ -201,8 +203,9 @@
 
       if (acl_valid(acl))
       {
-        char *text, *textptr;
+        char *text, *textptr;		/* Temporary string */
 
+
         cupsdLogMessage(CUPSD_LOG_ERROR, "ACL did not validate: %s",
 	                strerror(errno));
         text = acl_to_text(acl, NULL);
@@ -217,9 +220,16 @@
 #  endif /* HAVE_MBR_UID_TO_UUID */
 
       if (acl_set_fd(fd, acl))
-	cupsdLogMessage(CUPSD_LOG_ERROR,
-			"Unable to set ACLs on root certificate \"%s\" - %s",
-			filename, strerror(errno));
+      {
+	if (errno != EOPNOTSUPP || !acls_not_supported)
+	  cupsdLogMessage(CUPSD_LOG_ERROR,
+			  "Unable to set ACLs on root certificate \"%s\" - %s",
+			  filename, strerror(errno));
+
+	if (errno == EOPNOTSUPP)
+	  acls_not_supported = 1;
+      }
+
       acl_free(acl);
     }
 #endif /* HAVE_ACL_INIT */


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- cups.spec	7 Apr 2006 15:14:41 -0000	1.144
+++ cups.spec	7 Apr 2006 15:16:46 -0000	1.145
@@ -43,6 +43,7 @@
 Patch20: cups-direct-usb.patch
 Patch21: cups-pstops.patch
 Patch22: cups-dest-cache-v2.patch
+Patch23: cups-str1532.patch
 Patch24: cups-maxlogsize.patch
 Patch28: cups-no-propagate-ipp-port.patch
 Patch32: cups-pid.patch
@@ -142,6 +143,7 @@
 %patch20 -p1 -b .direct-usb
 %patch21 -p1 -b .pstops
 %patch22 -p1 -b .dest-cache-v2
+%patch23 -p1 -b .str1532
 %patch24 -p1 -b .maxlogsize
 %patch28 -p1 -b .no-propagate-ipp-port
 %patch32 -p1 -b .pid
@@ -390,6 +392,7 @@
 * Fri Apr  7 2006 Tim Waugh <twaugh at redhat.com>
 - No longer need openssl-devel.
 - Build with LDAP_DEPRECATED=1, to pick up declarations of ldap_init() etc.
+- Only warn about ACLs once (STR #1532).
 
 * Thu Apr  6 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.2.rc1.2.7
 - Build requires openldap-devel.




More information about the fedora-cvs-commits mailing list