diff options
| author | Damien Miller <djm@mindrot.org> | 2015-11-30 00:53:25 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-11-30 00:53:25 +0100 |
| commit | f0191d7c8e76e30551084b79341886d9bb38e453 (patch) | |
| tree | 6a747d426a59eff9398474728ee529a68fff7a9f /openbsd-compat | |
| parent | revert 7d4c7513: bring back S/Key prototypes (diff) | |
| download | openssh-f0191d7c8e76e30551084b79341886d9bb38e453.tar.xz openssh-f0191d7c8e76e30551084b79341886d9bb38e453.zip | |
Revert "stub for pledge(2) for systems that lack it"
This reverts commit 14c887c8393adde2d9fd437d498be30f8c98535c.
dtucker beat me to it :/
Diffstat (limited to 'openbsd-compat')
| -rw-r--r-- | openbsd-compat/bsd-pledge.c | 14 | ||||
| -rw-r--r-- | openbsd-compat/openbsd-compat.h | 4 |
2 files changed, 0 insertions, 18 deletions
diff --git a/openbsd-compat/bsd-pledge.c b/openbsd-compat/bsd-pledge.c deleted file mode 100644 index afce3c002..000000000 --- a/openbsd-compat/bsd-pledge.c +++ /dev/null @@ -1,14 +0,0 @@ -/* Placed in the public domain. */ - -#include "includes.h" - -#ifndef HAVE_PLEDGE - -/* Stub; real implementations wanted. */ -int -pledge(const char *promises, const char *paths[]) -{ - return 0; -} - -#endif /* HAVE_PLEDGE */ diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h index be7b6877e..8cc8a11b7 100644 --- a/openbsd-compat/openbsd-compat.h +++ b/openbsd-compat/openbsd-compat.h @@ -264,10 +264,6 @@ int bcrypt_pbkdf(const char *, size_t, const u_int8_t *, size_t, void explicit_bzero(void *p, size_t n); #endif -#ifndef HAVE_PLEDGE -int pledge(const char *promises, const char *paths[]); -#endif /* HAVE_PLEDGE */ - void *xmmap(size_t size); char *xcrypt(const char *password, const char *salt); char *shadow_pw(struct passwd *pw); |