diff options
| author |   deraadt <deraadt@openbsd.org> | 2015-01-19 01:19:17 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2015-01-19 01:19:17 +0000 |
| commit | b57a5e5bf13f26a4b26c9bff8b728ced5794f2d5 (patch) | |
| tree | 4d5ed08e51a6cc7c2223b1f445565c820dffd796 | |
| parent | If UID_MAX is not defined, this should fail to compile. (diff) | |
| download | wireguard-openbsd-b57a5e5bf13f26a4b26c9bff8b728ced5794f2d5.tar.xz wireguard-openbsd-b57a5e5bf13f26a4b26c9bff8b728ced5794f2d5.zip | |
unneccessary cmask variable; ok guenther
| -rw-r--r-- | sys/kern/init_main.c | 3 | ||||
| -rw-r--r-- | sys/kern/kern_descrip.c | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index 4c32b6ac321..a055fae705c 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: init_main.c,v 1.232 2015/01/13 18:51:27 kettenis Exp $ */ +/* $OpenBSD: init_main.c,v 1.233 2015/01/19 01:19:17 deraadt Exp $ */ /* $NetBSD: init_main.c,v 1.84.4.1 1996/06/02 09:08:06 mrg Exp $ */ /* @@ -123,7 +123,6 @@ extern struct timeout setperf_to; void setperf_auto(void *); #endif -int cmask = CMASK; extern struct user *proc0paddr; struct vnode *rootvp, *swapdev_vp; diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index fae56136380..0990561098f 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_descrip.c,v 1.115 2014/12/19 05:59:21 tedu Exp $ */ +/* $OpenBSD: kern_descrip.c,v 1.116 2015/01/19 01:19:17 deraadt Exp $ */ /* $NetBSD: kern_descrip.c,v 1.42 1996/03/30 22:24:38 christos Exp $ */ /* @@ -894,14 +894,13 @@ struct filedesc * fdinit(void) { struct filedesc0 *newfdp; - extern int cmask; newfdp = pool_get(&fdesc_pool, PR_WAITOK|PR_ZERO); rw_init(&newfdp->fd_fd.fd_lock, "fdlock"); /* Create the file descriptor table. */ newfdp->fd_fd.fd_refcnt = 1; - newfdp->fd_fd.fd_cmask = cmask; + newfdp->fd_fd.fd_cmask = S_IWGRP|S_IWOTH; newfdp->fd_fd.fd_ofiles = newfdp->fd_dfiles; newfdp->fd_fd.fd_ofileflags = newfdp->fd_dfileflags; newfdp->fd_fd.fd_nfiles = NDFILE; |