More useful exit codes:
* 0 - parsed OK and command matched. * 1 - parse error * 2 - command not matched * 3 - command denied
This commit is contained in:
@@ -245,10 +245,12 @@ main(int argc, char *argv[])
|
|||||||
/* Allocate space for data structures in the parser. */
|
/* Allocate space for data structures in the parser. */
|
||||||
init_parser("sudoers", 0);
|
init_parser("sudoers", 0);
|
||||||
|
|
||||||
if (yyparse() != 0 || parse_error)
|
if (yyparse() != 0 || parse_error) {
|
||||||
|
parse_error = TRUE;
|
||||||
(void) fputs("Does not parse", stdout);
|
(void) fputs("Does not parse", stdout);
|
||||||
else
|
} else {
|
||||||
(void) fputs("Parses OK", stdout);
|
(void) fputs("Parses OK", stdout);
|
||||||
|
}
|
||||||
|
|
||||||
if (!update_defaults(SETDEF_ALL))
|
if (!update_defaults(SETDEF_ALL))
|
||||||
(void) fputs(" (problem with defaults entries)", stdout);
|
(void) fputs(" (problem with defaults entries)", stdout);
|
||||||
@@ -273,7 +275,7 @@ main(int argc, char *argv[])
|
|||||||
(void) putchar('\n');
|
(void) putchar('\n');
|
||||||
dump_sudoers();
|
dump_sudoers();
|
||||||
if (argc < 2)
|
if (argc < 2)
|
||||||
exit(0);
|
exit(parse_error ? 1 : 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* This loop must match the one in sudoers_lookup() */
|
/* This loop must match the one in sudoers_lookup() */
|
||||||
@@ -306,7 +308,16 @@ main(int argc, char *argv[])
|
|||||||
printf("\nCommand %s\n", matched == ALLOW ? "allowed" :
|
printf("\nCommand %s\n", matched == ALLOW ? "allowed" :
|
||||||
matched == DENY ? "denied" : "unmatched");
|
matched == DENY ? "denied" : "unmatched");
|
||||||
|
|
||||||
exit(0);
|
/*
|
||||||
|
* Exit codes:
|
||||||
|
* 0 - parsed OK and command matched.
|
||||||
|
* 1 - parse error
|
||||||
|
* 2 - command not matched
|
||||||
|
* 3 - command denied
|
||||||
|
*/
|
||||||
|
if (parse_error)
|
||||||
|
exit(1);
|
||||||
|
exit(matched == ALLOW ? 0 : matched + 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
Reference in New Issue
Block a user