xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

auth/as: simplify further

Browse source
This commit is contained in:
cinap_lenrek 2016-12-22 21:55:56 +01:00
parent 82bf19941e
commit 3bf89ed825
1 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
sys/src/cmd/auth/as.c
View file

@ -17,7 +17,6 @@ char *defargv[] = { "/bin/rc", "-i", nil };
char *namespace = nil; char *namespace = nil;
int becomeuser(char*); int becomeuser(char*);
void initcap(void);
void void
usage(void) usage(void)
@ -56,7 +55,6 @@ main(int argc, char *argv[])
if(argc == 0) if(argc == 0)
usage(); usage();
initcap();
if(becomeuser(argv[0]) < 0) if(becomeuser(argv[0]) < 0)
sysfatal("can't change uid for %s: %r", argv[0]); sysfatal("can't change uid for %s: %r", argv[0]);
if(newns(argv[0], namespace) < 0) if(newns(argv[0], namespace) < 0)
@ -69,19 +67,6 @@ main(int argc, char *argv[])
run(argv); run(argv);
} }
/*
* keep caphash fd open since opens of it could be disabled
*/
static int caphashfd;
void
initcap(void)
{
caphashfd = open("#¤/caphash", OCEXEC|OWRITE);
if(caphashfd < 0)
fprint(2, "%s: opening #¤/caphash: %r", argv0);
}
/* /*
* create a change uid capability * create a change uid capability
*/ */
@ -93,8 +78,10 @@ mkcap(char *from, char *to)
char *key; char *key;
int nfrom, nto; int nfrom, nto;
uchar hash[SHA1dlen]; uchar hash[SHA1dlen];
int fd;
if(caphashfd < 0) fd = open("#¤/caphash", OCEXEC|OWRITE);
if(fd < 0)
return nil; return nil;
/* create the capability */ /* create the capability */
@ -113,10 +100,12 @@ mkcap(char *from, char *to)
/* give the kernel the hash */ /* give the kernel the hash */
key[-1] = '@'; key[-1] = '@';
if(write(caphashfd, hash, SHA1dlen) < 0){ if(write(fd, hash, SHA1dlen) < 0){
close(fd);
free(cap); free(cap);
return nil; return nil;
} }
close(fd);
return cap; return cap;
} }