diff options
| author |   schwarze <schwarze@openbsd.org> | 2015-11-13 18:05:37 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2015-11-13 18:05:37 +0000 |
| commit | 21c8a1e3851e88a3240c6b1f591e5dece1898993 (patch) | |
| tree | 3d21cce30f0836336ef25266171ce7eec2f5c83c | |
| parent | pledge "stdio rpath wpath getpw inet tty" at startup. After opening (diff) | |
| download | wireguard-openbsd-21c8a1e3851e88a3240c6b1f591e5dece1898993.tar.xz wireguard-openbsd-21c8a1e3851e88a3240c6b1f591e5dece1898993.zip | |
move pledge(2) after setrtable(2), like in nc(1);
OK deraadt@
| -rw-r--r-- | usr.bin/telnet/main.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/telnet/main.c b/usr.bin/telnet/main.c index 2e5eb2c7912..e524ce3bc13 100644 --- a/usr.bin/telnet/main.c +++ b/usr.bin/telnet/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.33 2015/11/13 17:13:59 deraadt Exp $ */ +/* $OpenBSD: main.c,v 1.34 2015/11/13 18:05:37 schwarze Exp $ */ /* $NetBSD: main.c,v 1.5 1996/02/28 21:04:05 thorpej Exp $ */ /* @@ -80,11 +80,6 @@ main(int argc, char *argv[]) char *user, *alias; const char *errstr; - if (pledge("stdio rpath wpath getpw inet tty", NULL) == -1) { - perror("pledge"); - exit(1); - } - tninit(); /* Clear out things */ TerminalSaveState(); @@ -174,6 +169,11 @@ main(int argc, char *argv[]) exit(1); } + if (pledge("stdio rpath wpath getpw inet tty", NULL) == -1) { + perror("pledge"); + exit(1); + } + if (autologin == -1) autologin = (rlogin == _POSIX_VDISABLE) ? 0 : 1; |