system/doas
system/doas
1
0
Fork 0
mirror of https://github.com/slicer69/doas synced 2024-07-21 10:14:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'netbsd'

Browse source
This commit is contained in:
Jesse Smith 2019-06-24 19:17:59 -03:00
parent 64d27e1c8b 1f76dd9515
commit 0e23c8e1cb
2 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile
View file

@ -32,6 +32,7 @@ y.tab.o: parse.y
$(CC) $(CFLAGS) -c y.tab.c
install: all
mkdir -p $(PREFIX)/bin
cp $(BIN) $(PREFIX)/bin/
chmod 4755 $(PREFIX)/bin/$(BIN)
mkdir -p $(PREFIX)/man/man1

28
doas.c
View file

@ -28,7 +28,7 @@
#include <login_cap.h>
#include <bsd_auth.h>
*/
#ifndef linux
#ifdef __freebsd__
#include <readpassphrase.h>
#endif
#include <string.h>
@ -95,10 +95,9 @@ parseuid(const char *s, uid_t *uid)
*uid = pw->pw_uid;
return 0;
}
#ifndef linux
#ifdef __freebsd__
*uid = strtonum(s, 0, UID_MAX, &errstr);
#endif
#ifdef linux
#else
sscanf(s, "%d", uid);
#endif
if (errstr)
@ -128,10 +127,9 @@ parsegid(const char *s, gid_t *gid)
*gid = gr->gr_gid;
return 0;
}
#ifndef linux
#ifdef __freebsd__
*gid = strtonum(s, 0, GID_MAX, &errstr);
#endif
#ifdef linux
#else
sscanf(s, "%d", gid);
#endif
if (errstr)
@ -228,8 +226,20 @@ checkconfig(const char *confpath, int argc, char **argv,
uid_t uid, gid_t *groups, int ngroups, uid_t target)
{
struct rule *rule;
int status;
setresuid(uid, uid, uid);
#ifdef linux
status = setresuid(uid, uid, uid);
#elif __freebsd__
status = setresuid(uid, uid, uid);
#else
status = setreuid(uid, uid);
#endif
if (status == -1)
{
printf("doas: Unable to set UID\n");
exit(1);
}
parseconfig(confpath, 0);
if (!argc)
exit(0);
@ -510,7 +520,7 @@ main(int argc, char **argv)
}
pam_end(pamh, pam_err);
#ifndef linux
#ifndef linux
/* Re-establish stdin */
if (dup2(temp_stdin, STDIN_FILENO) == -1)
err(1, "dup2");