diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2018-07-18 11:34:04 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2018-07-19 21:41:42 +1000 |
commit | 258dc8bb07dfb35a46e52b0822a2c5b7027df60a (patch) | |
tree | 0076c7e0f10f5f525efbd9f7499e5707203b743f /readpass.c | |
parent | ac590760b251506b0a152551abbf8e8d6dc2f527 (diff) |
upstream: Remove support for running ssh(1) setuid and fatal if
attempted. Do not link uidwap.c into ssh any more. Neuters
UsePrivilegedPort, which will be marked as deprecated shortly. ok markus@
djm@
OpenBSD-Commit-ID: c4ba5bf9c096f57a6ed15b713a1d7e9e2e373c42
Diffstat (limited to 'readpass.c')
-rw-r--r-- | readpass.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/readpass.c b/readpass.c index 05c8cac1c..f160f866b 100644 --- a/readpass.c +++ b/readpass.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readpass.c,v 1.51 2015/12/11 00:20:04 mmcc Exp $ */ | 1 | /* $OpenBSD: readpass.c,v 1.52 2018/07/18 11:34:04 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -72,7 +72,6 @@ ssh_askpass(char *askpass, const char *msg) | |||
72 | return NULL; | 72 | return NULL; |
73 | } | 73 | } |
74 | if (pid == 0) { | 74 | if (pid == 0) { |
75 | permanently_drop_suid(getuid()); | ||
76 | close(p[0]); | 75 | close(p[0]); |
77 | if (dup2(p[1], STDOUT_FILENO) < 0) | 76 | if (dup2(p[1], STDOUT_FILENO) < 0) |
78 | fatal("ssh_askpass: dup2: %s", strerror(errno)); | 77 | fatal("ssh_askpass: dup2: %s", strerror(errno)); |