Attachment #189344 for bug #224843

View | Details | Raw Unified | Return to bug 224843
Collapse All | Expand All

Lines 3-9 Link Here

(-)Makefile (-3 / +2 lines)
3		3
4	PORTNAME= pam	4	PORTNAME= pam
5	PORTVERSION= 1.0.3	5	PORTVERSION= 1.0.3
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= security pear	7	CATEGORIES= security pear
8		8
9	MAINTAINER= joneum@FreeBSD.org	9	MAINTAINER= joneum@FreeBSD.org
Lines 11-17 Link Here
11		11
12	LICENSE= PHP202	12	LICENSE= PHP202
13		13
14	USES= php:pecl	14	USES= php:pecl dos2unix
15	IGNORE_WITH_PHP=70 71 72
16		15
17	.include <bsd.port.mk>	16	.include <bsd.port.mk>




--- pam.c.orig	2018-01-02 11:11:25 UTC
+++ pam.c
@@ -227,8 +227,13 @@ int chpass_pam_talker(int num_msg,
 PHP_FUNCTION(pam_auth)
 {
 	char *username, *password;
+#if PHP_MAJOR_VERSION >= 7
+ 	size_t username_len, password_len;
+	zval *status = NULL, *server, *remote_addr;
+#else
 	int username_len, password_len;
 	zval *status = NULL, **server, **remote_addr;
+#endif
 	zend_bool checkacctmgmt = 1;
 
 	pam_auth_t userinfo = {NULL, NULL};
@@ -248,22 +253,37 @@ PHP_FUNCTION(pam_auth)
 		if (status) {
 			spprintf(&error_msg, 0, "%s (in %s)", (char *) pam_strerror(pamh, result), "pam_start");
 			zval_dtor(status);
+#if PHP_MAJOR_VERSION >= 7
+			ZVAL_STRING(status, error_msg);
+			efree(error_msg);
+#else
 			ZVAL_STRING(status, error_msg, 0);
+#endif
 		}
 		RETURN_FALSE;
 	}
 
+#if PHP_MAJOR_VERSION >= 7
+	if ((remote_addr = zend_hash_str_find(Z_ARR(PG(http_globals)[TRACK_VARS_SERVER]), "REMOTE_ADDR", sizeof("REMOTE_ADDR")-1)) != NULL && Z_TYPE_P(remote_addr) == IS_STRING) {
+		pam_set_item(pamh, PAM_RHOST, Z_STRVAL_P(remote_addr));
+#else
 	if (zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void **)&server) == SUCCESS && Z_TYPE_PP(server) == IS_ARRAY) {
 		if (zend_hash_find(Z_ARRVAL_PP(server), "REMOTE_ADDR", sizeof("REMOTE_ADDR"), (void **)&remote_addr) == SUCCESS && Z_TYPE_PP(remote_addr) == IS_STRING) {
 			pam_set_item(pamh, PAM_RHOST, Z_STRVAL_PP(remote_addr));
 		}
+#endif
 	}
 
 	if ((result = pam_authenticate(pamh, PAM_DISALLOW_NULL_AUTHTOK)) != PAM_SUCCESS) {
 		if (status) {
 			spprintf(&error_msg, 0, "%s (in %s)", (char *) pam_strerror(pamh, result), "pam_authenticate");
 			zval_dtor(status);
+#if PHP_MAJOR_VERSION >= 7
+			ZVAL_STRING(status, error_msg);
+			efree(error_msg);
+#else
 			ZVAL_STRING(status, error_msg, 0);
+#endif
 		}
 		pam_end(pamh, PAM_SUCCESS);
 		RETURN_FALSE;
@@ -274,7 +294,12 @@ PHP_FUNCTION(pam_auth)
 			if (status) {
 				spprintf(&error_msg, 0, "%s (in %s)", (char *) pam_strerror(pamh, result), "pam_acct_mgmt");
 				zval_dtor(status);
+#if PHP_MAJOR_VERSION >= 7
+				ZVAL_STRING(status, error_msg);
+				efree(error_msg);
+#else
 				ZVAL_STRING(status, error_msg, 0);
+#endif
 			}
 			pam_end(pamh, PAM_SUCCESS);
 			RETURN_FALSE;
@@ -291,7 +316,11 @@ PHP_FUNCTION(pam_auth)
 PHP_FUNCTION(pam_chpass)
 {
 	char *username, *oldpass, *newpass;
+#if PHP_MAJOR_VERSION >= 7
+	size_t username_len, oldpass_len, newpass_len;
+#else
 	int username_len, oldpass_len, newpass_len;
+#endif
 	zval *status = NULL;
 
 	pam_chpass_t userinfo = {NULL, NULL, NULL, 0};
@@ -312,7 +341,12 @@ PHP_FUNCTION(pam_chpass)
 		if (status) {
 			spprintf(&error_msg, 0, "%s (in %s)", (char *) pam_strerror(pamh, result), "pam_start");
 			zval_dtor(status);
+#if PHP_MAJOR_VERSION >= 7
+			ZVAL_STRING(status, error_msg);
+			efree(error_msg);
+#else
 			ZVAL_STRING(status, error_msg, 0);
+#endif
 		}
 		RETURN_FALSE;
 	}
@@ -321,7 +355,12 @@ PHP_FUNCTION(pam_chpass)
 		if (status) {
 			spprintf(&error_msg, 0, "%s (in %s)", (char *) pam_strerror(pamh, result), "pam_authenticate");
 			zval_dtor(status);
+#if PHP_MAJOR_VERSION >= 7
+			ZVAL_STRING(status, error_msg);
+			efree(error_msg);
+#else
 			ZVAL_STRING(status, error_msg, 0);
+#endif
 		}
 		pam_end(pamh, PAM_SUCCESS);
 		RETURN_FALSE;
@@ -331,7 +370,12 @@ PHP_FUNCTION(pam_chpass)
 		if (status) {
 			spprintf(&error_msg, 0, "%s (in %s)", (char *) pam_strerror(pamh, result), "pam_chauthtok");
 			zval_dtor(status);
+#if PHP_MAJOR_VERSION >= 7
+			ZVAL_STRING(status, error_msg);
+			efree(error_msg);
+#else
 			ZVAL_STRING(status, error_msg, 0);
+#endif
 		}
 		pam_end(pamh, PAM_SUCCESS);
 		RETURN_FALSE;

Return to bug 224843

Line 0 Link Here

(-)files/patch-pam.c (+118 lines)
		1	--- pam.c.orig 2018-01-02 11:11:25 UTC
		2	+++ pam.c
		3	@@ -227,8 +227,13 @@ int chpass_pam_talker(int num_msg,
		4	PHP_FUNCTION(pam_auth)
		5	{
		6	char username, password;
		7	+#if PHP_MAJOR_VERSION >= 7
		8	+ size_t username_len, password_len;
		9	+ zval status = NULL, server, *remote_addr;
		10	+#else
		11	int username_len, password_len;
		12	zval status = NULL, server, *remote_addr;
		13	+#endif
		14	zend_bool checkacctmgmt = 1;
		15
		16	pam_auth_t userinfo = {NULL, NULL};
		17	@@ -248,22 +253,37 @@ PHP_FUNCTION(pam_auth)
		18	if (status) {
		19	spprintf(&error_msg, 0, "%s (in %s)", (char *) pam_strerror(pamh, result), "pam_start");
		20	zval_dtor(status);
		21	+#if PHP_MAJOR_VERSION >= 7
		22	+ ZVAL_STRING(status, error_msg);
		23	+ efree(error_msg);
		24	+#else
		25	ZVAL_STRING(status, error_msg, 0);
		26	+#endif
		27	}
		28	RETURN_FALSE;
		29	}
		30
		31	+#if PHP_MAJOR_VERSION >= 7
		32	+ if ((remote_addr = zend_hash_str_find(Z_ARR(PG(http_globals)[TRACK_VARS_SERVER]), "REMOTE_ADDR", sizeof("REMOTE_ADDR")-1)) != NULL && Z_TYPE_P(remote_addr) == IS_STRING) {
		33	+ pam_set_item(pamh, PAM_RHOST, Z_STRVAL_P(remote_addr));
		34	+#else
		35	if (zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void **)&server) == SUCCESS && Z_TYPE_PP(server) == IS_ARRAY) {
		36	if (zend_hash_find(Z_ARRVAL_PP(server), "REMOTE_ADDR", sizeof("REMOTE_ADDR"), (void **)&remote_addr) == SUCCESS && Z_TYPE_PP(remote_addr) == IS_STRING) {
		37	pam_set_item(pamh, PAM_RHOST, Z_STRVAL_PP(remote_addr));
		38	}
		39	+#endif
		40	}
		41
		42	if ((result = pam_authenticate(pamh, PAM_DISALLOW_NULL_AUTHTOK)) != PAM_SUCCESS) {
		43	if (status) {
		44	spprintf(&error_msg, 0, "%s (in %s)", (char *) pam_strerror(pamh, result), "pam_authenticate");
		45	zval_dtor(status);
		46	+#if PHP_MAJOR_VERSION >= 7
		47	+ ZVAL_STRING(status, error_msg);
		48	+ efree(error_msg);
		49	+#else
		50	ZVAL_STRING(status, error_msg, 0);
		51	+#endif
		52	}
		53	pam_end(pamh, PAM_SUCCESS);
		54	RETURN_FALSE;
		55	@@ -274,7 +294,12 @@ PHP_FUNCTION(pam_auth)
		56	if (status) {
		57	spprintf(&error_msg, 0, "%s (in %s)", (char *) pam_strerror(pamh, result), "pam_acct_mgmt");
		58	zval_dtor(status);
		59	+#if PHP_MAJOR_VERSION >= 7
		60	+ ZVAL_STRING(status, error_msg);
		61	+ efree(error_msg);
		62	+#else
		63	ZVAL_STRING(status, error_msg, 0);
		64	+#endif
65	}
66	pam_end(pamh, PAM_SUCCESS);
67	RETURN_FALSE;
68	@@ -291,7 +316,11 @@ PHP_FUNCTION(pam_auth)
69	PHP_FUNCTION(pam_chpass)
70	{
71	char username, oldpass, *newpass;
72	+#if PHP_MAJOR_VERSION >= 7
73	+ size_t username_len, oldpass_len, newpass_len;
74	+#else
75	int username_len, oldpass_len, newpass_len;
76	+#endif
77	zval *status = NULL;
78
79	pam_chpass_t userinfo = {NULL, NULL, NULL, 0};
80	@@ -312,7 +341,12 @@ PHP_FUNCTION(pam_chpass)
81	if (status) {
82	spprintf(&error_msg, 0, "%s (in %s)", (char *) pam_strerror(pamh, result), "pam_start");
83	zval_dtor(status);
84	+#if PHP_MAJOR_VERSION >= 7
85	+ ZVAL_STRING(status, error_msg);
86	+ efree(error_msg);
87	+#else
88	ZVAL_STRING(status, error_msg, 0);
89	+#endif
90	}
91	RETURN_FALSE;
92	}
93	@@ -321,7 +355,12 @@ PHP_FUNCTION(pam_chpass)
94	if (status) {
95	spprintf(&error_msg, 0, "%s (in %s)", (char *) pam_strerror(pamh, result), "pam_authenticate");
96	zval_dtor(status);
97	+#if PHP_MAJOR_VERSION >= 7
98	+ ZVAL_STRING(status, error_msg);
99	+ efree(error_msg);
100	+#else
101	ZVAL_STRING(status, error_msg, 0);
102	+#endif
103	}
104	pam_end(pamh, PAM_SUCCESS);
105	RETURN_FALSE;
106	@@ -331,7 +370,12 @@ PHP_FUNCTION(pam_chpass)
107	if (status) {
108	spprintf(&error_msg, 0, "%s (in %s)", (char *) pam_strerror(pamh, result), "pam_chauthtok");
109	zval_dtor(status);
110	+#if PHP_MAJOR_VERSION >= 7
111	+ ZVAL_STRING(status, error_msg);
112	+ efree(error_msg);
113	+#else
114	ZVAL_STRING(status, error_msg, 0);
115	+#endif
116	}
117	pam_end(pamh, PAM_SUCCESS);
118	RETURN_FALSE;