merge
This commit is contained in:
commit
635be84831
4 changed files with 4 additions and 4 deletions
|
@ -29,7 +29,7 @@ auth_chuid(AuthInfo *ai, char *ns)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* get a link to factotum as new user */
|
/* get a link to factotum as new user */
|
||||||
fd = open("/srv/factotum", ORDWR|OCEXEC);
|
fd = open("/srv/factotum", ORDWR);
|
||||||
if(fd >= 0){
|
if(fd >= 0){
|
||||||
if(mount(fd, -1, "/mnt", MREPL, "") == -1)
|
if(mount(fd, -1, "/mnt", MREPL, "") == -1)
|
||||||
close(fd);
|
close(fd);
|
||||||
|
|
|
@ -194,7 +194,7 @@ nsop(char *fn, int argc, char *argv[], AuthRpc *rpc)
|
||||||
else if(argc == 2)
|
else if(argc == 2)
|
||||||
unmount(argv[0], argv[1]);
|
unmount(argv[0], argv[1]);
|
||||||
}else if(strcmp(argv0, "mount") == 0){
|
}else if(strcmp(argv0, "mount") == 0){
|
||||||
fd = open(argv[0], ORDWR|OCEXEC);
|
fd = open(argv[0], ORDWR);
|
||||||
if(fd < 0){
|
if(fd < 0){
|
||||||
if(newnsdebug)
|
if(newnsdebug)
|
||||||
fprint(2, "%s: mount: %s: %r\n", fn, argv[0]);
|
fprint(2, "%s: mount: %s: %r\n", fn, argv[0]);
|
||||||
|
|
|
@ -24,7 +24,7 @@ access(char *name, int mode)
|
||||||
return 0;
|
return 0;
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
fd = open(name, omode[mode&7]|OCEXEC);
|
fd = open(name, omode[mode&7]);
|
||||||
if(fd >= 0){
|
if(fd >= 0){
|
||||||
close(fd);
|
close(fd);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -13,7 +13,7 @@ newwindow(char *str)
|
||||||
wsys = getenv("wsys");
|
wsys = getenv("wsys");
|
||||||
if(wsys == nil)
|
if(wsys == nil)
|
||||||
return -1;
|
return -1;
|
||||||
fd = open(wsys, ORDWR|OCEXEC);
|
fd = open(wsys, ORDWR);
|
||||||
if(fd < 0){
|
if(fd < 0){
|
||||||
free(wsys);
|
free(wsys);
|
||||||
return -1;
|
return -1;
|
||||||
|
|
Loading…
Reference in a new issue