Skip to content

Fix: Add unknown value for FatalErrors directive(#1446) #1474

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dhruvDev23 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: Add unknown value for FatalErrors directive(#1446) #1474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions scheduler/conf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2586,6 +2586,10 @@ parse_fatal_errors(const char *s) /* I - FatalErrors string */
fatal |= CUPSD_FATAL_PERMISSIONS;
else if (!_cups_strcasecmp(valstart, "-permissions"))
fatal &= ~CUPSD_FATAL_PERMISSIONS;
else if (!_cups_strcasecmp(valstart, "unknown"))
fatal |= CUPSD_FATAL_UNKNOWN;
else if (!_cups_strcasecmp(valstart, "-unknown"))
fatal &= ~CUPSD_FATAL_UNKNOWN;
else if (_cups_strcasecmp(valstart, "none"))
cupsdLogMessage(CUPSD_LOG_ERROR,
"Unknown FatalErrors kind \"%s\" ignored.", valstart);
Expand Down Expand Up @@ -2780,7 +2784,8 @@ parse_variable(

cupsdLogMessage(CUPSD_LOG_ERROR, "Unknown directive %s on line %d of %s.",
line, linenum, filename);

if (FatalErrors & CUPSD_FATAL_UNKNOWN)
return (0);
return (1);
}

Expand Down Expand Up @@ -3525,7 +3530,7 @@ read_cupsd_conf(cups_file_t *fp) /* I - File to read from */
}
else if (!parse_variable(ConfigurationFile, linenum, line, value,
sizeof(cupsd_vars) / sizeof(cupsd_vars[0]), cupsd_vars) &&
(FatalErrors & CUPSD_FATAL_CONFIG))
(FatalErrors & (CUPSD_FATAL_CONFIG | CUPSD_FATAL_UNKNOWN)))
return (0);
}

Expand Down Expand Up @@ -3925,7 +3930,7 @@ read_cups_files_conf(cups_file_t *fp) /* I - File to read from */
else if (!parse_variable(CupsFilesFile, linenum, line, value,
sizeof(cupsfiles_vars) / sizeof(cupsfiles_vars[0]),
cupsfiles_vars) &&
(FatalErrors & CUPSD_FATAL_CONFIG))
(FatalErrors & (CUPSD_FATAL_CONFIG | CUPSD_FATAL_UNKNOWN)))
return (0);
}

Expand Down
1 change: 1 addition & 0 deletions scheduler/conf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ typedef enum
#define CUPSD_FATAL_LISTEN 4 /* Listen/Port bind errors are fatal */
#define CUPSD_FATAL_LOG 8 /* Log file errors are fatal */
#define CUPSD_FATAL_PERMISSIONS 16 /* File permission errors are fatal */
#define CUPSD_FATAL_UNKNOWN 32 /* Unknown directive errors are fatal */
#define CUPSD_FATAL_ALL ~0 /* All errors are fatal */


Expand Down
Loading