/*
- * "$Id: conf.c 5222 2006-03-03 18:57:56Z mike $"
+ * "$Id: conf.c 6930 2007-09-08 00:28:06Z mike $"
*
* Configuration routines for the Common UNIX Printing System (CUPS).
*
- * Copyright 1997-2006 by Easy Software Products, all rights reserved.
+ * Copyright 2007-2008 by Apple Inc.
+ * Copyright 1997-2007 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
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* Contents:
*
- * cupsdReadConfiguration() - Read the cupsd.conf file.
- * check_permissions() - Fix the mode and ownership of a file or
+ * cupsdCheckPermissions() - Fix the mode and ownership of a file or
* directory.
+ * cupsdReadConfiguration() - 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
#include <stdarg.h>
#include <grp.h>
#include <sys/utsname.h>
-#include <cups/dir.h>
-
-#ifdef HAVE_VSYSLOG
-# include <syslog.h>
-#endif /* HAVE_VSYSLOG */
+#include <syslog.h>
/*
{
CUPSD_VARTYPE_INTEGER, /* Integer option */
CUPSD_VARTYPE_STRING, /* String option */
- CUPSD_VARTYPE_BOOLEAN /* Boolean option */
+ CUPSD_VARTYPE_BOOLEAN, /* Boolean option */
+ CUPSD_VARTYPE_PATHNAME /* File/directory name option */
} cupsd_vartype_t;
typedef struct
* Local globals...
*/
-static cupsd_var_t variables[] =
+static const cupsd_var_t variables[] =
{
{ "AccessLog", &AccessLog, CUPSD_VARTYPE_STRING },
+#ifdef __APPLE__
+ { "AppleQuotas", &AppleQuotas, CUPSD_VARTYPE_BOOLEAN },
+#endif /* __APPLE__ */
{ "AutoPurgeJobs", &JobAutoPurge, CUPSD_VARTYPE_BOOLEAN },
{ "BrowseInterval", &BrowseInterval, CUPSD_VARTYPE_INTEGER },
#ifdef HAVE_LDAP
{ "BrowseLDAPBindDN", &BrowseLDAPBindDN, CUPSD_VARTYPE_STRING },
+ { "BrowseLDAPCACertFile", &BrowseLDAPCACertFile, CUPSD_VARTYPE_PATHNAME },
{ "BrowseLDAPDN", &BrowseLDAPDN, CUPSD_VARTYPE_STRING },
{ "BrowseLDAPPassword", &BrowseLDAPPassword, CUPSD_VARTYPE_STRING },
{ "BrowseLDAPServer", &BrowseLDAPServer, CUPSD_VARTYPE_STRING },
{ "DefaultLeaseDuration", &DefaultLeaseDuration, CUPSD_VARTYPE_INTEGER },
{ "DefaultPolicy", &DefaultPolicy, CUPSD_VARTYPE_STRING },
{ "DefaultShared", &DefaultShared, CUPSD_VARTYPE_BOOLEAN },
+ { "DirtyCleanInterval", &DirtyCleanInterval, CUPSD_VARTYPE_INTEGER },
{ "DocumentRoot", &DocumentRoot, CUPSD_VARTYPE_STRING },
{ "ErrorLog", &ErrorLog, CUPSD_VARTYPE_STRING },
+ { "ErrorPolicy", &ErrorPolicy, CUPSD_VARTYPE_STRING },
{ "FileDevice", &FileDevice, CUPSD_VARTYPE_BOOLEAN },
{ "FilterLimit", &FilterLimit, CUPSD_VARTYPE_INTEGER },
{ "FilterNice", &FilterNice, CUPSD_VARTYPE_INTEGER },
{ "FontPath", &FontPath, CUPSD_VARTYPE_STRING },
+#ifdef HAVE_GSSAPI
+ { "GSSServiceName", &GSSServiceName, CUPSD_VARTYPE_STRING },
+#endif /* HAVE_GSSAPI */
{ "HideImplicitMembers", &HideImplicitMembers, CUPSD_VARTYPE_BOOLEAN },
{ "ImplicitClasses", &ImplicitClasses, CUPSD_VARTYPE_BOOLEAN },
{ "ImplicitAnyClasses", &ImplicitAnyClasses, CUPSD_VARTYPE_BOOLEAN },
{ "JobRetryInterval", &JobRetryInterval, CUPSD_VARTYPE_INTEGER },
{ "KeepAliveTimeout", &KeepAliveTimeout, CUPSD_VARTYPE_INTEGER },
{ "KeepAlive", &KeepAlive, CUPSD_VARTYPE_BOOLEAN },
+#ifdef HAVE_LAUNCHD
+ { "LaunchdTimeout", &LaunchdTimeout, CUPSD_VARTYPE_INTEGER },
+ { "LaunchdConf", &LaunchdConf, CUPSD_VARTYPE_STRING },
+#endif /* HAVE_LAUNCHD */
{ "LimitRequestBody", &MaxRequestSize, CUPSD_VARTYPE_INTEGER },
{ "ListenBackLog", &ListenBackLog, CUPSD_VARTYPE_INTEGER },
{ "LogFilePerm", &LogFilePerm, CUPSD_VARTYPE_INTEGER },
+ { "LPDConfigFile", &LPDConfigFile, CUPSD_VARTYPE_STRING },
{ "MaxActiveJobs", &MaxActiveJobs, CUPSD_VARTYPE_INTEGER },
{ "MaxClients", &MaxClients, CUPSD_VARTYPE_INTEGER },
{ "MaxClientsPerHost", &MaxClientsPerHost, CUPSD_VARTYPE_INTEGER },
{ "RIPCache", &RIPCache, CUPSD_VARTYPE_STRING },
{ "RootCertDuration", &RootCertDuration, CUPSD_VARTYPE_INTEGER },
{ "ServerAdmin", &ServerAdmin, CUPSD_VARTYPE_STRING },
- { "ServerBin", &ServerBin, CUPSD_VARTYPE_STRING },
+ { "ServerBin", &ServerBin, CUPSD_VARTYPE_PATHNAME },
#ifdef HAVE_SSL
- { "ServerCertificate", &ServerCertificate, CUPSD_VARTYPE_STRING },
+ { "ServerCertificate", &ServerCertificate, CUPSD_VARTYPE_PATHNAME },
# if defined(HAVE_LIBSSL) || defined(HAVE_GNUTLS)
- { "ServerKey", &ServerKey, CUPSD_VARTYPE_STRING },
+ { "ServerKey", &ServerKey, CUPSD_VARTYPE_PATHNAME },
# endif /* HAVE_LIBSSL || HAVE_GNUTLS */
#endif /* HAVE_SSL */
-#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 },
+ { "ServerRoot", &ServerRoot, CUPSD_VARTYPE_PATHNAME },
+ { "SMBConfigFile", &SMBConfigFile, CUPSD_VARTYPE_STRING },
{ "StateDir", &StateDir, CUPSD_VARTYPE_STRING },
- { "TempDir", &TempDir, CUPSD_VARTYPE_STRING },
+#ifdef HAVE_AUTHORIZATION_H
+ { "SystemGroupAuthKey", &SystemGroupAuthKey, CUPSD_VARTYPE_STRING },
+#endif /* HAVE_AUTHORIZATION_H */
+ { "TempDir", &TempDir, CUPSD_VARTYPE_PATHNAME },
{ "Timeout", &Timeout, CUPSD_VARTYPE_INTEGER },
{ "UseNetworkDefault", &UseNetworkDefault, CUPSD_VARTYPE_BOOLEAN }
};
#define NUM_VARS (sizeof(variables) / sizeof(variables[0]))
-static unsigned ones[4] =
+static const unsigned ones[4] =
{
0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff
};
-static unsigned zeros[4] =
+static const unsigned zeros[4] =
{
0x00000000, 0x00000000, 0x00000000, 0x00000000
};
/*
* Local functions...
*/
-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 read_policy(cups_file_t *fp, char *name, int linenum);
+/*
+ * 'cupsdCheckPermissions()' - Fix the mode and ownership of a file or directory.
+ */
+
+int /* O - 0 on success, -1 on error, 1 on warning */
+cupsdCheckPermissions(
+ 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, -1 = create w/o logging, 0 = not */
+{
+ int dir_created = 0; /* Did we create a directory? */
+ char pathname[1024]; /* File name with prefix */
+ struct stat fileinfo; /* Stat buffer */
+
+
+ /*
+ * Prepend the given root to the filename before testing it...
+ */
+
+ if (suffix)
+ {
+ snprintf(pathname, sizeof(pathname), "%s/%s", filename, suffix);
+ filename = pathname;
+ }
+
+ /*
+ * See if we can stat the file/directory...
+ */
+
+ if (stat(filename, &fileinfo))
+ {
+ if (errno == ENOENT && create_dir)
+ {
+ if (create_dir > 0)
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "Creating missing directory \"%s\"",
+ filename);
+
+ if (mkdir(filename, mode))
+ {
+ if (create_dir > 0)
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Unable to create directory \"%s\" - %s", filename,
+ strerror(errno));
+ else
+ syslog(LOG_ERR, "Unable to create directory \"%s\" - %s", filename,
+ strerror(errno));
+
+ return (-1);
+ }
+
+ dir_created = 1;
+ }
+ else
+ return (create_dir ? -1 : 1);
+ }
+
+ /*
+ * Make sure it's a regular file...
+ */
+
+ if (!dir_created && !is_dir && !S_ISREG(fileinfo.st_mode))
+ {
+ cupsdLogMessage(CUPSD_LOG_ERROR, "\"%s\" is not a regular file!", filename);
+ return (-1);
+ }
+
+ if (!dir_created && is_dir && !S_ISDIR(fileinfo.st_mode))
+ {
+ if (create_dir >= 0)
+ cupsdLogMessage(CUPSD_LOG_ERROR, "\"%s\" is not a directory!", filename);
+ else
+ syslog(LOG_ERR, "\"%s\" is not a directory!", filename);
+
+ return (-1);
+ }
+
+ /*
+ * Fix owner, group, and mode as needed...
+ */
+
+ if (dir_created || fileinfo.st_uid != user || fileinfo.st_gid != group)
+ {
+ if (create_dir >= 0)
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "Repairing ownership of \"%s\"",
+ filename);
+
+ if (chown(filename, user, group) && !getuid())
+ {
+ if (create_dir >= 0)
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Unable to change ownership of \"%s\" - %s", filename,
+ strerror(errno));
+ else
+ syslog(LOG_ERR, "Unable to change ownership of \"%s\" - %s", filename,
+ strerror(errno));
+
+ return (1);
+ }
+ }
+
+ if (dir_created || (fileinfo.st_mode & 07777) != mode)
+ {
+ if (create_dir >= 0)
+ cupsdLogMessage(CUPSD_LOG_DEBUG, "Repairing access permissions of \"%s\"",
+ filename);
+
+ if (chmod(filename, mode))
+ {
+ if (create_dir >= 0)
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Unable to change permissions of \"%s\" - %s", filename,
+ strerror(errno));
+ else
+ syslog(LOG_ERR, "Unable to change permissions of \"%s\" - %s", filename,
+ strerror(errno));
+
+ return (1);
+ }
+ }
+
+ /*
+ * Everything is OK...
+ */
+
+ return (0);
+}
+
+
/*
* 'cupsdReadConfiguration()' - Read the cupsd.conf file.
*/
*old_requestroot; /* Old RequestRoot */
const char *tmpdir; /* TMPDIR environment variable */
struct stat tmpinfo; /* Temporary directory info */
+ cupsd_policy_t *p; /* Policy */
/*
if (NumBrowsers > 0)
{
free(Browsers);
+ Browsers = NULL;
NumBrowsers = 0;
}
if (NumRelays > 0)
{
for (i = 0; i < NumRelays; i ++)
- if (Relays[i].from.type == AUTH_NAME)
+ if (Relays[i].from.type == CUPSD_AUTH_NAME)
free(Relays[i].from.mask.name.name);
free(Relays);
* String options...
*/
- cupsdSetString(&ServerName, httpGetHostname(temp, sizeof(temp)));
+ cupsdSetString(&ServerName, httpGetHostname(NULL, temp, sizeof(temp)));
cupsdSetStringf(&ServerAdmin, "root@%s", temp);
cupsdSetString(&ServerBin, CUPS_SERVERBIN);
cupsdSetString(&RequestRoot, CUPS_REQUESTS);
cupsdSetString(&AccessLog, CUPS_LOGDIR "/access_log");
cupsdSetString(&ErrorLog, CUPS_LOGDIR "/error_log");
cupsdSetString(&PageLog, CUPS_LOGDIR "/page_log");
- cupsdSetString(&Printcap, "/etc/printcap");
+ cupsdSetString(&Printcap, CUPS_DEFAULT_PRINTCAP);
cupsdSetString(&PrintcapGUI, "/usr/bin/glpoptions");
cupsdSetString(&FontPath, CUPS_FONTPATH);
cupsdSetString(&RemoteRoot, "remroot");
- cupsdSetString(&ServerHeader, "CUPS/1.2");
+ cupsdSetString(&ServerHeader, "CUPS/1.4");
cupsdSetString(&StateDir, CUPS_STATEDIR);
+#ifdef HAVE_GSSAPI
+ cupsdSetString(&GSSServiceName, CUPS_DEFAULT_GSSSERVICENAME);
+#endif /* HAVE_GSSAPI */
+
+ if (!strcmp(CUPS_DEFAULT_PRINTCAP, "/etc/printers.conf"))
+ PrintcapFormat = PRINTCAP_SOLARIS;
+ else
+ PrintcapFormat = PRINTCAP_BSD;
strlcpy(temp, ConfigurationFile, sizeof(temp));
if ((slash = strrchr(temp, '/')) != NULL)
endpwent();
/*
- * Find the default group (nobody)...
+ * Find the default group...
*/
- group = getgrnam("nobody");
+ group = getgrnam(CUPS_DEFAULT_GROUP);
endgrent();
- if (group != NULL)
+ if (group)
Group = group->gr_gid;
else
{
/*
- * Use the (historical) NFS nobody group ID (-2 as a 16-bit twos-
- * complement number...)
+ * Fallback to group "nobody"...
*/
- Group = 65534;
+ group = getgrnam("nobody");
+ endgrent();
+
+ if (group)
+ Group = group->gr_gid;
+ else
+ {
+ /*
+ * Use the (historical) NFS nobody group ID (-2 as a 16-bit twos-
+ * complement number...)
+ */
+
+ Group = 65534;
+ }
}
/*
*/
ConfigFilePerm = CUPS_DEFAULT_CONFIG_FILE_PERM;
- DefaultAuthType = AUTH_BASIC;
+ DefaultAuthType = CUPSD_AUTH_BASIC;
#ifdef HAVE_SSL
DefaultEncryption = HTTP_ENCRYPT_REQUIRED;
#endif /* HAVE_SSL */
+ DirtyCleanInterval = 60;
JobRetryLimit = 5;
JobRetryInterval = 300;
FileDevice = FALSE;
Browsing = CUPS_DEFAULT_BROWSING;
DefaultShared = CUPS_DEFAULT_DEFAULT_SHARED;
+ cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
+ cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
+
cupsdClearString(&BrowseLocalOptions);
cupsdClearString(&BrowseRemoteOptions);
+ cupsdSetString(&ErrorPolicy, "stop-printer");
+
#ifdef HAVE_LDAP
cupsdClearString(&BrowseLDAPBindDN);
cupsdClearString(&BrowseLDAPDN);
cupsdClearString(&BrowseLDAPPassword);
cupsdClearString(&BrowseLDAPServer);
+ cupsdClearString(&BrowseLDAPCACertFile);
#endif /* HAVE_LDAP */
JobHistory = DEFAULT_HISTORY;
MaxActiveJobs = 0;
MaxJobsPerUser = 0;
MaxJobsPerPrinter = 0;
- MaxCopies = 100;
+ MaxCopies = CUPS_DEFAULT_MAX_COPIES;
cupsdDeleteAllPolicies();
cupsdClearString(&DefaultPolicy);
+#ifdef HAVE_AUTHORIZATION_H
+ cupsdClearString(&SystemGroupAuthKey);
+#endif /* HAVE_AUTHORIZATION_H */
+
MaxSubscriptions = 100;
MaxSubscriptionsPerJob = 0;
MaxSubscriptionsPerPrinter = 0;
cupsdSetString(&LaunchdConf, CUPS_DEFAULT_LAUNCHD_CONF);
#endif /* HAVE_LAUNCHD */
+#ifdef __APPLE__
+ AppleQuotas = TRUE;
+#endif /* __APPLE__ */
+
/*
* Read the configuration file...
*/
RunUser = getuid();
+ /*
+ * See if the ServerName is an IP address...
+ */
+
+ for (slash = ServerName; isdigit(*slash & 255) || *slash == '.'; slash ++);
+
+ ServerNameIsIP = !*slash;
+
/*
* Use the default system group if none was supplied in cupsd.conf...
*/
* writable by the user and group in the cupsd.conf file...
*/
- 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);
+ snprintf(temp, sizeof(temp), "%s/rss", CacheDir);
+
+ if (cupsdCheckPermissions(RequestRoot, NULL, 0710, RunUser,
+ Group, 1, 1) < 0 ||
+ cupsdCheckPermissions(CacheDir, NULL, 0775, RunUser,
+ Group, 1, 1) < 0 ||
+ cupsdCheckPermissions(temp, NULL, 0775, RunUser,
+ Group, 1, 1) < 0 ||
+ cupsdCheckPermissions(StateDir, NULL, 0755, RunUser,
+ Group, 1, 1) < 0 ||
+ cupsdCheckPermissions(StateDir, "certs", RunUser ? 0711 : 0511, User,
+ SystemGroupIDs[0], 1, 1) < 0 ||
+ cupsdCheckPermissions(ServerRoot, NULL, 0755, RunUser,
+ Group, 1, 0) < 0 ||
+ cupsdCheckPermissions(ServerRoot, "ppd", 0755, RunUser,
+ Group, 1, 1) < 0 ||
+ cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
+ Group, 1, 0) < 0 ||
+ cupsdCheckPermissions(ServerRoot, "cupsd.conf", ConfigFilePerm, RunUser,
+ Group, 0, 0) < 0 ||
+ cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
+ Group, 0, 0) < 0 ||
+ cupsdCheckPermissions(ServerRoot, "printers.conf", 0600, RunUser,
+ Group, 0, 0) < 0 ||
+ cupsdCheckPermissions(ServerRoot, "passwd.md5", 0600, User,
+ Group, 0, 0) < 0)
+ return (0);
/*
* Update TempDir to the default if it hasn't been set already...
"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)
+ {
+ cupsdLogMessage(CUPSD_LOG_INFO, "Using default TempDir of %s/tmp...",
+ RequestRoot);
cupsdSetStringf(&TempDir, "%s/tmp", RequestRoot);
+ }
}
/*
- * Make sure the request and temporary directories have the right
- * permissions...
+ * Make sure the temporary directory has the right permissions...
*/
- 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...
*/
- check_permissions(TempDir, NULL, 01770, RunUser, Group, 1, 1);
- }
-
- if (!strncmp(TempDir, RequestRoot, strlen(RequestRoot)))
- {
- /*
- * Clean out the temporary directory...
- */
-
- cups_dir_t *dir; /* Temporary directory */
- cups_dentry_t *dent; /* Directory entry */
- char tempfile[1024]; /* Temporary filename */
-
-
- if ((dir = cupsDirOpen(TempDir)) != NULL)
- {
- 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))
- cupsdLogMessage(CUPSD_LOG_ERROR,
- "Unable to remove temporary file \"%s\" - %s",
- tempfile, strerror(errno));
- else
- cupsdLogMessage(CUPSD_LOG_DEBUG, "Removed temporary file \"%s\"...",
- tempfile);
- }
-
- cupsDirClose(dir);
- }
- else
- cupsdLogMessage(CUPSD_LOG_ERROR,
- "Unable to open temporary directory \"%s\" - %s",
- TempDir, strerror(errno));
+ if (cupsdCheckPermissions(TempDir, NULL, 01770, RunUser, Group, 1, 1) < 0)
+ return (0);
}
/*
if (MaxActiveJobs > (MaxFDs / 3))
MaxActiveJobs = MaxFDs / 3;
- if (Classification && strcasecmp(Classification, "none") == 0)
+ if (Classification && !strcasecmp(Classification, "none"))
cupsdClearString(&Classification);
if (Classification)
"Allowing up to %d client connections per host.",
MaxClientsPerHost);
+ /*
+ * Make sure that BrowseTimeout is at least twice the interval...
+ */
+
+ if (BrowseTimeout < (2 * BrowseInterval) || BrowseTimeout <= 0)
+ {
+ cupsdLogMessage(CUPSD_LOG_ALERT, "Invalid BrowseTimeout value %d!",
+ BrowseTimeout);
+
+ if (BrowseInterval)
+ BrowseTimeout = BrowseInterval * 2;
+ else
+ BrowseTimeout = DEFAULT_TIMEOUT;
+
+ cupsdLogMessage(CUPSD_LOG_ALERT, "Reset BrowseTimeout to %d!",
+ BrowseTimeout);
+ }
+
/*
* Update the default policy, as needed...
*/
if (!DefaultPolicyPtr)
{
- cupsd_policy_t *p; /* New policy */
cupsd_location_t *po; /* New policy operation */
cupsdLogMessage(CUPSD_LOG_ERROR, "Default policy \"%s\" not found!",
DefaultPolicy);
+ cupsdSetString(&DefaultPolicy, "default");
+
if ((DefaultPolicyPtr = cupsdFindPolicy("default")) != NULL)
cupsdLogMessage(CUPSD_LOG_INFO,
"Using policy \"default\" as the default!");
"Renew-Subscription Cancel-Subscription "
"Get-Notifications Reprocess-Job Cancel-Current-Job "
"Suspend-Current-Job Resume-Job CUPS-Move-Job "
- "CUPS-Authenticate-Job>");
+ "CUPS-Authenticate-Job CUPS-Get-Document>");
cupsdLogMessage(CUPSD_LOG_INFO, "Order Deny,Allow");
po = cupsdAddPolicyOp(p, NULL, IPP_SEND_DOCUMENT);
- po->order_type = AUTH_ALLOW;
- po->level = AUTH_USER;
+ po->order_type = CUPSD_AUTH_ALLOW;
+ po->level = CUPSD_AUTH_USER;
cupsdAddName(po, "@OWNER");
cupsdAddName(po, "@SYSTEM");
cupsdAddPolicyOp(p, po, IPP_RESUME_JOB);
cupsdAddPolicyOp(p, po, CUPS_MOVE_JOB);
cupsdAddPolicyOp(p, po, CUPS_AUTHENTICATE_JOB);
+ cupsdAddPolicyOp(p, po, CUPS_GET_DOCUMENT);
cupsdLogMessage(CUPSD_LOG_INFO, "</Limit>");
"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");
+ cupsdLogMessage(CUPSD_LOG_INFO, "AuthType Default");
po = cupsdAddPolicyOp(p, NULL, IPP_PAUSE_PRINTER);
- po->order_type = AUTH_ALLOW;
- po->type = AUTH_BASIC;
- po->level = AUTH_USER;
+ po->order_type = CUPSD_AUTH_ALLOW;
+ po->type = CUPSD_AUTH_DEFAULT;
+ po->level = CUPSD_AUTH_USER;
cupsdAddName(po, "@SYSTEM");
cupsdLogMessage(CUPSD_LOG_INFO, "Require user @SYSTEM");
cupsdLogMessage(CUPSD_LOG_INFO, "Order Deny,Allow");
po = cupsdAddPolicyOp(p, NULL, IPP_ANY_OPERATION);
- po->order_type = AUTH_ALLOW;
+ po->order_type = CUPSD_AUTH_ALLOW;
cupsdLogMessage(CUPSD_LOG_INFO, "</Limit>");
cupsdLogMessage(CUPSD_LOG_INFO, "</Policy>");
}
cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdReadConfiguration: NumPolicies=%d",
- NumPolicies);
- for (i = 0; i < NumPolicies; i ++)
+ cupsArrayCount(Policies));
+ for (i = 0, p = (cupsd_policy_t *)cupsArrayFirst(Policies);
+ p;
+ i ++, p = (cupsd_policy_t *)cupsArrayNext(Policies))
cupsdLogMessage(CUPSD_LOG_DEBUG2,
- "cupsdReadConfiguration: Policies[%d]=\"%s\"", i,
- Policies[i]->name);
+ "cupsdReadConfiguration: Policies[%d]=\"%s\"", i, p->name);
/*
* If we are doing a full reload or the server root has changed, flush
if (NumMimeTypes)
{
for (i = 0; i < NumMimeTypes; i ++)
- _cups_sp_free(MimeTypes[i]);
+ _cupsStrFree(MimeTypes[i]);
free(MimeTypes);
}
if (!mimeType(MimeDatabase, "application", "octet-stream"))
NumMimeTypes ++;
- MimeTypes = calloc(NumMimeTypes, sizeof(const char *));
-
- for (i = 0, type = mimeFirstType(MimeDatabase);
- type;
- i ++, type = mimeNextType(MimeDatabase))
+ if ((MimeTypes = calloc(NumMimeTypes, sizeof(const char *))) == NULL)
{
- snprintf(mimetype, sizeof(mimetype), "%s/%s", type->super, type->type);
-
- MimeTypes[i] = _cups_sp_alloc(mimetype);
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Unable to allocate memory for %d MIME types!",
+ NumMimeTypes);
+ NumMimeTypes = 0;
}
+ else
+ {
+ for (i = 0, type = mimeFirstType(MimeDatabase);
+ type;
+ i ++, type = mimeNextType(MimeDatabase))
+ {
+ snprintf(mimetype, sizeof(mimetype), "%s/%s", type->super, type->type);
- if (i < NumMimeTypes)
- MimeTypes[i] = _cups_sp_alloc("application/octet-stream");
+ MimeTypes[i] = _cupsStrAlloc(mimetype);
+ }
+
+ if (i < NumMimeTypes)
+ MimeTypes[i] = _cupsStrAlloc("application/octet-stream");
+ }
if (LogLevel == CUPSD_LOG_DEBUG2)
{
cupsdLoadAllPrinters();
cupsdLoadAllClasses();
cupsdLoadRemoteCache();
- cupsdWritePrintcap();
+ cupsdMarkDirty(CUPSD_DIRTY_PRINTCAP);
cupsdCreateCommonData();
*/
cupsdUpdatePrinters();
- cupsdWritePrintcap();
+ cupsdMarkDirty(CUPSD_DIRTY_PRINTCAP);
cupsdLogMessage(CUPSD_LOG_INFO, "Partial reload complete.");
}
}
-/*
- * 'check_permissions()' - Fix the mode and ownership of a file or directory.
- */
-
-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 */
-{
- int dir_created = 0; /* Did we create a directory? */
- char pathname[1024]; /* File name with prefix */
- struct stat fileinfo; /* Stat buffer */
-
-
- /*
- * Prepend the given root to the filename before testing it...
- */
-
- if (suffix)
- {
- snprintf(pathname, sizeof(pathname), "%s/%s", filename, suffix);
- filename = pathname;
- }
-
- /*
- * See if we can stat the file/directory...
- */
-
- if (stat(filename, &fileinfo))
- {
- if (errno == ENOENT && create_dir)
- {
- cupsdLogMessage(CUPSD_LOG_ERROR, "Creating missing directory \"%s\"",
- filename);
-
- 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))
- {
- cupsdLogMessage(CUPSD_LOG_ERROR, "\"%s\" is not a regular file!", filename);
- return (-1);
- }
-
- if (!dir_created && is_dir && !S_ISDIR(fileinfo.st_mode))
- {
- cupsdLogMessage(CUPSD_LOG_ERROR, "\"%s\" is not a directory!", filename);
- return (-1);
- }
-
- /*
- * Fix owner, group, and mode as needed...
- */
-
- if (dir_created || fileinfo.st_uid != user || fileinfo.st_gid != group)
- {
- cupsdLogMessage(CUPSD_LOG_WARN, "Repairing ownership of \"%s\"", filename);
-
- if (chown(filename, user, group))
- {
- cupsdLogMessage(CUPSD_LOG_ERROR,
- "Unable to change ownership of \"%s\" - %s", filename,
- strerror(errno));
- return (-1);
- }
- }
-
- 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);
- }
- }
-
- /*
- * Everything is OK...
- */
-
- return (0);
-}
-
-
/*
* 'get_address()' - Get an address + port number from a line.
*/
const char *maskval, /* Pointer to start of mask value */
*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 */
/*
* Get the address...
*/
- memset(ip, 0, sizeof(unsigned) * 4);
+ ip[0] = ip[1] = ip[2] = ip[3] = 0x00000000;
+ mask[0] = mask[1] = mask[2] = mask[3] = 0xffffffff;
if ((maskval = strchr(value, '/')) != NULL)
maskval ++;
ptr2 = strchr(ptr2 + 1, ':'), j ++);
i = 7 - j;
+ ptr ++;
}
else if (isxdigit(*ptr & 255))
{
return (0);
if (i & 1)
- ip[i] |= ipval;
+ ip[i / 2] |= ipval;
else
- ip[i] |= ipval << 16;
+ ip[i / 2] |= ipval << 16;
}
else
return (0);
ptr ++;
}
- ipcount = i;
+ if (*ptr != ']')
+ return (0);
+
+ ptr ++;
if (*ptr && *ptr != '/')
return (0);
* Parse dotted-decimal IPv4 address...
*/
- family = AF_INET;
- ipcount = sscanf(value, "%u.%u.%u.%u", ip + 0, ip + 1, ip + 2, ip + 3);
+ unsigned val[4]; /* IPv4 address values */
- ip[3] |= ((((ip[0] << 8) | ip[1]) << 8) | ip[2]) << 8;
- ip[0] = ip[1] = ip[2] = 0;
- }
- if (*maskval)
- {
+ family = AF_INET;
+ ipcount = sscanf(value, "%u.%u.%u.%u", val + 0, val + 1, val + 2, val + 3);
+
/*
- * Get the netmask value(s)...
+ * Range check the IP numbers...
*/
- memset(mask, 0, sizeof(unsigned) * 4);
+ for (i = 0; i < ipcount; i ++)
+ if (val[i] > 255)
+ return (0);
-#ifdef AF_INET6
- if (*maskval == '[')
- {
- /*
- * Get hexadecimal mask value...
- */
+ /*
+ * Make sure the trailing values are zeroed, as some C libraries like
+ * glibc apparently like to fill the unused arguments with garbage...
+ */
- for (i = 0, ptr = maskval + 1; *ptr && i < 8; i ++)
- {
- if (*ptr == ']')
- break;
- else if (!strncmp(ptr, "::", 2))
- {
- for (ptr2 = strchr(ptr + 2, ':'), j = 0;
- ptr2;
- ptr2 = strchr(ptr2 + 1, ':'), j ++);
+ for (i = ipcount; i < 4; i ++)
+ val[i] = 0;
- i = 7 - j;
- }
- else if (isxdigit(*ptr & 255))
- {
- ipval = strtoul(ptr, (char **)&ptr, 16);
+ /*
+ * Merge everything into a 32-bit IPv4 address in ip[3]...
+ */
- if (ipval > 0xffff)
- return (0);
+ ip[3] = (((((val[0] << 8) | val[1]) << 8) | val[2]) << 8) | val[3];
- if (i & 1)
- mask[i] |= ipval;
- else
- mask[i] |= ipval << 16;
- }
- else
- return (0);
+ if (ipcount < 4)
+ mask[3] = (0xffffffff << (32 - 8 * ipcount)) & 0xffffffff;
+ }
- while (*ptr == ':')
- ptr ++;
- }
+ if (*maskval)
+ {
+ /*
+ * Get the netmask value(s)...
+ */
+
+ memset(mask, 0, sizeof(unsigned) * 4);
- if (*ptr)
- return (0);
- }
- else
-#endif /* AF_INET6 */
if (strchr(maskval, '.'))
{
/*
* Get dotted-decimal mask...
*/
+ if (family != AF_INET)
+ return (0);
+
if (sscanf(maskval, "%u.%u.%u.%u", mask + 0, mask + 1, mask + 2, mask + 3) != 4)
return (0);
#ifdef AF_INET6
if (family == AF_INET6)
{
+ if (i > 128)
+ return (0);
+
i = 128 - i;
if (i <= 96)
else
#endif /* AF_INET6 */
{
- i = 32 - i;
+ if (i > 32)
+ return (0);
mask[0] = 0xffffffff;
mask[1] = 0xffffffff;
mask[2] = 0xffffffff;
- if (i > 0)
- mask[3] = (0xffffffff << i) & 0xffffffff;
+ if (i < 32)
+ mask[3] = (0xffffffff << (32 - i)) & 0xffffffff;
else
mask[3] = 0xffffffff;
}
}
}
-#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);
cupsdLogMessage(CUPSD_LOG_DEBUG2,
"get_addr_and_mask(value=\"%s\", "
- "ip=[%08x:%08x:%08x:%08x], mask=[%08x:%08x:%08x:%08x]",
+ "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]);
*/
if (!strncasecmp(value, "deny", 4))
- loc->order_type = AUTH_ALLOW;
+ loc->order_type = CUPSD_AUTH_ALLOW;
else if (!strncasecmp(value, "allow", 5))
- loc->order_type = AUTH_DENY;
+ loc->order_type = CUPSD_AUTH_DENY;
else
{
cupsdLogMessage(CUPSD_LOG_ERROR, "Unknown Order value %s on line %d.",
else
cupsdDenyIP(loc, ones, zeros);
}
+#ifdef AF_INET6
+ else if (value[0] == '*' || value[0] == '.' ||
+ (!isdigit(value[0] & 255) && value[0] != '['))
+#else
else if (value[0] == '*' || value[0] == '.' || !isdigit(value[0] & 255))
+#endif /* AF_INET6 */
{
/*
* Host or domain name...
else if (!strcasecmp(line, "AuthType"))
{
/*
- * AuthType {none,basic,digest,basicdigest}
+ * AuthType {none,basic,digest,basicdigest,negotiate,default}
*/
if (!strcasecmp(value, "none"))
{
- loc->type = AUTH_NONE;
- loc->level = AUTH_ANON;
+ loc->type = CUPSD_AUTH_NONE;
+ loc->level = CUPSD_AUTH_ANON;
}
else if (!strcasecmp(value, "basic"))
{
- loc->type = AUTH_BASIC;
+ loc->type = CUPSD_AUTH_BASIC;
- if (loc->level == AUTH_ANON)
- loc->level = AUTH_USER;
+ if (loc->level == CUPSD_AUTH_ANON)
+ loc->level = CUPSD_AUTH_USER;
}
else if (!strcasecmp(value, "digest"))
{
- loc->type = AUTH_DIGEST;
+ loc->type = CUPSD_AUTH_DIGEST;
- if (loc->level == AUTH_ANON)
- loc->level = AUTH_USER;
+ if (loc->level == CUPSD_AUTH_ANON)
+ loc->level = CUPSD_AUTH_USER;
}
else if (!strcasecmp(value, "basicdigest"))
{
- loc->type = AUTH_BASICDIGEST;
+ loc->type = CUPSD_AUTH_BASICDIGEST;
+
+ if (loc->level == CUPSD_AUTH_ANON)
+ loc->level = CUPSD_AUTH_USER;
+ }
+ else if (!strcasecmp(value, "default"))
+ {
+ loc->type = CUPSD_AUTH_DEFAULT;
- if (loc->level == AUTH_ANON)
- loc->level = AUTH_USER;
+ if (loc->level == CUPSD_AUTH_ANON)
+ loc->level = CUPSD_AUTH_USER;
}
+#ifdef HAVE_GSSAPI
+ else if (!strcasecmp(value, "negotiate"))
+ {
+ loc->type = CUPSD_AUTH_NEGOTIATE;
+
+ if (loc->level == CUPSD_AUTH_ANON)
+ loc->level = CUPSD_AUTH_USER;
+ }
+#endif /* HAVE_GSSAPI */
else
{
cupsdLogMessage(CUPSD_LOG_WARN,
if (!strcasecmp(value, "anonymous"))
{
- loc->type = AUTH_NONE;
- loc->level = AUTH_ANON;
+ loc->type = CUPSD_AUTH_NONE;
+ loc->level = CUPSD_AUTH_ANON;
cupsdLogMessage(CUPSD_LOG_WARN,
"\"AuthClass %s\" is deprecated; consider removing "
}
else if (!strcasecmp(value, "user"))
{
- loc->level = AUTH_USER;
+ loc->level = CUPSD_AUTH_USER;
cupsdLogMessage(CUPSD_LOG_WARN,
"\"AuthClass %s\" is deprecated; consider using "
}
else if (!strcasecmp(value, "group"))
{
- loc->level = AUTH_GROUP;
+ loc->level = CUPSD_AUTH_GROUP;
cupsdLogMessage(CUPSD_LOG_WARN,
"\"AuthClass %s\" is deprecated; consider using "
- "\"Require @groupname\" on line %d.",
+ "\"Require user @groupname\" on line %d.",
value, linenum);
}
else if (!strcasecmp(value, "system"))
{
- loc->level = AUTH_GROUP;
+ loc->level = CUPSD_AUTH_GROUP;
cupsdAddName(loc, "@SYSTEM");
cupsdLogMessage(CUPSD_LOG_WARN,
"\"AuthClass %s\" is deprecated; consider using "
- "\"Require @SYSTEM\" on line %d.",
+ "\"Require user @SYSTEM\" on line %d.",
value, linenum);
}
else
cupsdLogMessage(CUPSD_LOG_WARN,
"\"AuthGroupName %s\" directive is deprecated; consider "
- "using \"Require @%s\" on line %d.",
+ "using \"Require user @%s\" on line %d.",
value, value, linenum);
}
else if (!strcasecmp(line, "Require"))
if (!strcasecmp(value, "valid-user") ||
!strcasecmp(value, "user"))
- loc->level = AUTH_USER;
+ loc->level = CUPSD_AUTH_USER;
else if (!strcasecmp(value, "group"))
- loc->level = AUTH_GROUP;
+ loc->level = CUPSD_AUTH_GROUP;
else
{
cupsdLogMessage(CUPSD_LOG_WARN, "Unknown Require type %s on line %d.",
while (isspace(*value & 255))
value ++;
+#ifdef HAVE_AUTHORIZATION_H
+ if (!strncmp(value, "@AUTHKEY(", 9))
+ {
+ /*
+ * Grab "@AUTHKEY(name)" value...
+ */
+
+ for (valptr = value + 9; *valptr != ')' && *valptr; valptr ++);
+
+ if (*valptr)
+ *valptr++ = '\0';
+ }
+ else
+#endif /* HAVE_AUTHORIZATION_H */
if (*value == '\"' || *value == '\'')
{
/*
else if (!strcasecmp(line, "Satisfy"))
{
if (!strcasecmp(value, "all"))
- loc->satisfy = AUTH_SATISFY_ALL;
+ loc->satisfy = CUPSD_AUTH_SATISFY_ALL;
else if (!strcasecmp(value, "any"))
- loc->satisfy = AUTH_SATISFY_ANY;
+ loc->satisfy = CUPSD_AUTH_SATISFY_ANY;
else
{
cupsdLogMessage(CUPSD_LOG_WARN, "Unknown Satisfy value %s on line %d.",
*valend; /* End of value */
+ /*
+ * Empty protocol line yields NULL pointer...
+ */
+
+ if (!s)
+ return (0);
+
/*
* Loop through the value string,...
*/
protocols |= BROWSE_SLP;
else if (!strcasecmp(valstart, "ldap"))
protocols |= BROWSE_LDAP;
- else if (!strcasecmp(valstart, "dnssd") || !strcasecmp(valstart, "bonjour"))
+ else if (!strcasecmp(valstart, "dnssd") ||
+ !strcasecmp(valstart, "dns-sd") ||
+ !strcasecmp(valstart, "bonjour"))
protocols |= BROWSE_DNSSD;
+ else if (!strcasecmp(valstart, "lpd"))
+ protocols |= BROWSE_LPD;
+ else if (!strcasecmp(valstart, "smb"))
+ protocols |= BROWSE_SMB;
else if (!strcasecmp(valstart, "all"))
protocols |= BROWSE_ALL;
- else
- return (-1);
+ else if (strcasecmp(valstart, "none"))
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Unknown browse protocol \"%s\" ignored!", valstart);
for (valstart = valend; *valstart; valstart ++)
if (!isspace(*valstart & 255) || *valstart != ',')
*value, /* Pointer to value */
*valueptr; /* Pointer into value */
int valuelen; /* Length of value */
- cupsd_var_t *var; /* Current variable */
+ cupsd_var_t const *var; /* Current variable */
http_addrlist_t *addrlist, /* Address list */
*addr; /* Current address */
unsigned ip[4], /* Address value */
cupsdLogMessage(CUPSD_LOG_ERROR,
"Unable to initialize browse access control list!");
else if (!strncasecmp(value, "deny", 4))
- location->order_type = AUTH_ALLOW;
+ location->order_type = CUPSD_AUTH_ALLOW;
else if (!strncasecmp(value, "allow", 5))
- location->order_type = AUTH_DENY;
+ location->order_type = CUPSD_AUTH_DENY;
else
cupsdLogMessage(CUPSD_LOG_ERROR,
"Unknown BrowseOrder value %s on line %d.",
else
cupsdDenyIP(location, ones, zeros);
}
- else if (value[0] == '*' || value[0] == '.' || !isdigit(value[0]))
+#ifdef AF_INET6
+ else if (value[0] == '*' || value[0] == '.' ||
+ (!isdigit(value[0] & 255) && value[0] != '['))
+#else
+ else if (value[0] == '*' || value[0] == '.' || !isdigit(value[0] & 255))
+#endif /* AF_INET6 */
{
/*
* Host or domain name...
* nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm
*/
- if (value[0] == '*' || value[0] == '.' || !isdigit(value[0]))
+#ifdef AF_INET6
+ if (value[0] == '*' || value[0] == '.' ||
+ (!isdigit(value[0] & 255) && value[0] != '['))
+#else
+ if (value[0] == '*' || value[0] == '.' || !isdigit(value[0] & 255))
+#endif /* AF_INET6 */
{
/*
* Host or domain name...
if ((ptr = strchr(temp, ' ')) != NULL)
*ptr = '\0';
- relay->from.type = AUTH_NAME;
- relay->from.mask.name.name = strdup(temp);
+ relay->from.type = CUPSD_AUTH_NAME;
+
+ if ((relay->from.mask.name.name = strdup(temp)) == NULL)
+ {
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Unable to allocate BrowseRelay name at line %d - %s.",
+ linenum, strerror(errno));
+ continue;
+ }
+
relay->from.mask.name.length = strlen(temp);
}
else
break;
}
- relay->from.type = AUTH_IP;
+ relay->from.type = CUPSD_AUTH_IP;
memcpy(relay->from.mask.ip.address, ip,
sizeof(relay->from.mask.ip.address));
memcpy(relay->from.mask.ip.netmask, mask,
httpAddrString(&(relay->to), temp, sizeof(temp));
- if (relay->from.type == AUTH_IP)
+ if (relay->from.type == CUPSD_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]);
+ relay->from.mask.ip.address[0] >> 24,
+ (relay->from.mask.ip.address[0] >> 16) & 255,
+ (relay->from.mask.ip.address[0] >> 8) & 255,
+ relay->from.mask.ip.address[0] & 255,
+ relay->from.mask.ip.netmask[0] >> 24,
+ (relay->from.mask.ip.netmask[0] >> 16) & 255,
+ (relay->from.mask.ip.netmask[0] >> 8) & 255,
+ relay->from.mask.ip.netmask[0] & 255);
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));
+ temp2, temp, ntohs(relay->to.ipv4.sin_port));
NumRelays ++;
}
}
else
{
- if (relay->from.type == AUTH_NAME)
+ if (relay->from.type == CUPSD_AUTH_NAME)
free(relay->from.mask.name.name);
cupsdLogMessage(CUPSD_LOG_ERROR, "Bad relay address %s at line %d.",
else if (!strcasecmp(line, "DefaultAuthType"))
{
/*
- * DefaultAuthType {basic,digest,basicdigest}
+ * DefaultAuthType {basic,digest,basicdigest,negotiate}
*/
- if (!strcasecmp(value, "basic"))
- DefaultAuthType = AUTH_BASIC;
+ if (!strcasecmp(value, "none"))
+ DefaultAuthType = CUPSD_AUTH_NONE;
+ else if (!strcasecmp(value, "basic"))
+ DefaultAuthType = CUPSD_AUTH_BASIC;
else if (!strcasecmp(value, "digest"))
- DefaultAuthType = AUTH_DIGEST;
+ DefaultAuthType = CUPSD_AUTH_DIGEST;
else if (!strcasecmp(value, "basicdigest"))
- DefaultAuthType = AUTH_BASICDIGEST;
+ DefaultAuthType = CUPSD_AUTH_BASICDIGEST;
+#ifdef HAVE_GSSAPI
+ else if (!strcasecmp(value, "negotiate"))
+ DefaultAuthType = CUPSD_AUTH_NEGOTIATE;
+#endif /* HAVE_GSSAPI */
else
{
cupsdLogMessage(CUPSD_LOG_WARN,
}
}
#endif /* HAVE_SSL */
+#ifdef HAVE_GSSAPI
+ else if (!strcasecmp(line, "Krb5Keytab"))
+ {
+ cupsdSetStringf(&Krb5Keytab, "KRB5_KTNAME=%s", value);
+ putenv(Krb5Keytab);
+
+# ifdef HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY
+ gsskrb5_register_acceptor_identity(value);
+# else
+ cupsdSetEnv("KRB5_KTNAME", value);
+# endif /* HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY */
+ }
+#endif /* HAVE_GSSAPI */
else if (!strcasecmp(line, "User"))
{
/*
else if (!strcasecmp(value, "Major"))
cupsdSetString(&ServerHeader, "CUPS/1");
else if (!strcasecmp(value, "Minor"))
- cupsdSetString(&ServerHeader, "CUPS/1.2");
+ cupsdSetString(&ServerHeader, "CUPS/1.4");
else if (!strcasecmp(value, "Minimal"))
cupsdSetString(&ServerHeader, CUPS_MINIMAL);
else if (!strcasecmp(value, "OS"))
switch (var->type)
{
case CUPSD_VARTYPE_INTEGER :
+ if (!value)
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Missing integer value for %s on line %d!",
+ line, linenum);
+ else
{
int n; /* Number */
char *units; /* Units */
n *= 262144;
}
- *((int *)var->ptr) = n;
+ if (n < 0)
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Bad negative integer value for %s on line %d!",
+ line, linenum);
+ else
+ *((int *)var->ptr) = n;
}
break;
case CUPSD_VARTYPE_BOOLEAN :
- if (!strcasecmp(value, "true") ||
- !strcasecmp(value, "on") ||
- !strcasecmp(value, "enabled") ||
- !strcasecmp(value, "yes") ||
- atoi(value) != 0)
+ if (!value)
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Missing boolean value for %s on line %d!",
+ line, linenum);
+ else if (!strcasecmp(value, "true") ||
+ !strcasecmp(value, "on") ||
+ !strcasecmp(value, "enabled") ||
+ !strcasecmp(value, "yes") ||
+ atoi(value) != 0)
*((int *)var->ptr) = TRUE;
else if (!strcasecmp(value, "false") ||
!strcasecmp(value, "off") ||
value, linenum);
break;
+ case CUPSD_VARTYPE_PATHNAME :
+ if (value[0] == '/')
+ strlcpy(temp, value, sizeof(temp));
+ else
+ snprintf(temp, sizeof(temp), "%s/%s", ServerRoot, value);
+
+ if (access(temp, 0))
+ {
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "File or directory for \"%s %s\" on line %d "
+ "does not exist!", line, value, linenum);
+ break;
+ }
+
case CUPSD_VARTYPE_STRING :
cupsdSetString((char **)var->ptr, value);
break;
if ((parent = cupsdAddLocation(location)) == NULL)
return (0);
- parent->limit = AUTH_LIMIT_ALL;
+ parent->limit = CUPSD_AUTH_LIMIT_ALL;
loc = parent;
while (cupsFileGetConf(fp, line, sizeof(line), &value, &linenum))
*valptr++ = '\0';
if (!strcmp(value, "ALL"))
- loc->limit = AUTH_LIMIT_ALL;
+ loc->limit = CUPSD_AUTH_LIMIT_ALL;
else if (!strcmp(value, "GET"))
- loc->limit |= AUTH_LIMIT_GET;
+ loc->limit |= CUPSD_AUTH_LIMIT_GET;
else if (!strcmp(value, "HEAD"))
- loc->limit |= AUTH_LIMIT_HEAD;
+ loc->limit |= CUPSD_AUTH_LIMIT_HEAD;
else if (!strcmp(value, "OPTIONS"))
- loc->limit |= AUTH_LIMIT_OPTIONS;
+ loc->limit |= CUPSD_AUTH_LIMIT_OPTIONS;
else if (!strcmp(value, "POST"))
- loc->limit |= AUTH_LIMIT_POST;
+ loc->limit |= CUPSD_AUTH_LIMIT_POST;
else if (!strcmp(value, "PUT"))
- loc->limit |= AUTH_LIMIT_PUT;
+ loc->limit |= CUPSD_AUTH_LIMIT_PUT;
else if (!strcmp(value, "TRACE"))
- loc->limit |= AUTH_LIMIT_TRACE;
+ loc->limit |= CUPSD_AUTH_LIMIT_TRACE;
else
cupsdLogMessage(CUPSD_LOG_WARN, "Unknown request type %s on line %d!",
value, linenum);
}
if (!strcasecmp(line, "<LimitExcept"))
- loc->limit = AUTH_LIMIT_ALL ^ loc->limit;
+ loc->limit = CUPSD_AUTH_LIMIT_ALL ^ loc->limit;
parent->limit &= ~loc->limit;
}
- else if (!strcasecmp(line, "</Limit>"))
+ else if (!strcasecmp(line, "</Limit>") ||
+ !strcasecmp(line, "</LimitExcept>"))
loc = parent;
else if (!parse_aaa(loc, line, value, linenum))
{
"Missing </Limit> before </Policy> on line %d!",
linenum);
+ /*
+ * Verify that we have an explicit policy for CUPS-Get-Document
+ * (ensures that upgrades do not introduce new security issues...)
+ */
+
+ if ((op = cupsdFindPolicyOp(pol, CUPS_GET_DOCUMENT)) == NULL ||
+ op->op == IPP_ANY_OPERATION)
+ {
+ if ((op = cupsdFindPolicyOp(pol, IPP_SEND_DOCUMENT)) != NULL &&
+ op->op != IPP_ANY_OPERATION)
+ {
+ /*
+ * Add a new limit for CUPS-Get-Document using the Send-Document
+ * limit as a template...
+ */
+
+ cupsdLogMessage(CUPSD_LOG_WARN,
+ "No limit for CUPS-Get-Document defined in policy %s "
+ "- using Send-Document's policy", pol->name);
+
+ cupsdAddPolicyOp(pol, op, CUPS_GET_DOCUMENT);
+ }
+ }
+
return (linenum);
}
else if (!strcasecmp(line, "<Limit") && !op)
/*
- * End of "$Id: conf.c 5222 2006-03-03 18:57:56Z mike $".
+ * End of "$Id: conf.c 6930 2007-09-08 00:28:06Z mike $".
*/