X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=scheduler%2Fconf.c;h=28cfbd24c481be3df147561ea3bbbdd011890eca;hb=6961465fb290ecc4f99b4e3a8225d594782d15f5;hp=5492eb5d71e755efe2f65069cddcf91e1ceb549b;hpb=cb7f98ee7f57af247aacb94977c8f744a1d02eca;p=thirdparty%2Fcups.git diff --git a/scheduler/conf.c b/scheduler/conf.c index 5492eb5d7..28cfbd24c 100644 --- a/scheduler/conf.c +++ b/scheduler/conf.c @@ -704,7 +704,7 @@ cupsdReadConfiguration(void) AccessLogLevel = CUPSD_ACCESSLOG_ACTIONS; ConfigFilePerm = CUPS_DEFAULT_CONFIG_FILE_PERM; FatalErrors = parse_fatal_errors(CUPS_DEFAULT_FATAL_ERRORS); - default_auth_type = CUPSD_AUTH_BASIC; + default_auth_type = CUPSD_AUTH_BASIC; #ifdef HAVE_SSL DefaultEncryption = HTTP_ENCRYPT_REQUIRED; SSLOptions = CUPSD_SSL_NONE; @@ -766,7 +766,7 @@ cupsdReadConfiguration(void) cupsdClearString(&DefaultPolicy); #ifdef HAVE_AUTHORIZATION_H - cupsdClearString(&SystemGroupAuthKey); + cupsdSetString(&SystemGroupAuthKey, CUPS_DEFAULT_SYSTEM_AUTHKEY); #endif /* HAVE_AUTHORIZATION_H */ MaxSubscriptions = 100; @@ -3349,7 +3349,7 @@ read_cupsd_conf(cups_file_t *fp) /* I - File to read from */ !_cups_strcasecmp(line, "TempDir") || !_cups_strcasecmp(line, "User")) { - cupsdLogMessage(CUPSD_LOG_WARN, + cupsdLogMessage(CUPSD_LOG_INFO, "Please move \"%s%s%s\" on line %d of %s to the %s file; " "this will become an error in a future release.", line, value ? " " : "", value ? value : "", linenum,