diff options
| author | Darren Tucker <dtucker@cvs.openbsd.org> | 2018-07-18 11:34:06 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@cvs.openbsd.org> | 2018-07-18 11:34:06 +0000 |
| commit | aa74b5d8ec77199ae38087d51bb58d0a39129d92 (patch) | |
| tree | c7bc9b9af14d8322e8f553e9ac60e72c8323619d /usr.bin/ssh/sshconnect.h | |
| parent | 9d185f1bada9334334f6ece8016aa0a7f8be84b5 (diff) | |
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@
Diffstat (limited to 'usr.bin/ssh/sshconnect.h')
| -rw-r--r-- | usr.bin/ssh/sshconnect.h | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/usr.bin/ssh/sshconnect.h b/usr.bin/ssh/sshconnect.h index 6bba62ad0a4..05a1fb327bb 100644 --- a/usr.bin/ssh/sshconnect.h +++ b/usr.bin/ssh/sshconnect.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect.h,v 1.33 2018/07/16 11:05:41 dtucker Exp $ */ +/* $OpenBSD: sshconnect.h,v 1.34 2018/07/18 11:34:04 dtucker Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. @@ -57,22 +57,3 @@ void ssh_put_password(char *); int ssh_local_cmd(const char *); void maybe_add_key_to_agent(char *, const struct sshkey *, char *, char *); - -/* - * Macros to raise/lower permissions. - */ -#define PRIV_START do { \ - int save_errno = errno; \ - if (seteuid(original_effective_uid) != 0) \ - fatal("PRIV_START: seteuid: %s", \ - strerror(errno)); \ - errno = save_errno; \ -} while (0) - -#define PRIV_END do { \ - int save_errno = errno; \ - if (seteuid(original_real_uid) != 0) \ - fatal("PRIV_END: seteuid: %s", \ - strerror(errno)); \ - errno = save_errno; \ -} while (0) |