X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=doas.c;h=008132b3a6e0d8c485f040049a973f54cec18040;hb=25b1f36e92c75983b5c02380836db8b97eb7237f;hp=cbc365796d4e75373fae457b08b20930bfca5074;hpb=74449f015ff7a72300be5a27680d2c70af309328;p=opendoas.git diff --git a/doas.c b/doas.c index cbc3657..008132b 100644 --- a/doas.c +++ b/doas.c @@ -205,6 +205,8 @@ mygetpwuid_r(uid_t uid, struct passwd *pwd, struct passwd **result) static long pwsz = 0; size_t buflen; + *result = NULL; + if (pwsz == 0) pwsz = sysconf(_SC_GETPW_R_SIZE_MAX); @@ -323,7 +325,7 @@ main(int argc, char **argv) if (geteuid()) errx(1, "not installed setuid"); - parseconfig("/etc/doas.conf", 1); + parseconfig(DOAS_CONF, 1); /* cmdline is used only for logging, no need to abort on truncate */ (void)strlcpy(cmdline, argv[0], sizeof(cmdline));