From 8f4d1521ca80079339fb36fafd26053bbba6199c Mon Sep 17 00:00:00 2001 From: Ben Fuhrmannek Date: Fri, 14 Oct 2016 13:55:02 +0200 Subject: made pledge experimental --- php_suhosin.h | 2 +- pledge.c | 3 +-- suhosin.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/php_suhosin.h b/php_suhosin.h index bf4d34f..567cf11 100644 --- a/php_suhosin.h +++ b/php_suhosin.h @@ -384,7 +384,7 @@ void suhosin_unhook_header_handler(); void suhosin_hook_session(TSRMLS_D); void suhosin_unhook_session(TSRMLS_D); void suhosin_hook_sha256(TSRMLS_D); -#ifdef __OpenBSD__ +#if defined(__OpenBSD__) && defined(SUHOSIN_EXPERIMENTAL) void suhosin_hook_pledge(TSRMLS_D); #endif void suhosin_hook_ex_imp(TSRMLS_D); diff --git a/pledge.c b/pledge.c index 6a9ecdc..d77d716 100644 --- a/pledge.c +++ b/pledge.c @@ -17,10 +17,9 @@ +----------------------------------------------------------------------+ */ -/* $Id: pledge.c $ */ +#if defined(__OpenBSD__) && defined(SUHOSIN_EXPERIMENTAL) #include -#ifdef __OpenBSD__ #include #include "php.h" #include "ext/standard/info.h" diff --git a/suhosin.c b/suhosin.c index 32193c6..e41126f 100644 --- a/suhosin.c +++ b/suhosin.c @@ -1050,7 +1050,7 @@ PHP_MINIT_FUNCTION(suhosin) suhosin_hook_memory_limit(TSRMLS_C); suhosin_hook_sha256(TSRMLS_C); suhosin_hook_ex_imp(TSRMLS_C); -#ifdef __OpenBSD__ +#if defined(__OpenBSD__) && defined(SUHOSIN_EXPERIMENTAL) suhosin_hook_pledge(TSRMLS_C); #endif -- cgit v1.3