diff options
| author |   deraadt <deraadt@openbsd.org> | 2015-01-19 01:24:39 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2015-01-19 01:24:39 +0000 |
| commit | 257cf6b4f5ffaf0e24309c0cb57905b84f5d132f (patch) | |
| tree | 4a3eadafb3239adf5ed2ab870963b4f8aff8b4e9 | |
| parent | unneccessary cmask variable; ok guenther (diff) | |
| download | wireguard-openbsd-257cf6b4f5ffaf0e24309c0cb57905b84f5d132f.tar.xz wireguard-openbsd-257cf6b4f5ffaf0e24309c0cb57905b84f5d132f.zip | |
CMASK went out of scope with the recent <sys/param.h> removal. But oh
golly gee, ftpd can handle that itself due to the glorious old practice
of #ifndef #define. Remove that junk.
ok guenther
| -rw-r--r-- | libexec/ftpd/ftpd.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c index 9c2560303ff..76dab886335 100644 --- a/libexec/ftpd/ftpd.c +++ b/libexec/ftpd/ftpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ftpd.c,v 1.206 2015/01/16 06:39:50 deraadt Exp $ */ +/* $OpenBSD: ftpd.c,v 1.207 2015/01/19 01:24:39 deraadt Exp $ */ /* $NetBSD: ftpd.c,v 1.15 1995/06/03 22:46:47 mycroft Exp $ */ /* @@ -144,11 +144,7 @@ int family = AF_UNSPEC; volatile sig_atomic_t transflag; off_t file_size; off_t byte_count; -#if !defined(CMASK) || CMASK == 0 -#undef CMASK -#define CMASK 022 -#endif -mode_t defumask = CMASK; /* default umask value */ +mode_t defumask = S_IWGRP|S_IWOTH; /* default umask value */ int umaskchange = 1; /* allow user to change umask value. */ char tmpline[7]; char hostname[HOST_NAME_MAX+1]; |