From: Damien Miller <djm@mindrot.org>
Date: Sun, 29 Nov 2015 23:53:25 +0000 (+1100)
Subject: Revert "stub for pledge(2) for systems that lack it"
X-Git-Tag: V_7_2_P1~89
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0191d7c8e76e30551084b79341886d9bb38e453;p=thirdparty%2Fopenssh-portable.git

Revert "stub for pledge(2) for systems that lack it"

This reverts commit 14c887c8393adde2d9fd437d498be30f8c98535c.

dtucker beat me to it :/
---

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);