system/doas
system/doas
1
0
Fork 0
mirror of https://github.com/slicer69/doas synced 2024-10-02 22:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update doas.c

Browse source
This commit is contained in:
helmat 2020-06-21 15:29:37 +02:00 committed by GitHub
parent 0a04433044
commit 93a56843e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
doas.c
View file

@ -67,7 +67,7 @@ static struct pam_conv pamc = { pam_tty_conv, NULL };
static void
usage(void)
{
fprintf(stderr, "usage: doas [-ns] [-a style] [-C config] [-u user]"
fprintf(stderr, "usage: doas [-nSs] [-a style] [-C config] [-u user]"
" command [args]\n");
exit(1);
}
@ -286,6 +286,7 @@ main(int argc, char **argv)
gid_t groups[NGROUPS_MAX + 1];
int ngroups;
int i, ch;
int Sflag = 0;
int sflag = 0;
int nflag = 0;
char cwdpath[PATH_MAX];
@ -301,7 +302,7 @@ main(int argc, char **argv)
uid = getuid();
while ((ch = getopt(argc, argv, "a:C:nsu:")) != -1) {
while ((ch = getopt(argc, argv, "a:C:nSsu:")) != -1) {
switch (ch) {
#if defined(USE_BSD_AUTH)
case 'a':
@ -324,6 +325,8 @@ main(int argc, char **argv)
case 'n':
nflag = 1;
break;
case 'S':
Sflag = 1;
case 's':
sflag = 1;
break;
@ -393,6 +396,10 @@ main(int argc, char **argv)
errc(1, EPERM, NULL);
}
if (Sflag) {
argv[0] = "-doas";
}
if (!(rule->options & NOPASS)) {
if (nflag)
errx(1, "Authorization required");