diff options
| author | jlovell <jlovell@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2006-04-07 21:00:45 +0000 |
|---|---|---|
| committer | jlovell <jlovell@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2006-04-07 21:00:45 +0000 |
| commit | e53920b9224e07b7d5f3e5a3ffea1f64ded479d2 (patch) | |
| tree | 80f162209da3813afc2f8c34935cefeb08d79e90 /scheduler/cert.c | |
| parent | d6ae789d922e30aa25c55e01e1523d451be2016b (diff) | |
| download | cups-e53920b9224e07b7d5f3e5a3ffea1f64ded479d2.tar.gz | |
Load cups into easysw/current.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@125 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'scheduler/cert.c')
| -rw-r--r-- | scheduler/cert.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/scheduler/cert.c b/scheduler/cert.c index 0626b4461..8a0d7a161 100644 --- a/scheduler/cert.c +++ b/scheduler/cert.c @@ -1,5 +1,5 @@ /* - * "$Id: cert.c 5305 2006-03-18 03:05:12Z mike $" + * "$Id: cert.c 5381 2006-04-07 14:39:46Z mike $" * * 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: cert.c 5381 2006-04-07 14:39:46Z mike $". */ |