-/* $OpenBSD: doas.c,v 1.24 2015/07/26 19:14:46 tedu Exp $ */
+/* $OpenBSD: doas.c,v 1.29 2015/07/28 14:08:52 zhuk Exp $ */
/*
* Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
*
static void __dead
usage(void)
{
- fprintf(stderr, "usage: doas [-s] [-C config] [-u user] command [args]\n");
+ fprintf(stderr, "usage: doas [-ns] [-C config] [-u user] command [args]\n");
exit(1);
}
exit(1);
}
+/*
+ * Copy to envp environment variables from oldenvp which names are
+ * in safeset.
+ */
static int
copyenvhelper(const char **oldenvp, const char **safeset, int nsafe,
char **envp, int ei)
int nsafe, nbad;
int nextras = 0;
+ /* if there was no envvar whitelist, pass all except badset ones */
nbad = arraylen(badset);
if ((rule->options & KEEPENV) && !rule->envlist) {
- size_t i, ii;
+ size_t iold, inew;
size_t oldlen = arraylen(oldenvp);
envp = reallocarray(NULL, oldlen + 1, sizeof(char *));
if (!envp)
err(1, "reallocarray");
- for (ii = i = 0; i < oldlen; i++) {
- size_t j;
- for (j = 0; j < nbad; j++) {
- size_t len = strlen(badset[j]);
- if (strncmp(oldenvp[i], badset[j], len) == 0 &&
- oldenvp[i][len] == '=') {
+ for (inew = iold = 0; iold < oldlen; iold++) {
+ size_t ibad;
+ for (ibad = 0; ibad < nbad; ibad++) {
+ size_t len = strlen(badset[ibad]);
+ if (strncmp(oldenvp[iold], badset[ibad], len) == 0 &&
+ oldenvp[iold][len] == '=') {
break;
}
}
- if (j == nbad) {
- if (!(envp[ii] = strdup(oldenvp[i])))
+ if (ibad == nbad) {
+ if (!(envp[inew] = strdup(oldenvp[iold])))
err(1, "strdup");
- ii++;
+ inew++;
}
}
- envp[ii] = NULL;
+ envp[inew] = NULL;
return envp;
}
nsafe = arraylen(safeset);
if ((extra = rule->envlist)) {
- size_t i;
+ size_t isafe;
nextras = arraylen(extra);
- for (i = 0; i < nsafe; i++) {
- size_t j;
- for (j = 0; j < nextras; j++) {
- if (strcmp(extra[j], safeset[i]) == 0) {
- extra[j--] = extra[nextras--];
+ for (isafe = 0; isafe < nsafe; isafe++) {
+ size_t iextras;
+ for (iextras = 0; iextras < nextras; iextras++) {
+ if (strcmp(extra[iextras], safeset[isafe]) == 0) {
+ nextras--;
+ extra[iextras] = extra[nextras];
extra[nextras] = NULL;
+ iextras--;
}
}
}
exit(1);
}
-static int
+static void __dead
checkconfig(const char *confpath, int argc, char **argv,
uid_t uid, gid_t *groups, int ngroups, uid_t target)
{
int ngroups;
int i, ch;
int sflag = 0;
+ int nflag = 0;
- while ((ch = getopt(argc, argv, "C:su:")) != -1) {
+ uid = getuid();
+ while ((ch = getopt(argc, argv, "C:nsu:")) != -1) {
switch (ch) {
case 'C':
confpath = optarg;
if (parseuid(optarg, &target) != 0)
errx(1, "unknown user");
break;
+ case 'n':
+ nflag = 1;
+ break;
case 's':
sflag = 1;
break;
}
if (!(rule->options & NOPASS)) {
+ if (nflag)
+ errx(1, "Authorization required");
if (!auth_userokay(myname, NULL, NULL, NULL)) {
syslog(LOG_AUTHPRIV | LOG_NOTICE,
"failed password for %s", myname);