From: Nikita Popov Date: Wed, 12 Jun 2019 10:01:05 +0000 (+0200) Subject: Guard functions by SO_PASSCRED X-Git-Tag: php-7.4.0alpha2~138 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2134cc25d2ece0d38e1de194bc5486089e6d349f;p=php Guard functions by SO_PASSCRED --- diff --git a/ext/sockets/conversions.c b/ext/sockets/conversions.c index f24e0926ce..7a1a4bb6bc 100644 --- a/ext/sockets/conversions.c +++ b/ext/sockets/conversions.c @@ -441,6 +441,8 @@ static void from_zval_write_sa_family(const zval *arr_value, char *field, ser_co ival = (sa_family_t)lval; memcpy(field, &ival, sizeof(ival)); } + +#ifdef SO_PASSCRED static void from_zval_write_pid_t(const zval *arr_value, char *field, ser_context *ctx) { zend_long lval; @@ -488,6 +490,7 @@ static void from_zval_write_uid_t(const zval *arr_value, char *field, ser_contex ival = (uid_t)lval; memcpy(field, &ival, sizeof(ival)); } +#endif void to_zval_read_int(const char *data, zval *zv, res_context *ctx) { @@ -524,6 +527,7 @@ static void to_zval_read_sa_family(const char *data, zval *zv, res_context *ctx) ZVAL_LONG(zv, (zend_long)ival); } +#ifdef SO_PASSCRED static void to_zval_read_pid_t(const char *data, zval *zv, res_context *ctx) { pid_t ival; @@ -538,6 +542,7 @@ static void to_zval_read_uid_t(const char *data, zval *zv, res_context *ctx) ZVAL_LONG(zv, (zend_long)ival); } +#endif /* CONVERSIONS for sockaddr */ static void from_zval_write_sin_addr(const zval *zaddr_str, char *inaddr, ser_context *ctx)