diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2018-07-18 13:34:04 +0200 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2018-07-19 13:41:42 +0200 |
commit | 258dc8bb07dfb35a46e52b0822a2c5b7027df60a (patch) | |
tree | 0076c7e0f10f5f525efbd9f7499e5707203b743f /sshconnect.h | |
parent | upstream: Slot 0 in the hostbased key array was previously RSA1, (diff) | |
download | openssh-258dc8bb07dfb35a46e52b0822a2c5b7027df60a.tar.xz openssh-258dc8bb07dfb35a46e52b0822a2c5b7027df60a.zip |
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 'sshconnect.h')
-rw-r--r-- | sshconnect.h | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/sshconnect.h b/sshconnect.h index 6bba62ad0..05a1fb327 100644 --- a/sshconnect.h +++ b/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) |