*
* Configuration routines for the Common UNIX Printing System (CUPS).
*
- * Copyright 1997-2005 by Easy Software Products, all rights reserved.
+ * Copyright 1997-2006 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
* property of Easy Software Products and are protected by Federal
*
* Contents:
*
- * ReadConfiguration() - Read the cupsd.conf file.
- * get_address() - Get an address + port number from a line.
- * get_addr_and_mask() - Get an IP address and netmask.
- * parse_aaa() - Parse authentication, authorization, and
- * access control lines.
- * read_configuration() - Read a configuration file.
- * read_location() - Read a <Location path> definition.
- * read_policy() - Read a <Policy name> definition.
- * CDSAGetServerCerts() - Convert a keychain name into the CFArrayRef
- * required by SSLSetCertificate.
+ * cupsdReadConfiguration() - Read the cupsd.conf file.
+ * check_permissions() - Fix the mode and ownership of a file or
+ * directory.
+ * get_address() - Get an address + port number from a line.
+ * get_addr_and_mask() - Get an IP address and netmask.
+ * parse_aaa() - Parse authentication, authorization, and
+ * access control lines.
+ * parse_groups() - Parse system group names in a string.
+ * parse_protocols() - Parse browse protocols in a string.
+ * read_configuration() - Read a configuration file.
+ * read_location() - Read a <Location path> definition.
+ * read_policy() - Read a <Policy name> definition.
*/
/*
#include <sys/utsname.h>
#include <cups/dir.h>
-#ifdef HAVE_DOMAINSOCKETS
-# include <sys/un.h>
-#endif /* HAVE_DOMAINSOCKETS */
-
-#ifdef HAVE_CDSASSL
-# include <Security/SecureTransport.h>
-# include <Security/SecIdentitySearch.h>
-#endif /* HAVE_CDSASSL */
-
#ifdef HAVE_VSYSLOG
# include <syslog.h>
#endif /* HAVE_VSYSLOG */
* Configuration variable structure...
*/
-typedef struct
+typedef enum
{
- char *name; /* Name of variable */
- void *ptr; /* Pointer to variable */
- int type; /* Type (int, string, address) */
-} var_t;
+ CUPSD_VARTYPE_INTEGER, /* Integer option */
+ CUPSD_VARTYPE_STRING, /* String option */
+ CUPSD_VARTYPE_BOOLEAN /* Boolean option */
+} cupsd_vartype_t;
-#define VAR_INTEGER 0
-#define VAR_STRING 1
-#define VAR_BOOLEAN 2
+typedef struct
+{
+ char *name; /* Name of variable */
+ void *ptr; /* Pointer to variable */
+ cupsd_vartype_t type; /* Type (int, string, address) */
+} cupsd_var_t;
/*
* Local globals...
*/
-static var_t variables[] =
+static cupsd_var_t variables[] =
{
- { "AccessLog", &AccessLog, VAR_STRING },
- { "AutoPurgeJobs", &JobAutoPurge, VAR_BOOLEAN },
- { "BrowseInterval", &BrowseInterval, VAR_INTEGER },
- { "BrowseLocalOptions", &BrowseLocalOptions, VAR_STRING },
- { "BrowsePort", &BrowsePort, VAR_INTEGER },
- { "BrowseRemoteOptions", &BrowseRemoteOptions, VAR_STRING },
- { "BrowseShortNames", &BrowseShortNames, VAR_BOOLEAN },
- { "BrowseTimeout", &BrowseTimeout, VAR_INTEGER },
- { "Browsing", &Browsing, VAR_BOOLEAN },
- { "CacheDir", &CacheDir, VAR_STRING },
- { "Classification", &Classification, VAR_STRING },
- { "ClassifyOverride", &ClassifyOverride, VAR_BOOLEAN },
- { "ConfigFilePerm", &ConfigFilePerm, VAR_INTEGER },
- { "DataDir", &DataDir, VAR_STRING },
- { "DefaultCharset", &DefaultCharset, VAR_STRING },
- { "DefaultLanguage", &DefaultLanguage, VAR_STRING },
- { "DefaultPolicy", &DefaultPolicy, VAR_STRING },
- { "DocumentRoot", &DocumentRoot, VAR_STRING },
- { "ErrorLog", &ErrorLog, VAR_STRING },
- { "FaxRetryLimit", &FaxRetryLimit, VAR_INTEGER },
- { "FaxRetryInterval", &FaxRetryInterval, VAR_INTEGER },
- { "FileDevice", &FileDevice, VAR_BOOLEAN },
- { "FilterLimit", &FilterLimit, VAR_INTEGER },
- { "FilterNice", &FilterNice, VAR_INTEGER },
- { "FontPath", &FontPath, VAR_STRING },
- { "HideImplicitMembers", &HideImplicitMembers, VAR_BOOLEAN },
- { "ImplicitClasses", &ImplicitClasses, VAR_BOOLEAN },
- { "ImplicitAnyClasses", &ImplicitAnyClasses, VAR_BOOLEAN },
- { "KeepAliveTimeout", &KeepAliveTimeout, VAR_INTEGER },
- { "KeepAlive", &KeepAlive, VAR_BOOLEAN },
- { "LimitRequestBody", &MaxRequestSize, VAR_INTEGER },
- { "ListenBackLog", &ListenBackLog, VAR_INTEGER },
- { "LogFilePerm", &LogFilePerm, VAR_INTEGER },
- { "MaxActiveJobs", &MaxActiveJobs, VAR_INTEGER },
- { "MaxClients", &MaxClients, VAR_INTEGER },
- { "MaxClientsPerHost", &MaxClientsPerHost, VAR_INTEGER },
- { "MaxCopies", &MaxCopies, VAR_INTEGER },
- { "MaxJobs", &MaxJobs, VAR_INTEGER },
- { "MaxJobsPerPrinter", &MaxJobsPerPrinter, VAR_INTEGER },
- { "MaxJobsPerUser", &MaxJobsPerUser, VAR_INTEGER },
- { "MaxLogSize", &MaxLogSize, VAR_INTEGER },
- { "MaxPrinterHistory", &MaxPrinterHistory, VAR_INTEGER },
- { "MaxRequestSize", &MaxRequestSize, VAR_INTEGER },
- { "PageLog", &PageLog, VAR_STRING },
- { "PreserveJobFiles", &JobFiles, VAR_BOOLEAN },
- { "PreserveJobHistory", &JobHistory, VAR_BOOLEAN },
- { "Printcap", &Printcap, VAR_STRING },
- { "PrintcapGUI", &PrintcapGUI, VAR_STRING },
- { "ReloadTimeout", &ReloadTimeout, VAR_INTEGER },
- { "RemoteRoot", &RemoteRoot, VAR_STRING },
- { "RequestRoot", &RequestRoot, VAR_STRING },
- { "RIPCache", &RIPCache, VAR_STRING },
- { "RunAsUser", &RunAsUser, VAR_BOOLEAN },
- { "RootCertDuration", &RootCertDuration, VAR_INTEGER },
- { "ServerAdmin", &ServerAdmin, VAR_STRING },
- { "ServerBin", &ServerBin, VAR_STRING },
+ { "AccessLog", &AccessLog, CUPSD_VARTYPE_STRING },
+ { "AutoPurgeJobs", &JobAutoPurge, CUPSD_VARTYPE_BOOLEAN },
+ { "BrowseInterval", &BrowseInterval, CUPSD_VARTYPE_INTEGER },
+#ifdef HAVE_LDAP
+ { "BrowseLDAPBindDN", &BrowseLDAPBindDN, CUPSD_VARTYPE_STRING },
+ { "BrowseLDAPDN", &BrowseLDAPDN, CUPSD_VARTYPE_STRING },
+ { "BrowseLDAPPassword", &BrowseLDAPPassword, CUPSD_VARTYPE_STRING },
+ { "BrowseLDAPServer", &BrowseLDAPServer, CUPSD_VARTYPE_STRING },
+#endif /* HAVE_LDAP */
+ { "BrowseLocalOptions", &BrowseLocalOptions, CUPSD_VARTYPE_STRING },
+ { "BrowsePort", &BrowsePort, CUPSD_VARTYPE_INTEGER },
+ { "BrowseRemoteOptions", &BrowseRemoteOptions, CUPSD_VARTYPE_STRING },
+ { "BrowseShortNames", &BrowseShortNames, CUPSD_VARTYPE_BOOLEAN },
+ { "BrowseTimeout", &BrowseTimeout, CUPSD_VARTYPE_INTEGER },
+ { "Browsing", &Browsing, CUPSD_VARTYPE_BOOLEAN },
+ { "CacheDir", &CacheDir, CUPSD_VARTYPE_STRING },
+ { "Classification", &Classification, CUPSD_VARTYPE_STRING },
+ { "ClassifyOverride", &ClassifyOverride, CUPSD_VARTYPE_BOOLEAN },
+ { "ConfigFilePerm", &ConfigFilePerm, CUPSD_VARTYPE_INTEGER },
+ { "DataDir", &DataDir, CUPSD_VARTYPE_STRING },
+ { "DefaultCharset", &DefaultCharset, CUPSD_VARTYPE_STRING },
+ { "DefaultLanguage", &DefaultLanguage, CUPSD_VARTYPE_STRING },
+ { "DefaultLeaseDuration", &DefaultLeaseDuration, CUPSD_VARTYPE_INTEGER },
+ { "DefaultPolicy", &DefaultPolicy, CUPSD_VARTYPE_STRING },
+ { "DefaultShared", &DefaultShared, CUPSD_VARTYPE_BOOLEAN },
+ { "DocumentRoot", &DocumentRoot, CUPSD_VARTYPE_STRING },
+ { "ErrorLog", &ErrorLog, CUPSD_VARTYPE_STRING },
+ { "FileDevice", &FileDevice, CUPSD_VARTYPE_BOOLEAN },
+ { "FilterLimit", &FilterLimit, CUPSD_VARTYPE_INTEGER },
+ { "FilterNice", &FilterNice, CUPSD_VARTYPE_INTEGER },
+ { "FontPath", &FontPath, CUPSD_VARTYPE_STRING },
+ { "HideImplicitMembers", &HideImplicitMembers, CUPSD_VARTYPE_BOOLEAN },
+ { "ImplicitClasses", &ImplicitClasses, CUPSD_VARTYPE_BOOLEAN },
+ { "ImplicitAnyClasses", &ImplicitAnyClasses, CUPSD_VARTYPE_BOOLEAN },
+ { "JobRetryLimit", &JobRetryLimit, CUPSD_VARTYPE_INTEGER },
+ { "JobRetryInterval", &JobRetryInterval, CUPSD_VARTYPE_INTEGER },
+ { "KeepAliveTimeout", &KeepAliveTimeout, CUPSD_VARTYPE_INTEGER },
+ { "KeepAlive", &KeepAlive, CUPSD_VARTYPE_BOOLEAN },
+ { "LimitRequestBody", &MaxRequestSize, CUPSD_VARTYPE_INTEGER },
+ { "ListenBackLog", &ListenBackLog, CUPSD_VARTYPE_INTEGER },
+ { "LogFilePerm", &LogFilePerm, CUPSD_VARTYPE_INTEGER },
+ { "MaxActiveJobs", &MaxActiveJobs, CUPSD_VARTYPE_INTEGER },
+ { "MaxClients", &MaxClients, CUPSD_VARTYPE_INTEGER },
+ { "MaxClientsPerHost", &MaxClientsPerHost, CUPSD_VARTYPE_INTEGER },
+ { "MaxCopies", &MaxCopies, CUPSD_VARTYPE_INTEGER },
+ { "MaxEvents", &MaxEvents, CUPSD_VARTYPE_INTEGER },
+ { "MaxJobs", &MaxJobs, CUPSD_VARTYPE_INTEGER },
+ { "MaxJobsPerPrinter", &MaxJobsPerPrinter, CUPSD_VARTYPE_INTEGER },
+ { "MaxJobsPerUser", &MaxJobsPerUser, CUPSD_VARTYPE_INTEGER },
+ { "MaxLeaseDuration", &MaxLeaseDuration, CUPSD_VARTYPE_INTEGER },
+ { "MaxLogSize", &MaxLogSize, CUPSD_VARTYPE_INTEGER },
+ { "MaxPrinterHistory", &MaxPrinterHistory, CUPSD_VARTYPE_INTEGER },
+ { "MaxRequestSize", &MaxRequestSize, CUPSD_VARTYPE_INTEGER },
+ { "MaxSubscriptions", &MaxSubscriptions, CUPSD_VARTYPE_INTEGER },
+ { "MaxSubscriptionsPerJob", &MaxSubscriptionsPerJob, CUPSD_VARTYPE_INTEGER },
+ { "MaxSubscriptionsPerPrinter",&MaxSubscriptionsPerPrinter, CUPSD_VARTYPE_INTEGER },
+ { "MaxSubscriptionsPerUser", &MaxSubscriptionsPerUser, CUPSD_VARTYPE_INTEGER },
+ { "PageLog", &PageLog, CUPSD_VARTYPE_STRING },
+ { "PreserveJobFiles", &JobFiles, CUPSD_VARTYPE_BOOLEAN },
+ { "PreserveJobHistory", &JobHistory, CUPSD_VARTYPE_BOOLEAN },
+ { "Printcap", &Printcap, CUPSD_VARTYPE_STRING },
+ { "PrintcapGUI", &PrintcapGUI, CUPSD_VARTYPE_STRING },
+ { "ReloadTimeout", &ReloadTimeout, CUPSD_VARTYPE_INTEGER },
+ { "RemoteRoot", &RemoteRoot, CUPSD_VARTYPE_STRING },
+ { "RequestRoot", &RequestRoot, CUPSD_VARTYPE_STRING },
+ { "RIPCache", &RIPCache, CUPSD_VARTYPE_STRING },
+ { "RootCertDuration", &RootCertDuration, CUPSD_VARTYPE_INTEGER },
+ { "ServerAdmin", &ServerAdmin, CUPSD_VARTYPE_STRING },
+ { "ServerBin", &ServerBin, CUPSD_VARTYPE_STRING },
#ifdef HAVE_SSL
- { "ServerCertificate", &ServerCertificate, VAR_STRING },
+ { "ServerCertificate", &ServerCertificate, CUPSD_VARTYPE_STRING },
# if defined(HAVE_LIBSSL) || defined(HAVE_GNUTLS)
- { "ServerKey", &ServerKey, VAR_STRING },
+ { "ServerKey", &ServerKey, CUPSD_VARTYPE_STRING },
# endif /* HAVE_LIBSSL || HAVE_GNUTLS */
#endif /* HAVE_SSL */
- { "ServerName", &ServerName, VAR_STRING },
- { "ServerRoot", &ServerRoot, VAR_STRING },
- { "StateDir", &StateDir, VAR_STRING },
- { "TempDir", &TempDir, VAR_STRING },
- { "Timeout", &Timeout, VAR_INTEGER }
+#ifdef HAVE_LAUNCHD
+ { "LaunchdTimeout", &LaunchdTimeout, CUPSD_VARTYPE_INTEGER },
+ { "LaunchdConf", &LaunchdConf, CUPSD_VARTYPE_STRING },
+#endif /* HAVE_LAUNCHD */
+ { "ServerName", &ServerName, CUPSD_VARTYPE_STRING },
+ { "ServerRoot", &ServerRoot, CUPSD_VARTYPE_STRING },
+ { "StateDir", &StateDir, CUPSD_VARTYPE_STRING },
+ { "TempDir", &TempDir, CUPSD_VARTYPE_STRING },
+ { "Timeout", &Timeout, CUPSD_VARTYPE_INTEGER },
+ { "UseNetworkDefault", &UseNetworkDefault, CUPSD_VARTYPE_BOOLEAN }
};
#define NUM_VARS (sizeof(variables) / sizeof(variables[0]))
0x00000000, 0x00000000, 0x00000000, 0x00000000
};
-#ifdef HAVE_CDSASSL
-CFArrayRef CDSAGetServerCerts();
-#endif /* HAVE_CDSASSL */
-
/*
* Local functions...
*/
-
-static int get_address(const char *value, unsigned defaddress, int defport,
- int deffamily, http_addr_t *address);
-static int get_addr_and_mask(const char *value, unsigned *ip,
- unsigned *mask);
-static int parse_aaa(location_t *loc, char *line, char *value, int linenum);
-static int read_configuration(cups_file_t *fp);
-static int read_location(cups_file_t *fp, char *name, int linenum);
-static int read_policy(cups_file_t *fp, char *name, int linenum);
+static int check_permissions(const char *filename,
+ const char *suffix, int mode,
+ int user, int group, int is_dir,
+ int create_dir);
+static http_addrlist_t *get_address(const char *value, int defport);
+static int get_addr_and_mask(const char *value, unsigned *ip,
+ unsigned *mask);
+static int parse_aaa(cupsd_location_t *loc, char *line,
+ char *value, int linenum);
+static int parse_groups(const char *s);
+static int parse_protocols(const char *s);
+static int read_configuration(cups_file_t *fp);
+static int read_location(cups_file_t *fp, char *name, int linenum);
+static int read_policy(cups_file_t *fp, char *name, int linenum);
/*
- * 'ReadConfiguration()' - Read the cupsd.conf file.
+ * 'cupsdReadConfiguration()' - Read the cupsd.conf file.
*/
int /* O - 1 on success, 0 otherwise */
-ReadConfiguration(void)
+cupsdReadConfiguration(void)
{
int i; /* Looping var */
cups_file_t *fp; /* Configuration file */
int status; /* Return status */
char temp[1024], /* Temporary buffer */
*slash; /* Directory separator */
- char type[MIME_MAX_SUPER + MIME_MAX_TYPE];
- /* MIME type name */
- char *language; /* Language string */
+ cups_lang_t *language; /* Language */
struct passwd *user; /* Default user */
struct group *group; /* Default group */
char *old_serverroot, /* Old ServerRoot */
*old_requestroot; /* Old RequestRoot */
+ const char *tmpdir; /* TMPDIR environment variable */
+ struct stat tmpinfo; /* Temporary directory info */
- /*
- * Shutdown the server...
- */
-
- StopServer();
-
/*
* Save the old root paths...
*/
old_serverroot = NULL;
- SetString(&old_serverroot, ServerRoot);
+ cupsdSetString(&old_serverroot, ServerRoot);
old_requestroot = NULL;
- SetString(&old_requestroot, RequestRoot);
+ cupsdSetString(&old_requestroot, RequestRoot);
/*
* Reset the server configuration data...
*/
- DeleteAllLocations();
+ cupsdDeleteAllLocations();
if (NumBrowsers > 0)
{
NumRelays = 0;
}
- if (NumListeners > 0)
- {
-#ifdef HAVE_DOMAINSOCKETS
- int i; /* Looping var */
- listener_t *lis; /* Current listening socket */
-
- for (i = NumListeners, lis = Listeners; i > 0; i --, lis ++)
- if (lis->address.sin_family == AF_LOCAL)
- ClearString((char **)&lis->address.sin_addr);
-#endif /* HAVE_DOMAINSOCKETS */
-
- free(Listeners);
-
- NumListeners = 0;
- }
+ cupsdDeleteAllListeners();
/*
* String options...
*/
- SetString(&ServerName, httpGetHostname(temp, sizeof(temp)));
- SetStringf(&ServerAdmin, "root@%s", temp);
- SetString(&ServerBin, CUPS_SERVERBIN);
- SetString(&RequestRoot, CUPS_REQUESTS);
- SetString(&CacheDir, CUPS_CACHEDIR);
- SetString(&DataDir, CUPS_DATADIR);
- SetString(&DocumentRoot, CUPS_DOCROOT);
- SetString(&AccessLog, CUPS_LOGDIR "/access_log");
- SetString(&ErrorLog, CUPS_LOGDIR "/error_log");
- SetString(&PageLog, CUPS_LOGDIR "/page_log");
- SetString(&Printcap, "/etc/printcap");
- SetString(&PrintcapGUI, "/usr/bin/glpoptions");
- SetString(&FontPath, CUPS_FONTPATH);
- SetString(&RemoteRoot, "remroot");
- SetString(&ServerHeader, "CUPS/1.1");
- SetString(&StateDir, CUPS_STATEDIR);
+ cupsdSetString(&ServerName, httpGetHostname(temp, sizeof(temp)));
+ cupsdSetStringf(&ServerAdmin, "root@%s", temp);
+ cupsdSetString(&ServerBin, CUPS_SERVERBIN);
+ cupsdSetString(&RequestRoot, CUPS_REQUESTS);
+ cupsdSetString(&CacheDir, CUPS_CACHEDIR);
+ cupsdSetString(&DataDir, CUPS_DATADIR);
+ cupsdSetString(&DocumentRoot, CUPS_DOCROOT);
+ cupsdSetString(&AccessLog, CUPS_LOGDIR "/access_log");
+ cupsdSetString(&ErrorLog, CUPS_LOGDIR "/error_log");
+ cupsdSetString(&PageLog, CUPS_LOGDIR "/page_log");
+ cupsdSetString(&Printcap, "/etc/printcap");
+ cupsdSetString(&PrintcapGUI, "/usr/bin/glpoptions");
+ cupsdSetString(&FontPath, CUPS_FONTPATH);
+ cupsdSetString(&RemoteRoot, "remroot");
+ cupsdSetString(&ServerHeader, "CUPS/1.2");
+ cupsdSetString(&StateDir, CUPS_STATEDIR);
strlcpy(temp, ConfigurationFile, sizeof(temp));
if ((slash = strrchr(temp, '/')) != NULL)
*slash = '\0';
- SetString(&ServerRoot, temp);
+ cupsdSetString(&ServerRoot, temp);
- ClearString(&Classification);
+ cupsdClearString(&Classification);
ClassifyOverride = 0;
#ifdef HAVE_SSL
# ifdef HAVE_CDSASSL
- SetString(&ServerCertificate, "/var/root/Library/Keychains/CUPS");
+ cupsdSetString(&ServerCertificate, "/Library/Keychains/System.keychain");
# else
- SetString(&ServerCertificate, "ssl/server.crt");
- SetString(&ServerKey, "ssl/server.key");
+ cupsdSetString(&ServerCertificate, "ssl/server.crt");
+ cupsdSetString(&ServerKey, "ssl/server.key");
# endif /* HAVE_CDSASSL */
#endif /* HAVE_SSL */
- if ((language = DEFAULT_LANGUAGE) == NULL)
- language = "en";
- else if (strcmp(language, "C") == 0 || strcmp(language, "POSIX") == 0)
- language = "en";
+ language = cupsLangDefault();
+
+ if (!strcmp(language->language, "C") || !strcmp(language->language, "POSIX"))
+ cupsdSetString(&DefaultLanguage, "en");
+ else
+ cupsdSetString(&DefaultLanguage, language->language);
- SetString(&DefaultLanguage, language);
- SetString(&DefaultCharset, DEFAULT_CHARSET);
+ cupsdSetString(&DefaultCharset, _cupsEncodingName(language->encoding));
- SetString(&RIPCache, "8m");
+ cupsdSetString(&RIPCache, "8m");
- if (getenv("TMPDIR") == NULL)
- SetString(&TempDir, CUPS_REQUESTS "/tmp");
- else
- SetString(&TempDir, getenv("TMPDIR"));
+ cupsdSetString(&TempDir, NULL);
/*
- * Find the default system group: "sys", "system", or "root"...
+ * Find the default user...
*/
- group = getgrnam(CUPS_DEFAULT_GROUP);
- endgrent();
-
- NumSystemGroups = 0;
-
- if (group != NULL)
- {
- SetString(&SystemGroups[0], CUPS_DEFAULT_GROUP);
- Group = group->gr_gid;
- }
+ if ((user = getpwnam(CUPS_DEFAULT_USER)) != NULL)
+ User = user->pw_uid;
else
{
- group = getgrgid(0);
- endgrent();
+ /*
+ * Use the (historical) NFS nobody user ID (-2 as a 16-bit twos-
+ * complement number...)
+ */
- if (group != NULL)
- {
- SetString(&SystemGroups[0], group->gr_name);
- Group = 0;
- }
- else
- {
- SetString(&SystemGroups[0], "unknown");
- Group = 0;
- }
+ User = 65534;
}
+ endpwent();
+
/*
- * Find the default user...
+ * Find the default group (nobody)...
*/
- if ((user = getpwnam(CUPS_DEFAULT_USER)) == NULL)
- User = 1; /* Force to a non-priviledged account */
+ group = getgrnam("nobody");
+ endgrent();
+
+ if (group != NULL)
+ Group = group->gr_gid;
else
- User = user->pw_uid;
+ {
+ /*
+ * Use the (historical) NFS nobody group ID (-2 as a 16-bit twos-
+ * complement number...)
+ */
- endpwent();
+ Group = 65534;
+ }
/*
* Numeric options...
*/
- ConfigFilePerm = 0640;
- DefaultAuthType = AUTH_BASIC;
- FaxRetryLimit = 5;
- FaxRetryInterval = 300;
- FileDevice = FALSE;
- FilterLevel = 0;
- FilterLimit = 0;
- FilterNice = 0;
- HostNameLookups = FALSE;
- ImplicitClasses = TRUE;
- ImplicitAnyClasses = FALSE;
- HideImplicitMembers = TRUE;
- KeepAlive = TRUE;
- KeepAliveTimeout = DEFAULT_KEEPALIVE;
- ListenBackLog = SOMAXCONN;
- LogFilePerm = 0644;
- LogLevel = L_ERROR;
- MaxClients = 100;
- MaxClientsPerHost = 0;
- MaxLogSize = 1024 * 1024;
- MaxPrinterHistory = 10;
- MaxRequestSize = 0;
- ReloadTimeout = 60;
- RootCertDuration = 300;
- RunAsUser = FALSE;
- Timeout = DEFAULT_TIMEOUT;
-
- BrowseInterval = DEFAULT_INTERVAL;
- BrowsePort = ippPort();
- BrowseProtocols = BROWSE_CUPS;
- BrowseShortNames = TRUE;
- BrowseTimeout = DEFAULT_TIMEOUT;
- Browsing = TRUE;
-
- ClearString(&BrowseLocalOptions);
- ClearString(&BrowseRemoteOptions);
+ ConfigFilePerm = CUPS_DEFAULT_CONFIG_FILE_PERM;
+ DefaultAuthType = AUTH_BASIC;
+#ifdef HAVE_SSL
+ DefaultEncryption = HTTP_ENCRYPT_REQUIRED;
+#endif /* HAVE_SSL */
+ JobRetryLimit = 5;
+ JobRetryInterval = 300;
+ FileDevice = FALSE;
+ FilterLevel = 0;
+ FilterLimit = 0;
+ FilterNice = 0;
+ HostNameLookups = FALSE;
+ ImplicitClasses = CUPS_DEFAULT_IMPLICIT_CLASSES;
+ ImplicitAnyClasses = FALSE;
+ HideImplicitMembers = TRUE;
+ KeepAlive = TRUE;
+ KeepAliveTimeout = DEFAULT_KEEPALIVE;
+ ListenBackLog = SOMAXCONN;
+ LogFilePerm = CUPS_DEFAULT_LOG_FILE_PERM;
+ LogLevel = CUPSD_LOG_ERROR;
+ MaxClients = 100;
+ MaxClientsPerHost = 0;
+ MaxLogSize = 1024 * 1024;
+ MaxPrinterHistory = 10;
+ MaxRequestSize = 0;
+ ReloadTimeout = 60;
+ RootCertDuration = 300;
+ Timeout = DEFAULT_TIMEOUT;
+ NumSystemGroups = 0;
+
+ BrowseInterval = DEFAULT_INTERVAL;
+ BrowsePort = ippPort();
+ BrowseLocalProtocols = parse_protocols(CUPS_DEFAULT_BROWSE_LOCAL_PROTOCOLS);
+ BrowseRemoteProtocols = parse_protocols(CUPS_DEFAULT_BROWSE_REMOTE_PROTOCOLS);
+ BrowseShortNames = CUPS_DEFAULT_BROWSE_SHORT_NAMES;
+ BrowseTimeout = DEFAULT_TIMEOUT;
+ Browsing = CUPS_DEFAULT_BROWSING;
+ DefaultShared = CUPS_DEFAULT_DEFAULT_SHARED;
+
+ cupsdClearString(&BrowseLocalOptions);
+ cupsdClearString(&BrowseRemoteOptions);
+
+#ifdef HAVE_LDAP
+ cupsdClearString(&BrowseLDAPBindDN);
+ cupsdClearString(&BrowseLDAPDN);
+ cupsdClearString(&BrowseLDAPPassword);
+ cupsdClearString(&BrowseLDAPServer);
+#endif /* HAVE_LDAP */
JobHistory = DEFAULT_HISTORY;
JobFiles = DEFAULT_FILES;
MaxJobsPerPrinter = 0;
MaxCopies = 100;
- ClearString(&DefaultPolicy);
+ cupsdDeleteAllPolicies();
+ cupsdClearString(&DefaultPolicy);
+
+ MaxSubscriptions = 100;
+ MaxSubscriptionsPerJob = 0;
+ MaxSubscriptionsPerPrinter = 0;
+ MaxSubscriptionsPerUser = 0;
+ DefaultLeaseDuration = 86400;
+ MaxLeaseDuration = 0;
+
+#ifdef HAVE_LAUNCHD
+ LaunchdTimeout = DEFAULT_TIMEOUT + 10;
+ cupsdSetString(&LaunchdConf, CUPS_DEFAULT_LAUNCHD_CONF);
+#endif /* HAVE_LAUNCHD */
/*
* Read the configuration file...
if (!status)
return (0);
- if (RunAsUser)
- RunUser = User;
- else
- RunUser = getuid();
+ RunUser = getuid();
/*
* Use the default system group if none was supplied in cupsd.conf...
*/
if (NumSystemGroups == 0)
- NumSystemGroups ++;
+ {
+ if (!parse_groups(CUPS_DEFAULT_SYSTEM_GROUPS))
+ {
+ /*
+ * Find the group associated with GID 0...
+ */
+
+ group = getgrgid(0);
+ endgrent();
+
+ if (group != NULL)
+ cupsdSetString(&SystemGroups[0], group->gr_name);
+ else
+ cupsdSetString(&SystemGroups[0], "unknown");
+
+ SystemGroupIDs[0] = 0;
+ NumSystemGroups = 1;
+ }
+ }
/*
* Get the access control list for browsing...
*/
- BrowseACL = FindLocation("CUPS_INTERNAL_BROWSE_ACL");
+ BrowseACL = cupsdFindLocation("CUPS_INTERNAL_BROWSE_ACL");
/*
* Open the system log for cupsd if necessary...
*/
#ifdef HAVE_VSYSLOG
- if (strcmp(AccessLog, "syslog") == 0 ||
- strcmp(ErrorLog, "syslog") == 0 ||
- strcmp(PageLog, "syslog") == 0)
+ if (!strcmp(AccessLog, "syslog") ||
+ !strcmp(ErrorLog, "syslog") ||
+ !strcmp(PageLog, "syslog"))
openlog("cupsd", LOG_PID | LOG_NOWAIT | LOG_NDELAY, LOG_LPR);
#endif /* HAVE_VSYSLOG */
* Log the configuration file that was used...
*/
- LogMessage(L_INFO, "Loaded configuration file \"%s\"", ConfigurationFile);
+ cupsdLogMessage(CUPSD_LOG_INFO, "Loaded configuration file \"%s\"",
+ ConfigurationFile);
+
+ /*
+ * Validate the Group and SystemGroup settings - they cannot be the same,
+ * otherwise the CGI programs will be able to authenticate as root without
+ * a password!
+ */
+
+ if (!RunUser)
+ {
+ for (i = 0; i < NumSystemGroups; i ++)
+ if (Group == SystemGroupIDs[i])
+ break;
+
+ if (i < NumSystemGroups)
+ {
+ /*
+ * Log the error and reset the group to a safe value...
+ */
+
+ cupsdLogMessage(CUPSD_LOG_NOTICE,
+ "Group and SystemGroup cannot use the same groups!");
+ cupsdLogMessage(CUPSD_LOG_INFO, "Resetting Group to \"nobody\"...");
+
+ group = getgrnam("nobody");
+ endgrent();
+
+ if (group != NULL)
+ Group = group->gr_gid;
+ else
+ {
+ /*
+ * Use the (historical) NFS nobody group ID (-2 as a 16-bit twos-
+ * complement number...)
+ */
+
+ Group = 65534;
+ }
+ }
+ }
/*
* Check that we have at least one listen/port line; if not, report this
* as an error and exit!
*/
- if (NumListeners == 0)
+ if (cupsArrayCount(Listeners) == 0)
{
/*
* No listeners!
*/
- LogMessage(L_EMERG, "No valid Listen or Port lines were found in the configuration file!");
+ cupsdLogMessage(CUPSD_LOG_EMERG,
+ "No valid Listen or Port lines were found in the configuration file!");
/*
* Commit suicide...
* Set the default locale using the language and charset...
*/
- SetStringf(&DefaultLocale, "%s.%s", DefaultLanguage, DefaultCharset);
+ cupsdSetStringf(&DefaultLocale, "%s.%s", DefaultLanguage, DefaultCharset);
/*
* Update all relative filenames to include the full path from ServerRoot...
*/
if (DocumentRoot[0] != '/')
- SetStringf(&DocumentRoot, "%s/%s", ServerRoot, DocumentRoot);
+ cupsdSetStringf(&DocumentRoot, "%s/%s", ServerRoot, DocumentRoot);
if (RequestRoot[0] != '/')
- SetStringf(&RequestRoot, "%s/%s", ServerRoot, RequestRoot);
+ cupsdSetStringf(&RequestRoot, "%s/%s", ServerRoot, RequestRoot);
if (ServerBin[0] != '/')
- SetStringf(&ServerBin, "%s/%s", ServerRoot, ServerBin);
+ cupsdSetStringf(&ServerBin, "%s/%s", ServerRoot, ServerBin);
if (StateDir[0] != '/')
- SetStringf(&StateDir, "%s/%s", ServerRoot, StateDir);
+ cupsdSetStringf(&StateDir, "%s/%s", ServerRoot, StateDir);
if (CacheDir[0] != '/')
- SetStringf(&CacheDir, "%s/%s", ServerRoot, CacheDir);
+ cupsdSetStringf(&CacheDir, "%s/%s", ServerRoot, CacheDir);
#ifdef HAVE_SSL
if (ServerCertificate[0] != '/')
- SetStringf(&ServerCertificate, "%s/%s", ServerRoot, ServerCertificate);
+ cupsdSetStringf(&ServerCertificate, "%s/%s", ServerRoot, ServerCertificate);
-# if defined(HAVE_LIBSSL) || defined(HAVE_GNUTLS)
- chown(ServerCertificate, RunUser, Group);
- chmod(ServerCertificate, ConfigFilePerm);
+ if (!strncmp(ServerRoot, ServerCertificate, strlen(ServerRoot)))
+ {
+ chown(ServerCertificate, RunUser, Group);
+ chmod(ServerCertificate, 0600);
+ }
+# if defined(HAVE_LIBSSL) || defined(HAVE_GNUTLS)
if (ServerKey[0] != '/')
- SetStringf(&ServerKey, "%s/%s", ServerRoot, ServerKey);
+ cupsdSetStringf(&ServerKey, "%s/%s", ServerRoot, ServerKey);
- chown(ServerKey, RunUser, Group);
- chmod(ServerKey, ConfigFilePerm);
+ if (!strncmp(ServerRoot, ServerKey, strlen(ServerRoot)))
+ {
+ chown(ServerKey, RunUser, Group);
+ chmod(ServerKey, 0600);
+ }
# endif /* HAVE_LIBSSL || HAVE_GNUTLS */
#endif /* HAVE_SSL */
* writable by the user and group in the cupsd.conf file...
*/
- chown(CacheDir, RunUser, Group);
- chmod(CacheDir, 0775);
-
- snprintf(temp, sizeof(temp), "%s/ppd", CacheDir);
- if (access(temp, 0))
- mkdir(temp, 0755);
- chown(temp, RunUser, Group);
- chmod(temp, 0755);
-
- chown(StateDir, RunUser, Group);
- chmod(StateDir, 0775);
-
- snprintf(temp, sizeof(temp), "%s/certs", StateDir);
- if (access(temp, 0))
- mkdir(temp, 0711);
- chown(temp, RunUser, Group);
- chmod(temp, 0711);
-
- chown(ServerRoot, RunUser, Group);
- chmod(ServerRoot, 0775);
-
- snprintf(temp, sizeof(temp), "%s/ppd", ServerRoot);
- if (access(temp, 0))
- mkdir(temp, 0755);
- chown(temp, RunUser, Group);
- chmod(temp, 0755);
-
- snprintf(temp, sizeof(temp), "%s/ssl", ServerRoot);
- if (access(temp, 0))
- mkdir(temp, 0700);
- chown(temp, RunUser, Group);
- chmod(temp, 0700);
-
- snprintf(temp, sizeof(temp), "%s/cupsd.conf", ServerRoot);
- chown(temp, RunUser, Group);
- chmod(temp, ConfigFilePerm);
-
- snprintf(temp, sizeof(temp), "%s/classes.conf", ServerRoot);
- chown(temp, RunUser, Group);
-#ifdef __APPLE__
- chmod(temp, 0600);
-#else
- chmod(temp, ConfigFilePerm);
-#endif /* __APPLE__ */
-
- snprintf(temp, sizeof(temp), "%s/printers.conf", ServerRoot);
- chown(temp, RunUser, Group);
-#ifdef __APPLE__
- chmod(temp, 0600);
-#else
- chmod(temp, ConfigFilePerm);
-#endif /* __APPLE__ */
-
- snprintf(temp, sizeof(temp), "%s/passwd.md5", ServerRoot);
- chown(temp, User, Group);
- chmod(temp, 0600);
+ check_permissions(CacheDir, NULL, 0775, RunUser, Group, 1, 1);
+/* check_permissions(CacheDir, "ppd", 0755, RunUser, Group, 1, 1);*/
+
+ check_permissions(StateDir, NULL, 0755, RunUser, Group, 1, 1);
+ check_permissions(StateDir, "certs", RunUser ? 0711 : 0511, User,
+ SystemGroupIDs[0], 1, 1);
+
+ check_permissions(ServerRoot, NULL, 0755, RunUser, Group, 1, 0);
+ check_permissions(ServerRoot, "ppd", 0755, RunUser, Group, 1, 1);
+ check_permissions(ServerRoot, "ssl", 0700, RunUser, Group, 1, 0);
+ check_permissions(ServerRoot, "cupsd.conf", ConfigFilePerm, RunUser, Group,
+ 0, 0);
+ check_permissions(ServerRoot, "classes.conf", 0600, RunUser, Group, 0, 0);
+ check_permissions(ServerRoot, "printers.conf", 0600, RunUser, Group, 0, 0);
+ check_permissions(ServerRoot, "passwd.md5", 0600, User, Group, 0, 0);
+
+ /*
+ * Update TempDir to the default if it hasn't been set already...
+ */
+
+ if (!TempDir)
+ {
+ if ((tmpdir = getenv("TMPDIR")) != NULL)
+ {
+ /*
+ * TMPDIR is defined, see if it is OK for us to use...
+ */
+
+ if (stat(tmpdir, &tmpinfo))
+ cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to access TMPDIR (%s): %s",
+ tmpdir, strerror(errno));
+ else if (!S_ISDIR(tmpinfo.st_mode))
+ cupsdLogMessage(CUPSD_LOG_ERROR, "TMPDIR (%s) is not a directory!",
+ tmpdir);
+ else if ((tmpinfo.st_uid != User || !(tmpinfo.st_mode & S_IWUSR)) &&
+ (tmpinfo.st_gid != Group || !(tmpinfo.st_mode & S_IWGRP)) &&
+ !(tmpinfo.st_mode & S_IWOTH))
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "TMPDIR (%s) has the wrong permissions!", tmpdir);
+ else
+ cupsdSetString(&TempDir, tmpdir);
+
+ if (!TempDir)
+ cupsdLogMessage(CUPSD_LOG_INFO, "Using default TempDir of %s/tmp...",
+ RequestRoot);
+ }
+
+ if (!TempDir)
+ cupsdSetStringf(&TempDir, "%s/tmp", RequestRoot);
+ }
/*
* Make sure the request and temporary directories have the right
* permissions...
*/
- chown(RequestRoot, RunUser, Group);
- chmod(RequestRoot, 0710);
+ check_permissions(RequestRoot, NULL, 0710, RunUser, Group, 1, 1);
if (!strncmp(TempDir, RequestRoot, strlen(RequestRoot)) ||
access(TempDir, 0))
* is under the spool directory or does not exist...
*/
- if (access(TempDir, 0))
- mkdir(TempDir, 01770);
-
- chown(TempDir, RunUser, Group);
- chmod(TempDir, 01770);
+ check_permissions(TempDir, NULL, 01770, RunUser, Group, 1, 1);
}
if (!strncmp(TempDir, RequestRoot, strlen(RequestRoot)))
if ((dir = cupsDirOpen(TempDir)) != NULL)
{
- LogMessage(L_INFO, "Cleaning out old temporary files in \"%s\"...",
- TempDir);
+ cupsdLogMessage(CUPSD_LOG_INFO,
+ "Cleaning out old temporary files in \"%s\"...", TempDir);
while ((dent = cupsDirRead(dir)) != NULL)
{
snprintf(tempfile, sizeof(tempfile), "%s/%s", TempDir, dent->filename);
if (unlink(tempfile))
- LogMessage(L_ERROR, "Unable to remove temporary file \"%s\" - %s",
- tempfile, strerror(errno));
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Unable to remove temporary file \"%s\" - %s",
+ tempfile, strerror(errno));
else
- LogMessage(L_DEBUG, "Removed temporary file \"%s\"...", tempfile);
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "Removed temporary file \"%s\"...",
+ tempfile);
}
cupsDirClose(dir);
}
else
- LogMessage(L_ERROR, "Unable to open temporary directory \"%s\" - %s",
- TempDir, strerror(errno));
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Unable to open temporary directory \"%s\" - %s",
+ TempDir, strerror(errno));
}
+ /*
+ * Setup environment variables...
+ */
+
+ cupsdInitEnv();
+
/*
* Check the MaxClients setting, and then allocate memory for it...
*/
if (MaxClients > (MaxFDs / 3) || MaxClients <= 0)
{
if (MaxClients > 0)
- LogMessage(L_INFO, "MaxClients limited to 1/3 (%d) of the file descriptor limit (%d)...",
+ cupsdLogMessage(CUPSD_LOG_INFO, "MaxClients limited to 1/3 (%d) of the file descriptor limit (%d)...",
MaxFDs / 3, MaxFDs);
MaxClients = MaxFDs / 3;
}
- if ((Clients = calloc(sizeof(client_t), MaxClients)) == NULL)
- {
- LogMessage(L_ERROR, "ReadConfiguration: Unable to allocate memory for %d clients: %s",
- MaxClients, strerror(errno));
- exit(1);
- }
- else
- LogMessage(L_INFO, "Configured for up to %d clients.", MaxClients);
+ cupsdLogMessage(CUPSD_LOG_INFO, "Configured for up to %d clients.",
+ MaxClients);
/*
* Check the MaxActiveJobs setting; limit to 1/3 the available
MaxActiveJobs = MaxFDs / 3;
if (Classification && strcasecmp(Classification, "none") == 0)
- ClearString(&Classification);
+ cupsdClearString(&Classification);
if (Classification)
- LogMessage(L_INFO, "Security set to \"%s\"", Classification);
+ cupsdLogMessage(CUPSD_LOG_INFO, "Security set to \"%s\"", Classification);
/*
* Update the MaxClientsPerHost value, as needed...
if (MaxClientsPerHost > MaxClients)
MaxClientsPerHost = MaxClients;
- LogMessage(L_INFO, "Allowing up to %d client connections per host.",
- MaxClientsPerHost);
+ cupsdLogMessage(CUPSD_LOG_INFO,
+ "Allowing up to %d client connections per host.",
+ MaxClientsPerHost);
/*
* Update the default policy, as needed...
if (!DefaultPolicyPtr)
{
cupsd_policy_t *p; /* New policy */
- location_t *po; /* New policy operation */
+ cupsd_location_t *po; /* New policy operation */
if (DefaultPolicy)
- LogMessage(L_ERROR, "Default policy \"%s\" not found!", DefaultPolicy);
+ cupsdLogMessage(CUPSD_LOG_ERROR, "Default policy \"%s\" not found!",
+ DefaultPolicy);
if ((DefaultPolicyPtr = cupsdFindPolicy("default")) != NULL)
- LogMessage(L_INFO, "Using policy \"default\" as the default!");
+ cupsdLogMessage(CUPSD_LOG_INFO,
+ "Using policy \"default\" as the default!");
else
{
- LogMessage(L_INFO, "Creating CUPS default administrative policy:");
+ cupsdLogMessage(CUPSD_LOG_INFO,
+ "Creating CUPS default administrative policy:");
DefaultPolicyPtr = p = cupsdAddPolicy("default");
- LogMessage(L_INFO, "<Policy default>");
- LogMessage(L_INFO, "<Limit Send-Document Send-URI Cancel-Job Hold-Job "
- "Release-Job Restart-Job Purge-Jobs "
- "Set-Job-Attributes Create-Job-Subscription "
- "Renew-Subscription Cancel-Subscription "
- "Get-Notifications Reprocess-Job Cancel-Current-Job "
- "Suspend-Current-Job Resume-Job CUPS-Move-Job>");
- LogMessage(L_INFO, "Order Allow,Deny");
+ cupsdLogMessage(CUPSD_LOG_INFO, "<Policy default>");
+ cupsdLogMessage(CUPSD_LOG_INFO,
+ "<Limit Send-Document Send-URI Cancel-Job Hold-Job "
+ "Release-Job Restart-Job Purge-Jobs "
+ "Set-Job-Attributes Create-Job-Subscription "
+ "Renew-Subscription Cancel-Subscription "
+ "Get-Notifications Reprocess-Job Cancel-Current-Job "
+ "Suspend-Current-Job Resume-Job CUPS-Move-Job "
+ "CUPS-Authenticate-Job>");
+ cupsdLogMessage(CUPSD_LOG_INFO, "Order Deny,Allow");
po = cupsdAddPolicyOp(p, NULL, IPP_SEND_DOCUMENT);
- po->order_type = AUTH_DENY;
+ po->order_type = AUTH_ALLOW;
po->level = AUTH_USER;
- AddName(po, "@OWNER");
- AddName(po, "@SYSTEM");
- LogMessage(L_INFO, "Require user @OWNER @SYSTEM");
+ cupsdAddName(po, "@OWNER");
+ cupsdAddName(po, "@SYSTEM");
+ cupsdLogMessage(CUPSD_LOG_INFO, "Require user @OWNER @SYSTEM");
cupsdAddPolicyOp(p, po, IPP_SEND_URI);
cupsdAddPolicyOp(p, po, IPP_CANCEL_JOB);
cupsdAddPolicyOp(p, po, IPP_SUSPEND_CURRENT_JOB);
cupsdAddPolicyOp(p, po, IPP_RESUME_JOB);
cupsdAddPolicyOp(p, po, CUPS_MOVE_JOB);
-
- LogMessage(L_INFO, "</Limit>");
-
- LogMessage(L_INFO, "<Limit Pause-Printer Resume-Printer "
- "Set-Printer-Attributes Enable-Printer "
- "Disable-Printer Pause-Printer-After-Current-Job "
- "Hold-New-Jobs Release-Held-New-Jobs "
- "Deactivate-Printer Activate-Printer Restart-Printer "
- "Shutdown-Printer Startup-Printer Promote-Job "
- "Schedule-Job-After CUPS-Add-Printer "
- "CUPS-Delete-Printer CUPS-Add-Class CUPS-Delete-Class "
- "CUPS-Accept-Jobs CUPS-Reject-Jobs CUPS-Set-Default>");
- LogMessage(L_INFO, "Order Allow,Deny");
- LogMessage(L_INFO, "AuthType Basic");
+ cupsdAddPolicyOp(p, po, CUPS_AUTHENTICATE_JOB);
+
+ cupsdLogMessage(CUPSD_LOG_INFO, "</Limit>");
+
+ cupsdLogMessage(CUPSD_LOG_INFO,
+ "<Limit Pause-Printer Resume-Printer "
+ "Set-Printer-Attributes Enable-Printer "
+ "Disable-Printer Pause-Printer-After-Current-Job "
+ "Hold-New-Jobs Release-Held-New-Jobs "
+ "Deactivate-Printer Activate-Printer Restart-Printer "
+ "Shutdown-Printer Startup-Printer Promote-Job "
+ "Schedule-Job-After CUPS-Add-Printer "
+ "CUPS-Delete-Printer CUPS-Add-Class CUPS-Delete-Class "
+ "CUPS-Accept-Jobs CUPS-Reject-Jobs CUPS-Set-Default>");
+ cupsdLogMessage(CUPSD_LOG_INFO, "Order Deny,Allow");
+ cupsdLogMessage(CUPSD_LOG_INFO, "AuthType Basic");
po = cupsdAddPolicyOp(p, NULL, IPP_PAUSE_PRINTER);
- po->order_type = AUTH_DENY;
+ po->order_type = AUTH_ALLOW;
po->type = AUTH_BASIC;
po->level = AUTH_USER;
- AddName(po, "@SYSTEM");
- LogMessage(L_INFO, "Require user @SYSTEM");
+ cupsdAddName(po, "@SYSTEM");
+ cupsdLogMessage(CUPSD_LOG_INFO, "Require user @SYSTEM");
cupsdAddPolicyOp(p, po, IPP_RESUME_PRINTER);
cupsdAddPolicyOp(p, po, IPP_SET_PRINTER_ATTRIBUTES);
cupsdAddPolicyOp(p, po, CUPS_REJECT_JOBS);
cupsdAddPolicyOp(p, po, CUPS_SET_DEFAULT);
- LogMessage(L_INFO, "</Limit>");
+ cupsdLogMessage(CUPSD_LOG_INFO, "</Limit>");
- LogMessage(L_INFO, "<Limit All>");
- LogMessage(L_INFO, "Order Allow,Deny");
+ cupsdLogMessage(CUPSD_LOG_INFO, "<Limit All>");
+ cupsdLogMessage(CUPSD_LOG_INFO, "Order Deny,Allow");
po = cupsdAddPolicyOp(p, NULL, IPP_ANY_OPERATION);
- po->order_type = AUTH_DENY;
+ po->order_type = AUTH_ALLOW;
- LogMessage(L_INFO, "</Limit>");
- LogMessage(L_INFO, "</Policy>");
+ cupsdLogMessage(CUPSD_LOG_INFO, "</Limit>");
+ cupsdLogMessage(CUPSD_LOG_INFO, "</Policy>");
}
}
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdReadConfiguration: NumPolicies=%d",
+ NumPolicies);
+ for (i = 0; i < NumPolicies; i ++)
+ cupsdLogMessage(CUPSD_LOG_DEBUG2,
+ "cupsdReadConfiguration: Policies[%d]=\"%s\"", i,
+ Policies[i]->name);
+
/*
* If we are doing a full reload or the server root has changed, flush
* the jobs, printers, etc. and start from scratch...
!old_serverroot || !ServerRoot || strcmp(old_serverroot, ServerRoot) ||
!old_requestroot || !RequestRoot || strcmp(old_requestroot, RequestRoot))
{
- LogMessage(L_INFO, "Full reload is required.");
+ mime_type_t *type; /* Current type */
+ char mimetype[MIME_MAX_SUPER + MIME_MAX_TYPE];
+ /* MIME type name */
+
+
+ cupsdLogMessage(CUPSD_LOG_INFO, "Full reload is required.");
/*
* Free all memory...
*/
- FreeAllJobs();
- DeleteAllClasses();
- DeleteAllPrinters();
+ cupsdDeleteAllSubscriptions();
+ cupsdFreeAllJobs();
+ cupsdDeleteAllClasses();
+ cupsdDeleteAllPrinters();
DefaultPrinter = NULL;
if (NumMimeTypes)
{
for (i = 0; i < NumMimeTypes; i ++)
- free((void *)MimeTypes[i]);
+ _cups_sp_free(MimeTypes[i]);
free(MimeTypes);
}
MimeDatabase = mimeLoad(ServerRoot, temp);
- LogMessage(L_INFO, "Loaded MIME database from \'%s\': %d types, %d filters...",
- ServerRoot, MimeDatabase->num_types, MimeDatabase->num_filters);
+ if (!MimeDatabase)
+ {
+ cupsdLogMessage(CUPSD_LOG_EMERG,
+ "Unable to load MIME database from \'%s\'!", ServerRoot);
+ exit(errno);
+ }
+
+ cupsdLogMessage(CUPSD_LOG_INFO,
+ "Loaded MIME database from \'%s\': %d types, %d filters...",
+ ServerRoot, mimeNumTypes(MimeDatabase),
+ mimeNumFilters(MimeDatabase));
/*
* Create a list of MIME types for the document-format-supported
* attribute...
*/
- NumMimeTypes = MimeDatabase->num_types;
+ NumMimeTypes = mimeNumTypes(MimeDatabase);
if (!mimeType(MimeDatabase, "application", "octet-stream"))
NumMimeTypes ++;
MimeTypes = calloc(NumMimeTypes, sizeof(const char *));
- for (i = 0; i < MimeDatabase->num_types; i ++)
+ for (i = 0, type = mimeFirstType(MimeDatabase);
+ type;
+ i ++, type = mimeNextType(MimeDatabase))
{
- snprintf(type, sizeof(type), "%s/%s", MimeDatabase->types[i]->super,
- MimeDatabase->types[i]->type);
+ snprintf(mimetype, sizeof(mimetype), "%s/%s", type->super, type->type);
- MimeTypes[i] = strdup(type);
+ MimeTypes[i] = _cups_sp_alloc(mimetype);
}
if (i < NumMimeTypes)
- MimeTypes[i] = strdup("application/octet-stream");
+ MimeTypes[i] = _cups_sp_alloc("application/octet-stream");
+
+ if (LogLevel == CUPSD_LOG_DEBUG2)
+ {
+ mime_filter_t *filter; /* Current filter */
+
+
+ for (type = mimeFirstType(MimeDatabase);
+ type;
+ type = mimeNextType(MimeDatabase))
+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdReadConfiguration: type %s/%s",
+ type->super, type->type);
+
+ for (filter = mimeFirstFilter(MimeDatabase);
+ filter;
+ filter = mimeNextFilter(MimeDatabase))
+ cupsdLogMessage(CUPSD_LOG_DEBUG2,
+ "cupsdReadConfiguration: filter %s/%s to %s/%s %d %s",
+ filter->src->super, filter->src->type,
+ filter->dst->super, filter->dst->type,
+ filter->cost, filter->filter);
+ }
/*
* Load banners...
*/
snprintf(temp, sizeof(temp), "%s/banners", DataDir);
- LoadBanners(temp);
+ cupsdLoadBanners(temp);
/*
* Load printers and classes...
*/
- LoadAllPrinters();
- LoadAllClasses();
+ cupsdLoadAllPrinters();
+ cupsdLoadAllClasses();
+ cupsdLoadRemoteCache();
+ cupsdWritePrintcap();
- CreateCommonData();
+ cupsdCreateCommonData();
/*
* Load queued jobs...
*/
- LoadAllJobs();
+ cupsdLoadAllJobs();
- LogMessage(L_INFO, "Full reload complete.");
+ /*
+ * Load subscriptions...
+ */
+
+ cupsdLoadAllSubscriptions();
+
+ cupsdLogMessage(CUPSD_LOG_INFO, "Full reload complete.");
}
else
{
- CreateCommonData();
+ /*
+ * Not a full reload, so recreate the common printer attributes...
+ */
+
+ cupsdCreateCommonData();
+
+ /*
+ * Update all printers as needed...
+ */
- LogMessage(L_INFO, "Partial reload complete.");
+ cupsdUpdatePrinters();
+ cupsdWritePrintcap();
+
+ cupsdLogMessage(CUPSD_LOG_INFO, "Partial reload complete.");
}
/*
NeedReload = RELOAD_NONE;
- ClearString(&old_serverroot);
- ClearString(&old_requestroot);
-
- /*
- * Startup the server and return...
- */
-
- StartServer();
+ cupsdClearString(&old_serverroot);
+ cupsdClearString(&old_requestroot);
return (1);
}
/*
- * 'get_address()' - Get an address + port number from a line.
+ * 'check_permissions()' - Fix the mode and ownership of a file or directory.
*/
-static int /* O - 1 if address good, 0 if bad */
-get_address(const char *value, /* I - Value string */
- unsigned defaddress, /* I - Default address */
- int defport, /* I - Default port */
- int deffamily, /* I - Default family */
- http_addr_t *address) /* O - Socket address */
+static int /* O - 0 on success, -1 on error */
+check_permissions(const char *filename, /* I - File/directory name */
+ const char *suffix, /* I - Additional file/directory name */
+ int mode, /* I - Permissions */
+ int user, /* I - Owner */
+ int group, /* I - Group */
+ int is_dir, /* I - 1 = directory, 0 = file */
+ int create_dir)/* I - 1 = create directory, 0 = not */
{
- char hostname[256], /* Hostname or IP */
- portname[256], /* Port number or name */
- *ptr; /* Pointer into hostname string */
- struct hostent *host; /* Host address */
- struct servent *port; /* Port number */
+ int dir_created = 0; /* Did we create a directory? */
+ char pathname[1024]; /* File name with prefix */
+ struct stat fileinfo; /* Stat buffer */
/*
- * Check for an empty value...
+ * Prepend the given root to the filename before testing it...
*/
- if (!*value)
+ if (suffix)
{
- LogMessage(L_ERROR, "Bad (empty) address!");
- return (0);
+ snprintf(pathname, sizeof(pathname), "%s/%s", filename, suffix);
+ filename = pathname;
}
/*
- * Initialize the socket address to the defaults...
+ * See if we can stat the file/directory...
*/
- memset(address, 0, sizeof(http_addr_t));
+ if (stat(filename, &fileinfo))
+ {
+ if (errno == ENOENT && create_dir)
+ {
+ cupsdLogMessage(CUPSD_LOG_ERROR, "Creating missing directory \"%s\"",
+ filename);
-#ifdef AF_INET6
- if (deffamily == AF_INET6)
+ if (mkdir(filename, mode))
+ {
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Unable to create directory \"%s\" - %s", filename,
+ strerror(errno));
+ return (-1);
+ }
+
+ dir_created = 1;
+ }
+ else
+ return (-1);
+ }
+
+ /*
+ * Make sure it's a regular file...
+ */
+
+ if (!dir_created && !is_dir && !S_ISREG(fileinfo.st_mode))
{
- address->ipv6.sin6_family = AF_INET6;
- address->ipv6.sin6_addr.s6_addr32[0] = htonl(defaddress);
- address->ipv6.sin6_addr.s6_addr32[1] = htonl(defaddress);
- address->ipv6.sin6_addr.s6_addr32[2] = htonl(defaddress);
- address->ipv6.sin6_addr.s6_addr32[3] = htonl(defaddress);
- address->ipv6.sin6_port = htons(defport);
+ cupsdLogMessage(CUPSD_LOG_ERROR, "\"%s\" is not a regular file!", filename);
+ return (-1);
}
- else
-#endif /* AF_INET6 */
+
+ if (!dir_created && is_dir && !S_ISDIR(fileinfo.st_mode))
{
- address->ipv4.sin_family = AF_INET;
- address->ipv4.sin_addr.s_addr = htonl(defaddress);
- address->ipv4.sin_port = htons(defport);
+ cupsdLogMessage(CUPSD_LOG_ERROR, "\"%s\" is not a directory!", filename);
+ return (-1);
}
-#ifdef AF_LOCAL
/*
- * If the address starts with a "/", it is a domain socket...
+ * Fix owner, group, and mode as needed...
*/
- if (*value == '/')
+ if (dir_created || fileinfo.st_uid != user || fileinfo.st_gid != group)
{
- if (strlen(value) >= sizeof(address->un.sun_path))
+ cupsdLogMessage(CUPSD_LOG_WARN, "Repairing ownership of \"%s\"", filename);
+
+ if (chown(filename, user, group))
{
- LogMessage(L_ERROR, "Domain socket name \"%s\" too long!", value);
- return (0);
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Unable to change ownership of \"%s\" - %s", filename,
+ strerror(errno));
+ return (-1);
}
+ }
- address->un.sun_family = AF_LOCAL;
- strcpy(address->un.sun_path, value);
+ if (dir_created || (fileinfo.st_mode & 07777) != mode)
+ {
+ cupsdLogMessage(CUPSD_LOG_WARN, "Repairing access permissions of \"%s\"", filename);
+
+ if (chmod(filename, mode))
+ {
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Unable to change permissions of \"%s\" - %s", filename,
+ strerror(errno));
+ return (-1);
+ }
}
- else
-#endif /* AF_LOCAL */
/*
- * Try to grab a hostname and port number...
+ * Everything is OK...
*/
- strlcpy(hostname, value, sizeof(hostname));
+ return (0);
+}
- if ((ptr = strrchr(hostname, ':')) != NULL)
- {
- /*
- * Copy hostname and port separately...
- */
- *ptr++ = '\0';
+/*
+ * 'get_address()' - Get an address + port number from a line.
+ */
- strlcpy(portname, ptr, sizeof(portname));
- }
- else if (isdigit(value[0] & 255))
- {
- /*
- * Port number...
- */
+static http_addrlist_t * /* O - Pointer to list if address good, NULL if bad */
+get_address(const char *value, /* I - Value string */
+ int defport) /* I - Default port */
+{
+ char buffer[1024], /* Hostname + port number buffer */
+ defpname[255], /* Default port name */
+ *hostname, /* Hostname or IP */
+ *portname; /* Port number or name */
+ http_addrlist_t *addrlist; /* Address list */
- hostname[0] = '\0';
- strlcpy(portname, value, sizeof(portname));
- }
- else
- {
- /*
- * Hostname by itself...
- */
- portname[0] = '\0';
+ /*
+ * Check for an empty value...
+ */
+
+ if (!*value)
+ {
+ cupsdLogMessage(CUPSD_LOG_ERROR, "Bad (empty) address!");
+ return (NULL);
}
/*
- * Decode the hostname and port number as needed...
+ * Grab a hostname and port number; if there is no colon and the port name
+ * is only digits, then we have a port number by itself...
*/
- if (hostname[0] && strcmp(hostname, "*"))
- {
- if ((host = httpGetHostByName(hostname)) == NULL)
- {
- LogMessage(L_ERROR, "httpGetHostByName(\"%s\") failed - %s!", hostname,
- hstrerror(h_errno));
- return (0);
- }
+ strlcpy(buffer, value, sizeof(buffer));
- httpAddrLoad(host, defport, 0, address);
+ if ((portname = strrchr(buffer, ':')) != NULL && !strchr(portname, ']'))
+ {
+ *portname++ = '\0';
+ hostname = buffer;
}
-
- if (portname[0] != '\0')
+ else
{
- if (isdigit(portname[0] & 255))
+ for (portname = buffer; isdigit(*portname & 255); portname ++);
+
+ if (*portname)
{
-#ifdef AF_INET6
- if (address->addr.sa_family == AF_INET6)
- address->ipv6.sin6_port = htons(atoi(portname));
- else
-#endif /* AF_INET6 */
- address->ipv4.sin_port = htons(atoi(portname));
+ /*
+ * Use the default port...
+ */
+
+ sprintf(defpname, "%d", defport);
+ portname = defpname;
+ hostname = buffer;
}
else
{
- if ((port = getservbyname(portname, NULL)) == NULL)
- {
- LogMessage(L_ERROR, "getservbyname(\"%s\") failed - %s!", portname,
- strerror(errno));
- return (0);
- }
- else
- {
-#ifdef AF_INET6
- if (address->addr.sa_family == AF_INET6)
- address->ipv6.sin6_port = htons(port->s_port);
- else
-#endif /* AF_INET6 */
- address->ipv4.sin_port = htons(port->s_port);
- }
+ /*
+ * The buffer contains just a port number...
+ */
+
+ portname = buffer;
+ hostname = NULL;
}
}
- return (1);
+ if (hostname && !strcmp(hostname, "*"))
+ hostname = NULL;
+
+ /*
+ * Now lookup the address using httpAddrGetList()...
+ */
+
+ if ((addrlist = httpAddrGetList(hostname, AF_UNSPEC, portname)) == NULL)
+ cupsdLogMessage(CUPSD_LOG_ERROR, "Hostname lookup for \"%s\" failed!",
+ hostname ? hostname : "(nil)");
+
+ return (addrlist);
}
unsigned *ip, /* O - Address value */
unsigned *mask) /* O - Mask value */
{
- int i, /* Looping var */
+ int i, j, /* Looping vars */
family, /* Address family */
ipcount; /* Count of fields in address */
+ unsigned ipval; /* Value */
const char *maskval, /* Pointer to start of mask value */
- *ptr; /* Pointer into value */
- static unsigned netmasks[4][4] = /* Standard netmasks... */
+ *ptr, /* Pointer into value */
+ *ptr2; /* ... */
+ static unsigned netmasks[4][4] = /* Standard IPv4 netmasks... */
+ {
+ { 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000 },
+ { 0xffffffff, 0xffffffff, 0xffffffff, 0xffff0000 },
+ { 0xffffffff, 0xffffffff, 0xffffffff, 0xffffff00 },
+ { 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff }
+ };
+#ifdef AF_INET6
+ static unsigned netmasks6[8][4] = /* Standard IPv6 netmasks... */
{
+ { 0xffff0000, 0x00000000, 0x00000000, 0x00000000 },
{ 0xffffffff, 0x00000000, 0x00000000, 0x00000000 },
+ { 0xffffffff, 0xffff0000, 0x00000000, 0x00000000 },
{ 0xffffffff, 0xffffffff, 0x00000000, 0x00000000 },
+ { 0xffffffff, 0xffffffff, 0xffff0000, 0x00000000 },
{ 0xffffffff, 0xffffffff, 0xffffffff, 0x00000000 },
+ { 0xffffffff, 0xffffffff, 0xffffffff, 0xffff0000 },
{ 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff }
};
+#endif /* AF_INET6 */
/*
family = AF_INET6;
- for (i = 0, ptr = value + 1; *ptr && i < 4; i ++)
+ for (i = 0, ptr = value + 1; *ptr && i < 8; i ++)
{
if (*ptr == ']')
break;
- else if (*ptr == ':')
- ip[i] = 0;
+ else if (!strncmp(ptr, "::", 2))
+ {
+ for (ptr2 = strchr(ptr + 2, ':'), j = 0;
+ ptr2;
+ ptr2 = strchr(ptr2 + 1, ':'), j ++);
+
+ i = 7 - j;
+ }
+ else if (isxdigit(*ptr & 255))
+ {
+ ipval = strtoul(ptr, (char **)&ptr, 16);
+
+ if (ipval > 0xffff)
+ return (0);
+
+ if (i & 1)
+ ip[i] |= ipval;
+ else
+ ip[i] |= ipval << 16;
+ }
else
- ip[i] = strtoul(ptr, (char **)&ptr, 16);
+ return (0);
- if (*ptr == ':' || *ptr == ']')
+ while (*ptr == ':')
ptr ++;
}
memset(mask, 0, sizeof(unsigned) * 4);
#ifdef AF_INET6
- if (maskval[1] == '[')
+ if (*maskval == '[')
{
/*
* Get hexadecimal mask value...
*/
- for (i = 0, ptr = maskval + 1; *ptr && i < 4; i ++)
+ for (i = 0, ptr = maskval + 1; *ptr && i < 8; i ++)
{
if (*ptr == ']')
break;
- else if (*ptr == ':')
- mask[i] = 0;
+ else if (!strncmp(ptr, "::", 2))
+ {
+ for (ptr2 = strchr(ptr + 2, ':'), j = 0;
+ ptr2;
+ ptr2 = strchr(ptr2 + 1, ':'), j ++);
+
+ i = 7 - j;
+ }
+ else if (isxdigit(*ptr & 255))
+ {
+ ipval = strtoul(ptr, (char **)&ptr, 16);
+
+ if (ipval > 0xffff)
+ return (0);
+
+ if (i & 1)
+ mask[i] |= ipval;
+ else
+ mask[i] |= ipval << 16;
+ }
else
- mask[i] = strtoul(ptr, (char **)&ptr, 16);
+ return (0);
- if (*ptr == ':' || *ptr == ']')
+ while (*ptr == ':')
ptr ++;
}
}
}
}
+#ifdef AF_INET6
+ else if (family == AF_INET6)
+ memcpy(mask, netmasks6[ipcount - 1], sizeof(unsigned) * 4);
+#endif /* AF_INET6 */
else
memcpy(mask, netmasks[ipcount - 1], sizeof(unsigned) * 4);
- LogMessage(L_DEBUG2, "get_addr_and_mask(value=\"%s\", "
- "ip=[%08x:%08x:%08x:%08x], mask=[%08x:%08x:%08x:%08x]",
+ cupsdLogMessage(CUPSD_LOG_DEBUG2,
+ "get_addr_and_mask(value=\"%s\", "
+ "ip=[%08x:%08x:%08x:%08x], mask=[%08x:%08x:%08x:%08x]",
value, ip[0], ip[1], ip[2], ip[3], mask[0], mask[1], mask[2],
mask[3]);
*/
static int /* O - 1 on success, 0 on failure */
-parse_aaa(location_t *loc, /* I - Location */
- char *line, /* I - Line from file */
- char *value, /* I - Start of value data */
- int linenum) /* I - Current line number */
+parse_aaa(cupsd_location_t *loc, /* I - Location */
+ char *line, /* I - Line from file */
+ char *value, /* I - Start of value data */
+ int linenum) /* I - Current line number */
{
char *valptr; /* Pointer into value */
unsigned ip[4], /* IP address components */
loc->encryption = HTTP_ENCRYPT_NEVER;
else if (!strcasecmp(value, "always"))
{
- LogMessage(L_ERROR, "Encryption value \"%s\" on line %d is invalid in this context. "
- "Using \"required\" instead.", value, linenum);
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Encryption value \"%s\" on line %d is invalid in this "
+ "context. Using \"required\" instead.", value, linenum);
loc->encryption = HTTP_ENCRYPT_REQUIRED;
}
loc->encryption = HTTP_ENCRYPT_IF_REQUESTED;
else
{
- LogMessage(L_ERROR, "Unknown Encryption value %s on line %d.",
- value, linenum);
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Unknown Encryption value %s on line %d.", value, linenum);
return (0);
}
}
loc->order_type = AUTH_DENY;
else
{
- LogMessage(L_ERROR, "Unknown Order value %s on line %d.",
- value, linenum);
+ cupsdLogMessage(CUPSD_LOG_ERROR, "Unknown Order value %s on line %d.",
+ value, linenum);
return (0);
}
}
*/
if (!strcasecmp(line, "Allow"))
- AllowIP(loc, zeros, zeros);
+ cupsdAllowIP(loc, zeros, zeros);
else
- DenyIP(loc, zeros, zeros);
+ cupsdDenyIP(loc, zeros, zeros);
}
else if (!strcasecmp(value, "none"))
{
*/
if (!strcasecmp(line, "Allow"))
- AllowIP(loc, ones, zeros);
+ cupsdAllowIP(loc, ones, zeros);
else
- DenyIP(loc, ones, zeros);
+ cupsdDenyIP(loc, ones, zeros);
}
else if (value[0] == '*' || value[0] == '.' || !isdigit(value[0] & 255))
{
value ++;
if (!strcasecmp(line, "Allow"))
- AllowHost(loc, value);
+ cupsdAllowHost(loc, value);
else
- DenyHost(loc, value);
+ cupsdDenyHost(loc, value);
}
else
{
if (!get_addr_and_mask(value, ip, mask))
{
- LogMessage(L_ERROR, "Bad netmask value %s on line %d.",
- value, linenum);
+ cupsdLogMessage(CUPSD_LOG_ERROR, "Bad netmask value %s on line %d.",
+ value, linenum);
return (0);
}
if (!strcasecmp(line, "Allow"))
- AllowIP(loc, ip, mask);
+ cupsdAllowIP(loc, ip, mask);
else
- DenyIP(loc, ip, mask);
+ cupsdDenyIP(loc, ip, mask);
}
}
else if (!strcasecmp(line, "AuthType"))
}
else
{
- LogMessage(L_WARN, "Unknown authorization type %s on line %d.",
- value, linenum);
+ cupsdLogMessage(CUPSD_LOG_WARN,
+ "Unknown authorization type %s on line %d.",
+ value, linenum);
return (0);
}
}
{
loc->type = AUTH_NONE;
loc->level = AUTH_ANON;
+
+ cupsdLogMessage(CUPSD_LOG_WARN,
+ "\"AuthClass %s\" is deprecated; consider removing "
+ "it from line %d.",
+ value, linenum);
}
else if (!strcasecmp(value, "user"))
+ {
loc->level = AUTH_USER;
+
+ cupsdLogMessage(CUPSD_LOG_WARN,
+ "\"AuthClass %s\" is deprecated; consider using "
+ "\"Require valid-user\" on line %d.",
+ value, linenum);
+ }
else if (!strcasecmp(value, "group"))
+ {
loc->level = AUTH_GROUP;
+
+ cupsdLogMessage(CUPSD_LOG_WARN,
+ "\"AuthClass %s\" is deprecated; consider using "
+ "\"Require @groupname\" on line %d.",
+ value, linenum);
+ }
else if (!strcasecmp(value, "system"))
{
loc->level = AUTH_GROUP;
- AddName(loc, "@SYSTEM");
+ cupsdAddName(loc, "@SYSTEM");
+
+ cupsdLogMessage(CUPSD_LOG_WARN,
+ "\"AuthClass %s\" is deprecated; consider using "
+ "\"Require @SYSTEM\" on line %d.",
+ value, linenum);
}
else
{
- LogMessage(L_WARN, "Unknown authorization class %s on line %d.",
- value, linenum);
+ cupsdLogMessage(CUPSD_LOG_WARN,
+ "Unknown authorization class %s on line %d.",
+ value, linenum);
return (0);
}
}
else if (!strcasecmp(line, "AuthGroupName"))
- AddName(loc, value);
+ {
+ cupsdAddName(loc, value);
+
+ cupsdLogMessage(CUPSD_LOG_WARN,
+ "\"AuthGroupName %s\" directive is deprecated; consider "
+ "using \"Require @%s\" on line %d.",
+ value, value, linenum);
+ }
else if (!strcasecmp(line, "Require"))
{
/*
loc->level = AUTH_GROUP;
else
{
- LogMessage(L_WARN, "Unknown Require type %s on line %d.",
- value, linenum);
+ cupsdLogMessage(CUPSD_LOG_WARN, "Unknown Require type %s on line %d.",
+ value, linenum);
return (0);
}
if (*valptr)
*valptr++ = '\0';
- AddName(loc, value);
+ cupsdAddName(loc, value);
for (value = valptr; isspace(*value & 255); value ++);
}
loc->satisfy = AUTH_SATISFY_ANY;
else
{
- LogMessage(L_WARN, "Unknown Satisfy value %s on line %d.", value,
- linenum);
+ cupsdLogMessage(CUPSD_LOG_WARN, "Unknown Satisfy value %s on line %d.",
+ value, linenum);
return (0);
}
}
}
+/*
+ * 'parse_groups()' - Parse system group names in a string.
+ */
+
+static int /* O - 1 on success, 0 on failure */
+parse_groups(const char *s) /* I - Space-delimited groups */
+{
+ int status; /* Return status */
+ char value[1024], /* Value string */
+ *valstart, /* Pointer into value */
+ *valend, /* End of value */
+ quote; /* Quote character */
+ struct group *group; /* Group */
+
+
+ /*
+ * Make a copy of the string and parse out the groups...
+ */
+
+ strlcpy(value, s, sizeof(value));
+
+ status = 1;
+ valstart = value;
+
+ while (*valstart && NumSystemGroups < MAX_SYSTEM_GROUPS)
+ {
+ if (*valstart == '\'' || *valstart == '\"')
+ {
+ /*
+ * Scan quoted name...
+ */
+
+ quote = *valstart++;
+
+ for (valend = valstart; *valend; valend ++)
+ if (*valend == quote)
+ break;
+ }
+ else
+ {
+ /*
+ * Scan space or comma-delimited name...
+ */
+
+ for (valend = valstart; *valend; valend ++)
+ if (isspace(*valend) || *valend == ',')
+ break;
+ }
+
+ if (*valend)
+ *valend++ = '\0';
+
+ group = getgrnam(valstart);
+ if (group)
+ {
+ cupsdSetString(SystemGroups + NumSystemGroups, valstart);
+ SystemGroupIDs[NumSystemGroups] = group->gr_gid;
+
+ NumSystemGroups ++;
+ }
+ else
+ status = 0;
+
+ endgrent();
+
+ valstart = valend;
+
+ while (*valstart == ',' || isspace(*valstart))
+ valstart ++;
+ }
+
+ return (status);
+}
+
+
+/*
+ * 'parse_protocols()' - Parse browse protocols in a string.
+ */
+
+static int /* O - Browse protocol bits */
+parse_protocols(const char *s) /* I - Space-delimited protocols */
+{
+ int protocols; /* Browse protocol bits */
+ char value[1024], /* Value string */
+ *valstart, /* Pointer into value */
+ *valend; /* End of value */
+
+
+ /*
+ * Loop through the value string,...
+ */
+
+ strlcpy(value, s, sizeof(value));
+
+ protocols = 0;
+
+ for (valstart = value; *valstart;)
+ {
+ /*
+ * Get the current space/comma-delimited protocol name...
+ */
+
+ for (valend = valstart; *valend; valend ++)
+ if (isspace(*valend & 255) || *valend == ',')
+ break;
+
+ if (*valend)
+ *valend++ = '\0';
+
+ /*
+ * Add the protocol to the bitmask...
+ */
+
+ if (!strcasecmp(valstart, "cups"))
+ protocols |= BROWSE_CUPS;
+ else if (!strcasecmp(valstart, "slp"))
+ protocols |= BROWSE_SLP;
+ else if (!strcasecmp(valstart, "ldap"))
+ protocols |= BROWSE_LDAP;
+ else if (!strcasecmp(valstart, "dnssd") || !strcasecmp(valstart, "bonjour"))
+ protocols |= BROWSE_DNSSD;
+ else if (!strcasecmp(valstart, "all"))
+ protocols |= BROWSE_ALL;
+ else
+ return (-1);
+
+ for (valstart = valend; *valstart; valstart ++)
+ if (!isspace(*valstart & 255) || *valstart != ',')
+ break;
+ }
+
+ return (protocols);
+}
+
+
/*
* 'read_configuration()' - Read a configuration file.
*/
static int /* O - 1 on success, 0 on failure */
read_configuration(cups_file_t *fp) /* I - File to read from */
{
- int i; /* Looping var */
- int linenum; /* Current line number */
- char line[HTTP_MAX_BUFFER], /* Line from file */
- temp[HTTP_MAX_BUFFER], /* Temporary buffer for value */
- temp2[HTTP_MAX_BUFFER], /* Temporary buffer 2 for value */
- *ptr, /* Pointer into line/temp */
- *value; /* Pointer to value */
- int valuelen; /* Length of value */
- var_t *var; /* Current variable */
- unsigned ip[4], /* Address value */
- mask[4]; /* Netmask value */
- dirsvc_relay_t *relay; /* Relay data */
- dirsvc_poll_t *poll; /* Polling data */
- http_addr_t polladdr; /* Polling address */
- location_t *location; /* Browse location */
- cups_file_t *incfile; /* Include file */
- char incname[1024]; /* Include filename */
+ int i; /* Looping var */
+ int linenum; /* Current line number */
+ char line[HTTP_MAX_BUFFER],
+ /* Line from file */
+ temp[HTTP_MAX_BUFFER],
+ /* Temporary buffer for value */
+ temp2[HTTP_MAX_BUFFER],
+ /* Temporary buffer 2 for value */
+ *ptr, /* Pointer into line/temp */
+ *value, /* Pointer to value */
+ *valueptr; /* Pointer into value */
+ int valuelen; /* Length of value */
+ cupsd_var_t *var; /* Current variable */
+ http_addrlist_t *addrlist, /* Address list */
+ *addr; /* Current address */
+ unsigned ip[4], /* Address value */
+ mask[4]; /* Netmask value */
+ cupsd_dirsvc_relay_t *relay; /* Relay data */
+ cupsd_dirsvc_poll_t *pollp; /* Polling data */
+ cupsd_location_t *location; /* Browse location */
+ cups_file_t *incfile; /* Include file */
+ char incname[1024]; /* Include filename */
+ struct group *group; /* Group */
/*
snprintf(incname, sizeof(incname), "%s/%s", ServerRoot, value);
if ((incfile = cupsFileOpen(incname, "rb")) == NULL)
- LogMessage(L_ERROR, "Unable to include config file \"%s\" - %s",
- incname, strerror(errno));
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Unable to include config file \"%s\" - %s",
+ incname, strerror(errno));
else
{
read_configuration(incfile);
}
else
{
- LogMessage(L_ERROR, "Syntax error on line %d.",
+ cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d.",
linenum);
return (0);
}
}
else
{
- LogMessage(L_ERROR, "Syntax error on line %d.",
- linenum);
+ cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d.", linenum);
return (0);
}
}
- else if (!strcasecmp(line, "Port") || !strcasecmp(line, "Listen"))
+ else if (!strcasecmp(line, "FaxRetryInterval"))
{
- /*
- * Add a listening address to the list...
- */
-
- listener_t *lis; /* New listeners array */
-
-
- if (NumListeners == 0)
- lis = malloc(2 * sizeof(listener_t));
+ if (value)
+ {
+ JobRetryInterval = atoi(value);
+ cupsdLogMessage(CUPSD_LOG_WARN,
+ "FaxRetryInterval is deprecated; use "
+ "JobRetryInterval on line %d.", linenum);
+ }
else
- lis = realloc(Listeners, (NumListeners + 2) * sizeof(listener_t));
-
- if (!lis)
{
- LogMessage(L_ERROR, "Unable to allocate %s at line %d - %s.",
- line, linenum, strerror(errno));
- continue;
+ cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d.", linenum);
+ return (0);
}
-
- Listeners = lis;
- lis += NumListeners;
-
- memset(lis, 0, sizeof(listener_t));
-
-#ifdef AF_INET6
- if (get_address(value, INADDR_ANY, IPP_PORT, AF_INET6, &(lis->address)))
-#else
- if (get_address(value, INADDR_ANY, IPP_PORT, AF_INET, &(lis->address)))
-#endif /* AF_INET6 */
+ }
+ else if (!strcasecmp(line, "FaxRetryLimit"))
+ {
+ if (value)
{
- httpAddrString(&(lis->address), temp, sizeof(temp));
-
-#ifdef AF_INET6
- if (lis->address.addr.sa_family == AF_INET6)
- {
- LogMessage(L_INFO, "Listening to %s:%d (IPv6)", temp,
- ntohs(lis->address.ipv6.sin6_port));
-
-# if ALSO_BIND_IPV4
- if (value[0] == '*')
- {
- /*
- * Also listen on IPv4 address...
- */
-
- lis ++;
- NumListeners ++;
-
- memset(lis, 0, sizeof(listener_t));
- get_address(value, INADDR_ANY, IPP_PORT, AF_INET,
- &(lis->address));
-
- httpAddrString(&(lis->address), temp, sizeof(temp));
- LogMessage(L_INFO, "Listening to %s:%d (IPv4)", temp,
- ntohs(lis->address.ipv4.sin_port));
- }
-# endif /* ALSO_BIND_IPV4 */
- }
- else
-#endif /* AF_INET6 */
- {
- LogMessage(L_INFO, "Listening to %s:%d", temp,
- ntohs(lis->address.ipv4.sin_port));
- }
-
- NumListeners ++;
+ JobRetryLimit = atoi(value);
+ cupsdLogMessage(CUPSD_LOG_WARN,
+ "FaxRetryLimit is deprecated; use "
+ "JobRetryLimit on line %d.", linenum);
}
else
- LogMessage(L_ERROR, "Bad %s address %s at line %d.", line,
- value, linenum);
+ {
+ cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d.", linenum);
+ return (0);
+ }
}
+ else if (!strcasecmp(line, "Port") || !strcasecmp(line, "Listen")
#ifdef HAVE_SSL
- else if (!strcasecmp(line, "SSLPort") || !strcasecmp(line, "SSLListen"))
+ || !strcasecmp(line, "SSLPort") || !strcasecmp(line, "SSLListen")
+#endif /* HAVE_SSL */
+ )
{
/*
- * Add a listening address to the list...
+ * Add listening address(es) to the list...
*/
- listener_t *lis; /* New listeners array */
+ cupsd_listener_t *lis; /* New listeners array */
- if (NumListeners == 0)
- lis = malloc(sizeof(listener_t));
- else
- lis = realloc(Listeners, (NumListeners + 1) * sizeof(listener_t));
+ /*
+ * Get the address list...
+ */
+
+ addrlist = get_address(value, IPP_PORT);
- if (!lis)
+ if (!addrlist)
{
- LogMessage(L_ERROR, "Unable to allocate %s at line %d - %s.",
- line, linenum, strerror(errno));
+ cupsdLogMessage(CUPSD_LOG_ERROR, "Bad %s address %s at line %d.", line,
+ value, linenum);
continue;
}
- Listeners = lis;
- lis += NumListeners;
+ /*
+ * Add each address...
+ */
- if (get_address(value, INADDR_ANY, IPP_PORT, AF_INET, &(lis->address)))
+ for (addr = addrlist; addr; addr = addr->next)
{
- httpAddrString(&(lis->address), temp, sizeof(temp));
+ /*
+ * Allocate another listener...
+ */
+
+ if (!Listeners)
+ Listeners = cupsArrayNew(NULL, NULL);
+
+ if (!Listeners)
+ {
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Unable to allocate %s at line %d - %s.",
+ line, linenum, strerror(errno));
+ break;
+ }
+
+ if ((lis = calloc(1, sizeof(cupsd_listener_t))) == NULL)
+ {
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Unable to allocate %s at line %d - %s.",
+ line, linenum, strerror(errno));
+ break;
+ }
+
+ cupsArrayAdd(Listeners, lis);
+
+ /*
+ * Copy the current address and log it...
+ */
+
+ memcpy(&(lis->address), &(addr->addr), sizeof(lis->address));
+ lis->fd = -1;
+
+#ifdef HAVE_SSL
+ if (!strcasecmp(line, "SSLPort") || !strcasecmp(line, "SSLListen"))
+ lis->encryption = HTTP_ENCRYPT_ALWAYS;
+#endif /* HAVE_SSL */
+
+ httpAddrString(&lis->address, temp, sizeof(temp));
#ifdef AF_INET6
if (lis->address.addr.sa_family == AF_INET6)
- LogMessage(L_INFO, "Listening to %s:%d (IPv6)", temp,
- ntohs(lis->address.ipv6.sin6_port));
+ cupsdLogMessage(CUPSD_LOG_INFO, "Listening to %s:%d (IPv6)", temp,
+ ntohs(lis->address.ipv6.sin6_port));
else
#endif /* AF_INET6 */
- LogMessage(L_INFO, "Listening to %s:%d", temp,
- ntohs(lis->address.ipv4.sin_port));
- lis->encryption = HTTP_ENCRYPT_ALWAYS;
- NumListeners ++;
+#ifdef AF_LOCAL
+ if (lis->address.addr.sa_family == AF_LOCAL)
+ cupsdLogMessage(CUPSD_LOG_INFO, "Listening to %s (Domain)", temp);
+ else
+#endif /* AF_LOCAL */
+ cupsdLogMessage(CUPSD_LOG_INFO, "Listening to %s:%d (IPv4)", temp,
+ ntohs(lis->address.ipv4.sin_port));
}
- else
- LogMessage(L_ERROR, "Bad %s address %s at line %d.", line,
- value, linenum);
+
+ /*
+ * Free the list...
+ */
+
+ httpAddrFreeList(addrlist);
}
-#endif /* HAVE_SSL */
else if (!strcasecmp(line, "BrowseAddress"))
{
/*
* Add a browse address to the list...
*/
- dirsvc_addr_t *dira; /* New browse address array */
+ cupsd_dirsvc_addr_t *dira; /* New browse address array */
if (NumBrowsers == 0)
- dira = malloc(sizeof(dirsvc_addr_t));
+ dira = malloc(sizeof(cupsd_dirsvc_addr_t));
else
- dira = realloc(Browsers, (NumBrowsers + 1) * sizeof(dirsvc_addr_t));
+ dira = realloc(Browsers, (NumBrowsers + 1) * sizeof(cupsd_dirsvc_addr_t));
if (!dira)
{
- LogMessage(L_ERROR, "Unable to allocate BrowseAddress at line %d - %s.",
- linenum, strerror(errno));
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Unable to allocate BrowseAddress at line %d - %s.",
+ linenum, strerror(errno));
continue;
}
Browsers = dira;
dira += NumBrowsers;
- memset(dira, 0, sizeof(dirsvc_addr_t));
+ memset(dira, 0, sizeof(cupsd_dirsvc_addr_t));
if (!strcasecmp(value, "@LOCAL"))
{
NumBrowsers ++;
}
- else if (get_address(value, INADDR_NONE, BrowsePort, AF_INET, &(dira->to)))
+ else if ((addrlist = get_address(value, BrowsePort)) != NULL)
{
- httpAddrString(&(dira->to), temp, sizeof(temp));
+ /*
+ * Only IPv4 addresses are supported...
+ */
-#ifdef AF_INET6
- if (dira->to.addr.sa_family == AF_INET6)
- LogMessage(L_INFO, "Sending browsing info to %s:%d (IPv6)", temp,
- ntohs(dira->to.ipv6.sin6_port));
+ for (addr = addrlist; addr; addr = addr->next)
+ if (addr->addr.addr.sa_family == AF_INET)
+ break;
+
+ if (addr)
+ {
+ memcpy(&(dira->to), &(addrlist->addr), sizeof(dira->to));
+ httpAddrString(&(dira->to), temp, sizeof(temp));
+
+ cupsdLogMessage(CUPSD_LOG_INFO,
+ "Sending browsing info to %s:%d (IPv4)",
+ temp, ntohs(dira->to.ipv4.sin_port));
+
+ NumBrowsers ++;
+ }
else
-#endif /* AF_INET6 */
- LogMessage(L_INFO, "Sending browsing info to %s:%d", temp,
- ntohs(dira->to.ipv4.sin_port));
+ cupsdLogMessage(CUPSD_LOG_ERROR, "Bad BrowseAddress %s at line %d.",
+ value, linenum);
- NumBrowsers ++;
+ httpAddrFreeList(addrlist);
}
else
- LogMessage(L_ERROR, "Bad BrowseAddress %s at line %d.", value,
- linenum);
+ cupsdLogMessage(CUPSD_LOG_ERROR, "Bad BrowseAddress %s at line %d.",
+ value, linenum);
}
else if (!strcasecmp(line, "BrowseOrder"))
{
* "BrowseOrder Deny,Allow" or "BrowseOrder Allow,Deny"...
*/
- if ((location = FindLocation("CUPS_INTERNAL_BROWSE_ACL")) == NULL)
- location = AddLocation("CUPS_INTERNAL_BROWSE_ACL");
+ if ((location = cupsdFindLocation("CUPS_INTERNAL_BROWSE_ACL")) == NULL)
+ location = cupsdAddLocation("CUPS_INTERNAL_BROWSE_ACL");
if (location == NULL)
- LogMessage(L_ERROR, "Unable to initialize browse access control list!");
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Unable to initialize browse access control list!");
else if (!strncasecmp(value, "deny", 4))
location->order_type = AUTH_ALLOW;
else if (!strncasecmp(value, "allow", 5))
location->order_type = AUTH_DENY;
else
- LogMessage(L_ERROR, "Unknown BrowseOrder value %s on line %d.",
- value, linenum);
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Unknown BrowseOrder value %s on line %d.",
+ value, linenum);
}
- else if (!strcasecmp(line, "BrowseProtocols"))
+ else if (!strcasecmp(line, "BrowseProtocols") ||
+ !strcasecmp(line, "BrowseLocalProtocols") ||
+ !strcasecmp(line, "BrowseRemoteProtocols"))
{
/*
- * "BrowseProtocol name [... name]"
+ * "BrowseProtocols name [... name]"
+ * "BrowseLocalProtocols name [... name]"
+ * "BrowseRemoteProtocols name [... name]"
*/
- BrowseProtocols = 0;
+ int protocols = parse_protocols(value);
- for (; *value;)
+ if (protocols < 0)
{
- for (valuelen = 0; value[valuelen]; valuelen ++)
- if (isspace(value[valuelen]) || value[valuelen] == ',')
- break;
-
- if (value[valuelen])
- {
- value[valuelen] = '\0';
- valuelen ++;
- }
-
- if (!strcasecmp(value, "cups"))
- BrowseProtocols |= BROWSE_CUPS;
- else if (!strcasecmp(value, "slp"))
- BrowseProtocols |= BROWSE_SLP;
- else if (!strcasecmp(value, "ldap"))
- BrowseProtocols |= BROWSE_LDAP;
- else if (!strcasecmp(value, "all"))
- BrowseProtocols |= BROWSE_ALL;
- else
- {
- LogMessage(L_ERROR, "Unknown browse protocol \"%s\" on line %d.",
- value, linenum);
- break;
- }
-
- for (value += valuelen; *value; value ++)
- if (!isspace(*value) || *value != ',')
- break;
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Unknown browse protocol \"%s\" on line %d.",
+ value, linenum);
+ break;
}
+
+ if (strcasecmp(line, "BrowseLocalProtocols"))
+ BrowseRemoteProtocols = protocols;
+ if (strcasecmp(line, "BrowseRemoteProtocols"))
+ BrowseLocalProtocols = protocols;
}
else if (!strcasecmp(line, "BrowseAllow") ||
!strcasecmp(line, "BrowseDeny"))
* BrowseDeny [From] host/ip...
*/
- if ((location = FindLocation("CUPS_INTERNAL_BROWSE_ACL")) == NULL)
- location = AddLocation("CUPS_INTERNAL_BROWSE_ACL");
+ if ((location = cupsdFindLocation("CUPS_INTERNAL_BROWSE_ACL")) == NULL)
+ location = cupsdAddLocation("CUPS_INTERNAL_BROWSE_ACL");
if (location == NULL)
- LogMessage(L_ERROR, "Unable to initialize browse access control list!");
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Unable to initialize browse access control list!");
else
{
if (!strncasecmp(value, "from ", 5))
*/
if (!strcasecmp(line, "BrowseAllow"))
- AllowIP(location, zeros, zeros);
+ cupsdAllowIP(location, zeros, zeros);
else
- DenyIP(location, zeros, zeros);
+ cupsdDenyIP(location, zeros, zeros);
}
else if (!strcasecmp(value, "none"))
{
*/
if (!strcasecmp(line, "BrowseAllow"))
- AllowIP(location, ones, zeros);
+ cupsdAllowIP(location, ones, zeros);
else
- DenyIP(location, ones, zeros);
+ cupsdDenyIP(location, ones, zeros);
}
else if (value[0] == '*' || value[0] == '.' || !isdigit(value[0]))
{
value ++;
if (!strcasecmp(line, "BrowseAllow"))
- AllowHost(location, value);
+ cupsdAllowHost(location, value);
else
- DenyHost(location, value);
+ cupsdDenyHost(location, value);
}
else
{
if (!get_addr_and_mask(value, ip, mask))
{
- LogMessage(L_ERROR, "Bad netmask value %s on line %d.",
- value, linenum);
+ cupsdLogMessage(CUPSD_LOG_ERROR, "Bad netmask value %s on line %d.",
+ value, linenum);
break;
}
if (!strcasecmp(line, "BrowseAllow"))
- AllowIP(location, ip, mask);
+ cupsdAllowIP(location, ip, mask);
else
- DenyIP(location, ip, mask);
+ cupsdDenyIP(location, ip, mask);
}
}
}
*/
if (NumRelays == 0)
- relay = malloc(sizeof(dirsvc_relay_t));
+ relay = malloc(sizeof(cupsd_dirsvc_relay_t));
else
- relay = realloc(Relays, (NumRelays + 1) * sizeof(dirsvc_relay_t));
+ relay = realloc(Relays, (NumRelays + 1) * sizeof(cupsd_dirsvc_relay_t));
if (!relay)
{
- LogMessage(L_ERROR, "Unable to allocate BrowseRelay at line %d - %s.",
- linenum, strerror(errno));
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Unable to allocate BrowseRelay at line %d - %s.",
+ linenum, strerror(errno));
continue;
}
Relays = relay;
relay += NumRelays;
- memset(relay, 0, sizeof(dirsvc_relay_t));
+ memset(relay, 0, sizeof(cupsd_dirsvc_relay_t));
if (!strncasecmp(value, "from ", 5))
{
if (!get_addr_and_mask(value, ip, mask))
{
- LogMessage(L_ERROR, "Bad netmask value %s on line %d.",
- value, linenum);
+ cupsdLogMessage(CUPSD_LOG_ERROR, "Bad netmask value %s on line %d.",
+ value, linenum);
break;
}
* Get "to" address and port...
*/
- if (get_address(value, INADDR_BROADCAST, BrowsePort, AF_INET, &(relay->to)))
+ if ((addrlist = get_address(value, BrowsePort)) != NULL)
{
- httpAddrString(&(relay->to), temp, sizeof(temp));
-
- if (relay->from.type == AUTH_IP)
- snprintf(temp2, sizeof(temp2), "%u.%u.%u.%u/%u.%u.%u.%u",
- relay->from.mask.ip.address[0],
- relay->from.mask.ip.address[1],
- relay->from.mask.ip.address[2],
- relay->from.mask.ip.address[3],
- relay->from.mask.ip.netmask[0],
- relay->from.mask.ip.netmask[1],
- relay->from.mask.ip.netmask[2],
- relay->from.mask.ip.netmask[3]);
- else
- strlcpy(temp2, relay->from.mask.name.name, sizeof(temp2));
+ /*
+ * Only IPv4 addresses are supported...
+ */
-#ifdef AF_INET6
- if (relay->to.addr.sa_family == AF_INET6)
- LogMessage(L_INFO, "Relaying from %s to %s:%d", temp, temp2,
- ntohs(relay->to.ipv6.sin6_port));
+ for (addr = addrlist; addr; addr = addr->next)
+ if (addr->addr.addr.sa_family == AF_INET)
+ break;
+
+ if (addr)
+ {
+ memcpy(&(relay->to), &(addrlist->addr), sizeof(relay->to));
+
+ httpAddrString(&(relay->to), temp, sizeof(temp));
+
+ if (relay->from.type == AUTH_IP)
+ snprintf(temp2, sizeof(temp2), "%u.%u.%u.%u/%u.%u.%u.%u",
+ relay->from.mask.ip.address[0],
+ relay->from.mask.ip.address[1],
+ relay->from.mask.ip.address[2],
+ relay->from.mask.ip.address[3],
+ relay->from.mask.ip.netmask[0],
+ relay->from.mask.ip.netmask[1],
+ relay->from.mask.ip.netmask[2],
+ relay->from.mask.ip.netmask[3]);
+ else
+ strlcpy(temp2, relay->from.mask.name.name, sizeof(temp2));
+
+ cupsdLogMessage(CUPSD_LOG_INFO, "Relaying from %s to %s:%d (IPv4)",
+ temp, temp2, ntohs(relay->to.ipv4.sin_port));
+
+ NumRelays ++;
+ }
else
-#endif /* AF_INET6 */
- LogMessage(L_INFO, "Relaying from %s to %s:%d", temp, temp2,
- ntohs(relay->to.ipv4.sin_port));
+ cupsdLogMessage(CUPSD_LOG_ERROR, "Bad relay address %s at line %d.",
+ value, linenum);
- NumRelays ++;
+ httpAddrFreeList(addrlist);
}
else
{
if (relay->from.type == AUTH_NAME)
free(relay->from.mask.name.name);
- LogMessage(L_ERROR, "Bad relay address %s at line %d.", value, linenum);
+ cupsdLogMessage(CUPSD_LOG_ERROR, "Bad relay address %s at line %d.",
+ value, linenum);
}
}
else if (!strcasecmp(line, "BrowsePoll"))
* BrowsePoll address[:port]
*/
- if (NumPolled == 0)
- poll = malloc(sizeof(dirsvc_poll_t));
- else
- poll = realloc(Polled, (NumPolled + 1) * sizeof(dirsvc_poll_t));
+ char *portname; /* Port name */
+ int portnum; /* Port number */
+ struct servent *service; /* Service */
- if (!poll)
+
+ /*
+ * Extract the port name from the address...
+ */
+
+ if ((portname = strrchr(value, ':')) != NULL && !strchr(portname, ']'))
{
- LogMessage(L_ERROR, "Unable to allocate BrowsePoll at line %d - %s.",
- linenum, strerror(errno));
- continue;
- }
+ *portname++ = '\0';
- Polled = poll;
- poll += NumPolled;
+ if (isdigit(*portname & 255))
+ portnum = atoi(portname);
+ else if ((service = getservbyname(portname, NULL)) != NULL)
+ portnum = ntohs(service->s_port);
+ else
+ {
+ cupsdLogMessage(CUPSD_LOG_ERROR, "Lookup of service \"%s\" failed!",
+ portname);
+ continue;
+ }
+ }
+ else
+ portnum = ippPort();
/*
- * Get poll address and port...
+ * Add the poll entry...
*/
- if (get_address(value, INADDR_NONE, ippPort(), AF_INET, &polladdr))
+ if (NumPolled == 0)
+ pollp = malloc(sizeof(cupsd_dirsvc_poll_t));
+ else
+ pollp = realloc(Polled, (NumPolled + 1) * sizeof(cupsd_dirsvc_poll_t));
+
+ if (!pollp)
{
- NumPolled ++;
- memset(poll, 0, sizeof(dirsvc_poll_t));
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Unable to allocate BrowsePoll at line %d - %s.",
+ linenum, strerror(errno));
+ continue;
+ }
- httpAddrString(&polladdr, poll->hostname, sizeof(poll->hostname));
+ Polled = pollp;
+ pollp += NumPolled;
-#ifdef AF_INET6
- if (polladdr.addr.sa_family == AF_INET6)
- poll->port = ntohs(polladdr.ipv6.sin6_port);
- else
-#endif /* AF_INET6 */
- poll->port = ntohs(polladdr.ipv4.sin_port);
+ NumPolled ++;
+ memset(pollp, 0, sizeof(cupsd_dirsvc_poll_t));
- LogMessage(L_INFO, "Polling %s:%d", poll->hostname, poll->port);
- }
- else
- LogMessage(L_ERROR, "Bad poll address %s at line %d.", value, linenum);
+ strlcpy(pollp->hostname, value, sizeof(pollp->hostname));
+ pollp->port = portnum;
+
+ cupsdLogMessage(CUPSD_LOG_INFO, "Polling %s:%d", pollp->hostname,
+ pollp->port);
}
else if (!strcasecmp(line, "DefaultAuthType"))
{
DefaultAuthType = AUTH_BASICDIGEST;
else
{
- LogMessage(L_WARN, "Unknown default authorization type %s on line %d.",
- value, linenum);
+ cupsdLogMessage(CUPSD_LOG_WARN,
+ "Unknown default authorization type %s on line %d.",
+ value, linenum);
return (0);
}
}
+#ifdef HAVE_SSL
+ else if (!strcasecmp(line, "DefaultEncryption"))
+ {
+ /*
+ * DefaultEncryption {Never,IfRequested,Required}
+ */
+
+ if (!value || !strcasecmp(value, "never"))
+ DefaultEncryption = HTTP_ENCRYPT_NEVER;
+ else if (!strcasecmp(value, "required"))
+ DefaultEncryption = HTTP_ENCRYPT_REQUIRED;
+ else if (!strcasecmp(value, "ifrequested"))
+ DefaultEncryption = HTTP_ENCRYPT_IF_REQUESTED;
+ else
+ {
+ cupsdLogMessage(CUPSD_LOG_WARN,
+ "Unknown default encryption %s on line %d.",
+ value, linenum);
+ return (0);
+ }
+ }
+#endif /* HAVE_SSL */
else if (!strcasecmp(line, "User"))
{
/*
* User ID to run as...
*/
- if (isdigit(value[0]))
- User = atoi(value);
- else
+ if (value && isdigit(value[0] & 255))
+ {
+ int uid = atoi(value);
+
+ if (!uid)
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Will not use User 0 as specified on line %d "
+ "for security reasons. You must use a non-"
+ "privileged account instead.",
+ linenum);
+ else
+ User = atoi(value);
+ }
+ else if (value)
{
struct passwd *p; /* Password information */
endpwent();
p = getpwnam(value);
- if (p != NULL)
- User = p->pw_uid;
+ if (p)
+ {
+ if (!p->pw_uid)
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Will not use User %s (UID=0) as specified on line "
+ "%d for security reasons. You must use a non-"
+ "privileged account instead.",
+ value, linenum);
+ else
+ User = p->pw_uid;
+ }
else
- LogMessage(L_WARN, "Unknown username \"%s\"", value);
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Unknown User \"%s\" on line %d, ignoring!",
+ value, linenum);
}
+ else
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "User directive on line %d missing the username!",
+ linenum);
}
else if (!strcasecmp(line, "Group"))
{
Group = atoi(value);
else
{
- struct group *g; /* Group information */
-
endgrent();
- g = getgrnam(value);
+ group = getgrnam(value);
- if (g != NULL)
- Group = g->gr_gid;
+ if (group != NULL)
+ Group = group->gr_gid;
else
- LogMessage(L_WARN, "Unknown groupname \"%s\"", value);
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Unknown Group \"%s\" on line %d, ignoring!",
+ value, linenum);
}
}
else if (!strcasecmp(line, "SystemGroup"))
{
/*
- * System (admin) group(s)...
+ * SystemGroup (admin) group(s)...
*/
- char *valueptr, /* Pointer into value */
- quote; /* Quote character */
-
-
- for (i = NumSystemGroups; *value && i < MAX_SYSTEM_GROUPS; i ++)
- {
- if (*value == '\'' || *value == '\"')
- {
- /*
- * Scan quoted name...
- */
-
- quote = *value++;
-
- for (valueptr = value; *valueptr; valueptr ++)
- if (*valueptr == quote)
- break;
- }
- else
- {
- /*
- * Scan space or comma-delimited name...
- */
-
- for (valueptr = value; *valueptr; valueptr ++)
- if (isspace(*valueptr) || *valueptr == ',')
- break;
- }
-
- if (*valueptr)
- *valueptr++ = '\0';
-
- SetString(SystemGroups + i, value);
-
- value = valueptr;
-
- while (*value == ',' || isspace(*value))
- value ++;
- }
-
- if (i)
- NumSystemGroups = i;
+ if (!parse_groups(value))
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Unknown SystemGroup \"%s\" on line %d, ignoring!",
+ value, linenum);
}
else if (!strcasecmp(line, "HostNameLookups"))
{
else if (!strcasecmp(value, "double"))
HostNameLookups = 2;
else
- LogMessage(L_WARN, "Unknown HostNameLookups %s on line %d.",
- value, linenum);
+ cupsdLogMessage(CUPSD_LOG_WARN, "Unknown HostNameLookups %s on line %d.",
+ value, linenum);
}
else if (!strcasecmp(line, "LogLevel"))
{
*/
if (!strcasecmp(value, "debug2"))
- LogLevel = L_DEBUG2;
+ LogLevel = CUPSD_LOG_DEBUG2;
else if (!strcasecmp(value, "debug"))
- LogLevel = L_DEBUG;
+ LogLevel = CUPSD_LOG_DEBUG;
else if (!strcasecmp(value, "info"))
- LogLevel = L_INFO;
+ LogLevel = CUPSD_LOG_INFO;
else if (!strcasecmp(value, "notice"))
- LogLevel = L_NOTICE;
+ LogLevel = CUPSD_LOG_NOTICE;
else if (!strcasecmp(value, "warn"))
- LogLevel = L_WARN;
+ LogLevel = CUPSD_LOG_WARN;
else if (!strcasecmp(value, "error"))
- LogLevel = L_ERROR;
+ LogLevel = CUPSD_LOG_ERROR;
else if (!strcasecmp(value, "crit"))
- LogLevel = L_CRIT;
+ LogLevel = CUPSD_LOG_CRIT;
else if (!strcasecmp(value, "alert"))
- LogLevel = L_ALERT;
+ LogLevel = CUPSD_LOG_ALERT;
else if (!strcasecmp(value, "emerg"))
- LogLevel = L_EMERG;
+ LogLevel = CUPSD_LOG_EMERG;
else if (!strcasecmp(value, "none"))
- LogLevel = L_NONE;
+ LogLevel = CUPSD_LOG_NONE;
else
- LogMessage(L_WARN, "Unknown LogLevel %s on line %d.", value, linenum);
+ cupsdLogMessage(CUPSD_LOG_WARN, "Unknown LogLevel %s on line %d.",
+ value, linenum);
}
else if (!strcasecmp(line, "PrintcapFormat"))
{
else if (!strcasecmp(value, "solaris"))
PrintcapFormat = PRINTCAP_SOLARIS;
else
- LogMessage(L_WARN, "Unknown PrintcapFormat %s on line %d.",
- value, linenum);
+ cupsdLogMessage(CUPSD_LOG_WARN, "Unknown PrintcapFormat %s on line %d.",
+ value, linenum);
}
else if (!strcasecmp(line, "ServerTokens"))
{
* Set the string used for the Server header...
*/
- struct utsname plat; /* Platform info */
+ struct utsname plat; /* Platform info */
uname(&plat);
if (!strcasecmp(value, "ProductOnly"))
- SetString(&ServerHeader, "CUPS");
+ cupsdSetString(&ServerHeader, "CUPS");
else if (!strcasecmp(value, "Major"))
- SetString(&ServerHeader, "CUPS/1");
+ cupsdSetString(&ServerHeader, "CUPS/1");
else if (!strcasecmp(value, "Minor"))
- SetString(&ServerHeader, "CUPS/1.1");
+ cupsdSetString(&ServerHeader, "CUPS/1.2");
else if (!strcasecmp(value, "Minimal"))
- SetString(&ServerHeader, CUPS_MINIMAL);
+ cupsdSetString(&ServerHeader, CUPS_MINIMAL);
else if (!strcasecmp(value, "OS"))
- SetStringf(&ServerHeader, CUPS_MINIMAL " (%s)", plat.sysname);
+ cupsdSetStringf(&ServerHeader, CUPS_MINIMAL " (%s)", plat.sysname);
else if (!strcasecmp(value, "Full"))
- SetStringf(&ServerHeader, CUPS_MINIMAL " (%s) IPP/1.1", plat.sysname);
+ cupsdSetStringf(&ServerHeader, CUPS_MINIMAL " (%s) IPP/1.1",
+ plat.sysname);
else if (!strcasecmp(value, "None"))
- ClearString(&ServerHeader);
+ cupsdClearString(&ServerHeader);
else
- LogMessage(L_WARN, "Unknown ServerTokens %s on line %d.", value, linenum);
+ cupsdLogMessage(CUPSD_LOG_WARN, "Unknown ServerTokens %s on line %d.",
+ value, linenum);
+ }
+ else if (!strcasecmp(line, "PassEnv"))
+ {
+ /*
+ * PassEnv variable [... variable]
+ */
+
+ for (; *value;)
+ {
+ for (valuelen = 0; value[valuelen]; valuelen ++)
+ if (isspace(value[valuelen]) || value[valuelen] == ',')
+ break;
+
+ if (value[valuelen])
+ {
+ value[valuelen] = '\0';
+ valuelen ++;
+ }
+
+ cupsdSetEnv(value, NULL);
+
+ for (value += valuelen; *value; value ++)
+ if (!isspace(*value) || *value != ',')
+ break;
+ }
+ }
+ else if (!strcasecmp(line, "SetEnv"))
+ {
+ /*
+ * SetEnv variable value
+ */
+
+ for (valueptr = value; *valueptr && !isspace(*valueptr & 255); valueptr ++);
+
+ if (*valueptr)
+ {
+ /*
+ * Found a value...
+ */
+
+ while (isspace(*valueptr & 255))
+ *valueptr++ = '\0';
+
+ cupsdSetEnv(value, valueptr);
+ }
+ else
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Missing value for SetEnv directive on line %d.",
+ linenum);
}
else
{
* Unknown directive! Output an error message and continue...
*/
- LogMessage(L_ERROR, "Unknown directive %s on line %d.", line,
- linenum);
+ cupsdLogMessage(CUPSD_LOG_ERROR, "Unknown directive %s on line %d.",
+ line, linenum);
continue;
}
switch (var->type)
{
- case VAR_INTEGER :
+ case CUPSD_VARTYPE_INTEGER :
{
- int n; /* Number */
- char *units; /* Units */
+ int n; /* Number */
+ char *units; /* Units */
n = strtol(value, &units, 0);
}
break;
- case VAR_BOOLEAN :
+ case CUPSD_VARTYPE_BOOLEAN :
if (!strcasecmp(value, "true") ||
!strcasecmp(value, "on") ||
!strcasecmp(value, "enabled") ||
!strcasecmp(value, "0"))
*((int *)var->ptr) = FALSE;
else
- LogMessage(L_ERROR, "Unknown boolean value %s on line %d.",
- value, linenum);
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Unknown boolean value %s on line %d.",
+ value, linenum);
break;
- case VAR_STRING :
- SetString((char **)var->ptr, value);
+ case CUPSD_VARTYPE_STRING :
+ cupsdSetString((char **)var->ptr, value);
break;
}
}
char *location, /* I - Location name/path */
int linenum) /* I - Current line number */
{
- location_t *loc, /* New location */
- *parent; /* Parent location */
- char line[HTTP_MAX_BUFFER], /* Line buffer */
- *value, /* Value for directive */
- *valptr; /* Pointer into value */
+ cupsd_location_t *loc, /* New location */
+ *parent; /* Parent location */
+ char line[HTTP_MAX_BUFFER],
+ /* Line buffer */
+ *value, /* Value for directive */
+ *valptr; /* Pointer into value */
- if ((parent = AddLocation(location)) == NULL)
+ if ((parent = cupsdAddLocation(location)) == NULL)
return (0);
parent->limit = AUTH_LIMIT_ALL;
{
if (!value)
{
- LogMessage(L_ERROR, "Syntax error on line %d.", linenum);
+ cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d.", linenum);
return (0);
}
- if ((loc = CopyLocation(&parent)) == NULL)
+ if ((loc = cupsdCopyLocation(&parent)) == NULL)
return (0);
loc->limit = 0;
else if (!strcmp(value, "TRACE"))
loc->limit |= AUTH_LIMIT_TRACE;
else
- LogMessage(L_WARN, "Unknown request type %s on line %d!", value,
- linenum);
+ cupsdLogMessage(CUPSD_LOG_WARN, "Unknown request type %s on line %d!",
+ value, linenum);
for (value = valptr; isspace(*value & 255); value ++);
}
loc = parent;
else if (!parse_aaa(loc, line, value, linenum))
{
- LogMessage(L_ERROR, "Unknown Location directive %s on line %d.",
- line, linenum);
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Unknown Location directive %s on line %d.",
+ line, linenum);
return (0);
}
}
- LogMessage(L_ERROR, "Unexpected end-of-file at line %d while reading location!",
- linenum);
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Unexpected end-of-file at line %d while reading location!",
+ linenum);
return (0);
}
{
int i; /* Looping var */
cupsd_policy_t *pol; /* Policy */
- location_t *op; /* Policy operation */
+ cupsd_location_t *op; /* Policy operation */
int num_ops; /* Number of IPP operations */
ipp_op_t ops[100]; /* Operations */
char line[HTTP_MAX_BUFFER],
if (!strcasecmp(line, "</Policy>"))
{
if (op)
- LogMessage(L_WARN, "Missing </Limit> before </Policy> on line %d!",
- linenum);
+ cupsdLogMessage(CUPSD_LOG_WARN,
+ "Missing </Limit> before </Policy> on line %d!",
+ linenum);
return (linenum);
}
{
if (!value)
{
- LogMessage(L_ERROR, "Syntax error on line %d.", linenum);
+ cupsdLogMessage(CUPSD_LOG_ERROR, "Syntax error on line %d.", linenum);
return (0);
}
if (!strcasecmp(value, "All"))
ops[num_ops] = IPP_ANY_OPERATION;
else if ((ops[num_ops] = ippOpValue(value)) == IPP_BAD_OPERATION)
- LogMessage(L_ERROR, "Bad IPP operation name \"%s\" on line %d!",
- value, linenum);
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Bad IPP operation name \"%s\" on line %d!",
+ value, linenum);
else
num_ops ++;
}
else
- LogMessage(L_ERROR, "Too many operations listed on line %d!",
- linenum);
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Too many operations listed on line %d!",
+ linenum);
for (value = valptr; isspace(*value & 255); value ++);
}
}
else if (!op)
{
- LogMessage(L_ERROR, "Missing <Limit ops> directive before %s on line %d.",
- line, linenum);
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Missing <Limit ops> directive before %s on line %d.",
+ line, linenum);
return (0);
}
else if (!parse_aaa(op, line, value, linenum))
{
if (op)
- LogMessage(L_ERROR, "Unknown Policy Limit directive %s on line %d.",
- line, linenum);
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Unknown Policy Limit directive %s on line %d.",
+ line, linenum);
else
- LogMessage(L_ERROR, "Unknown Policy directive %s on line %d.",
- line, linenum);
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Unknown Policy directive %s on line %d.",
+ line, linenum);
return (0);
}
}
- LogMessage(L_ERROR, "Unexpected end-of-file at line %d while reading policy \"%s\"!",
- linenum, policy);
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Unexpected end-of-file at line %d while reading policy \"%s\"!",
+ linenum, policy);
return (0);
}
-#ifdef HAVE_CDSASSL
-/*
- * 'CDSAGetServerCerts()' - Convert a keychain name into the CFArrayRef
- * required by SSLSetCertificate.
- *
- * For now we assumes that there is exactly one SecIdentity in the
- * keychain - i.e. there is exactly one matching cert/private key pair.
- * In the future we will search a keychain for a SecIdentity matching a
- * specific criteria. We also skip the operation of adding additional
- * non-signing certs from the keychain to the CFArrayRef.
- *
- * To create a self-signed certificate for testing use the certtool.
- * Executing the following as root will do it:
- *
- * certtool c c v k=CUPS
- */
-
-CFArrayRef
-CDSAGetServerCerts(void)
-{
- OSStatus err; /* Error info */
- SecKeychainRef kcRef; /* Keychain reference */
- SecIdentitySearchRef srchRef; /* Search reference */
- SecIdentityRef identity; /* Identity */
- CFArrayRef ca; /* Certificate array */
-
-
- kcRef = NULL;
- srchRef = NULL;
- identity = NULL;
- ca = NULL;
- err = SecKeychainOpen(ServerCertificate, &kcRef);
-
- if (err)
- LogMessage(L_ERROR, "Cannot open keychain \"%s\", error %d.",
- ServerCertificate, err);
- else
- {
- /*
- * Search for "any" identity matching specified key use;
- * in this app, we expect there to be exactly one.
- */
-
- err = SecIdentitySearchCreate(kcRef, CSSM_KEYUSE_SIGN, &srchRef);
-
- if (err)
- LogMessage(L_ERROR,
- "Cannot find signing key in keychain \"%s\", error %d",
- ServerCertificate, err);
- else
- {
- err = SecIdentitySearchCopyNext(srchRef, &identity);
-
- if (err)
- LogMessage(L_ERROR,
- "Cannot find signing key in keychain \"%s\", error %d",
- ServerCertificate, err);
- else
- {
- if (CFGetTypeID(identity) != SecIdentityGetTypeID())
- LogMessage(L_ERROR, "SecIdentitySearchCopyNext CFTypeID failure!");
- else
- {
- /*
- * Found one. Place it in a CFArray.
- * TBD: snag other (non-identity) certs from keychain and add them
- * to array as well.
- */
-
- ca = CFArrayCreate(NULL, (const void **)&identity, 1, NULL);
-
- if (ca == nil)
- LogMessage(L_ERROR, "CFArrayCreate error");
- }
-
- /*CFRelease(identity);*/
- }
-
- /*CFRelease(srchRef);*/
- }
-
- /*CFRelease(kcRef);*/
- }
-
- return ca;
-}
-#endif /* HAVE_CDSASSL */
-
-
/*
* End of "$Id$".
*/
projects / thirdparty / cups.git / blobdiff