#include <errno.h>
#include <fcntl.h>
-#include "includes.h"
+#include "openbsd.h"
#include "doas.h"
static void __dead
permit(uid_t uid, gid_t *groups, int ngroups, const struct rule **lastr,
uid_t target, const char *cmd, const char **cmdargs)
{
- int i;
+ size_t i;
*lastr = NULL;
for (i = 0; i < nrules; i++) {
#if defined(USE_SHADOW)
if (!(rule->options & NOPASS)) {
if (nflag)
- errx(1, "Authorization required");
+ errx(1, "Authentication required");
shadowauth(mypw->pw_name, rule->options & PERSIST);
}
/* no authentication provider, only allow NOPASS rules */
(void) nflag;
if (!(rule->options & NOPASS))
- errx(1, "Authorization required");
+ errx(1, "Authentication required");
#endif
if ((p = getenv("PATH")) != NULL)
#ifdef HAVE_LOGIN_CAP_H
if (setusercontext(NULL, targpw, target, LOGIN_SETGROUP |
+ LOGIN_SETPATH |
LOGIN_SETPRIORITY | LOGIN_SETRESOURCES | LOGIN_SETUMASK |
LOGIN_SETUSER) != 0)
errx(1, "failed to set user context for target");
err(1, "initgroups");
if (setresuid(target, target, target) != 0)
err(1, "setresuid");
+ if (setenv("PATH", safepath, 1) == -1)
+ err(1, "failed to set PATH '%s'", safepath);
#endif
if (getcwd(cwdpath, sizeof(cwdpath)) == NULL)