-/* $OpenBSD: doas.c,v 1.22 2015/07/26 17:24:02 zhuk Exp $ */
+/* $OpenBSD: doas.c,v 1.23 2015/07/26 19:08:17 zhuk Exp $ */
/*
* Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
*
static int
checkconfig(const char *confpath, int argc, char **argv,
- uid_t uid, gid_t *groups, int ngroups, uid_t target) {
+ uid_t uid, gid_t *groups, int ngroups, uid_t target)
+{
struct rule *rule;
setresuid(uid, uid, uid);
if (permit(uid, groups, ngroups, &rule, target, argv[0],
(const char **)argv + 1)) {
printf("permit%s\n", (rule->options & NOPASS) ? " nopass" : "");
- return 1;
+ exit(0);
} else {
printf("deny\n");
- return 0;
+ exit(1);
}
}
argc = 1;
}
- if (confpath)
- exit(!checkconfig(confpath, argc, argv, uid, groups, ngroups,
- target));
+ if (confpath) {
+ checkconfig(confpath, argc, argv, uid, groups, ngroups,
+ target);
+ exit(1); /* fail safe */
+ }
+
parseconfig("/etc/doas.conf", 1);
/* cmdline is used only for logging, no need to abort on truncate */