diff options
| author | Ben Fuhrmannek | 2016-10-14 13:55:02 +0200 |
|---|---|---|
| committer | Ben Fuhrmannek | 2016-10-14 13:55:02 +0200 |
| commit | 8f4d1521ca80079339fb36fafd26053bbba6199c (patch) | |
| tree | 03bd91320d2b18aa374951a186f31ec8ae08b44f | |
| parent | 7e2d510b9cdd68784fd64bbf73843d4595462d63 (diff) | |
made pledge experimental
| -rw-r--r-- | php_suhosin.h | 2 | ||||
| -rw-r--r-- | pledge.c | 3 | ||||
| -rw-r--r-- | 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(); | |||
| 384 | void suhosin_hook_session(TSRMLS_D); | 384 | void suhosin_hook_session(TSRMLS_D); |
| 385 | void suhosin_unhook_session(TSRMLS_D); | 385 | void suhosin_unhook_session(TSRMLS_D); |
| 386 | void suhosin_hook_sha256(TSRMLS_D); | 386 | void suhosin_hook_sha256(TSRMLS_D); |
| 387 | #ifdef __OpenBSD__ | 387 | #if defined(__OpenBSD__) && defined(SUHOSIN_EXPERIMENTAL) |
| 388 | void suhosin_hook_pledge(TSRMLS_D); | 388 | void suhosin_hook_pledge(TSRMLS_D); |
| 389 | #endif | 389 | #endif |
| 390 | void suhosin_hook_ex_imp(TSRMLS_D); | 390 | void suhosin_hook_ex_imp(TSRMLS_D); |
| @@ -17,10 +17,9 @@ | |||
| 17 | +----------------------------------------------------------------------+ | 17 | +----------------------------------------------------------------------+ |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | /* $Id: pledge.c $ */ | 20 | #if defined(__OpenBSD__) && defined(SUHOSIN_EXPERIMENTAL) |
| 21 | 21 | ||
| 22 | #include <unistd.h> | 22 | #include <unistd.h> |
| 23 | #ifdef __OpenBSD__ | ||
| 24 | #include <errno.h> | 23 | #include <errno.h> |
| 25 | #include "php.h" | 24 | #include "php.h" |
| 26 | #include "ext/standard/info.h" | 25 | #include "ext/standard/info.h" |
| @@ -1050,7 +1050,7 @@ PHP_MINIT_FUNCTION(suhosin) | |||
| 1050 | suhosin_hook_memory_limit(TSRMLS_C); | 1050 | suhosin_hook_memory_limit(TSRMLS_C); |
| 1051 | suhosin_hook_sha256(TSRMLS_C); | 1051 | suhosin_hook_sha256(TSRMLS_C); |
| 1052 | suhosin_hook_ex_imp(TSRMLS_C); | 1052 | suhosin_hook_ex_imp(TSRMLS_C); |
| 1053 | #ifdef __OpenBSD__ | 1053 | #if defined(__OpenBSD__) && defined(SUHOSIN_EXPERIMENTAL) |
| 1054 | suhosin_hook_pledge(TSRMLS_C); | 1054 | suhosin_hook_pledge(TSRMLS_C); |
| 1055 | #endif | 1055 | #endif |
| 1056 | 1056 | ||
