From 293d017aad39263403cb981af0a81c3a7984c1e3 Mon Sep 17 00:00:00 2001 From: David Carlier Date: Thu, 13 Oct 2016 19:30:51 +0100 Subject: author 'amending' + more ifdef --- php_suhosin.h | 2 ++ pledge.c | 2 +- pledge.h | 2 +- suhosin.c | 2 ++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/php_suhosin.h b/php_suhosin.h index b228d48..1c0ea42 100644 --- a/php_suhosin.h +++ b/php_suhosin.h @@ -383,7 +383,9 @@ 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__ void suhosin_hook_pledge(TSRMLS_D); +#endif void suhosin_hook_ex_imp(TSRMLS_D); void suhosin_hook_treat_data(); void suhosin_hook_memory_limit(TSRMLS_D); diff --git a/pledge.c b/pledge.c index fed0380..6a9ecdc 100644 --- a/pledge.c +++ b/pledge.c @@ -13,7 +13,7 @@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Author: Stefan Esser | + | Author: David Carlier | +----------------------------------------------------------------------+ */ diff --git a/pledge.h b/pledge.h index 2666e41..24cdccb 100644 --- a/pledge.h +++ b/pledge.h @@ -13,7 +13,7 @@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Author: Stefan Esser | + | Author: David Carlier | +----------------------------------------------------------------------+ */ diff --git a/suhosin.c b/suhosin.c index abe79df..862ba3c 100644 --- a/suhosin.c +++ b/suhosin.c @@ -1051,7 +1051,9 @@ PHP_MINIT_FUNCTION(suhosin) suhosin_hook_memory_limit(TSRMLS_C); suhosin_hook_sha256(TSRMLS_C); suhosin_hook_ex_imp(TSRMLS_C); +#ifdef __OpenBSD__ suhosin_hook_pledge(TSRMLS_C); +#endif #if PHP_VERSION_ID < 50500 /* register the logo for phpinfo */ -- cgit v1.3