Move duplicated code to parse plugin debug flags to libsudo_util.

There's no need for four copies of sudo_debug_parse_flags().
This commit is contained in:
Todd C. Miller
2020-02-11 15:15:36 -07:00
parent 9e2e79b6fa
commit 0e4c3c47d1
7 changed files with 48 additions and 144 deletions

View File

@@ -409,6 +409,45 @@ sudo_debug_deregister_v1(int idx)
return 0;
}
/*
* Parse the "filename flags,..." debug_flags entry from sudo.conf
* and insert a new sudo_debug_file struct into the list.
* Returns 0 on success, 1 on parse error or -1 on malloc failure.
*/
int
sudo_debug_parse_flags_v1(struct sudo_conf_debug_file_list *debug_files,
const char *entry)
{
struct sudo_debug_file *debug_file;
const char *filename, *flags;
size_t namelen;
/* Only process new-style debug flags: filename flags,... */
filename = entry;
if (*filename != '/' || (flags = strpbrk(filename, " \t")) == NULL)
return 1;
namelen = (size_t)(flags - filename);
while (isblank((unsigned char)*flags))
flags++;
if (*flags != '\0') {
if ((debug_file = calloc(1, sizeof(*debug_file))) == NULL)
goto oom;
if ((debug_file->debug_file = strndup(filename, namelen)) == NULL)
goto oom;
if ((debug_file->debug_flags = strdup(flags)) == NULL)
goto oom;
TAILQ_INSERT_TAIL(debug_files, debug_file, entries);
}
return 0;
oom:
if (debug_file != NULL) {
free(debug_file->debug_file);
free(debug_file->debug_flags);
free(debug_file);
}
return -1;
}
int
sudo_debug_get_instance_v1(const char *program)
{