More svn:properties changes.

[thirdparty/cups.git] / scheduler / cert.c

diff --git a/scheduler/cert.c b/scheduler/cert.c
index 0626b446177ff17018af08f4b29c2999235fbd3c..10e8d93e3e669f662d06e93a8ebe66bf192331b2 100644 (file)
--- a/scheduler/cert.c
+++ b/scheduler/cert.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: cert.c 5305 2006-03-18 03:05:12Z mike $"
+ * "$Id$"
  *
  *   Authentication certificate routines for the Common UNIX
  *   Printing System (CUPS).
@@ -107,6 +107,8 @@ cupsdAddCert(int        pid,                /* I - Process ID */
 #  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,7 +203,8 @@ cupsdAddCert(int        pid,                /* I - Process ID */
 
       if (acl_valid(acl))
       {
-        char *text, *textptr;
+        char *text, *textptr;          /* Temporary string */
+
 
         cupsdLogMessage(CUPSD_LOG_ERROR, "ACL did not validate: %s",
                        strerror(errno));
@@ -217,9 +220,16 @@ cupsdAddCert(int        pid,               /* I - Process ID */
 #  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 */
@@ -416,5 +426,5 @@ cupsdInitCerts(void)
 
 
 /*
- * End of "$Id: cert.c 5305 2006-03-18 03:05:12Z mike $".
+ * End of "$Id$".
  */