- Added an extra ini setting with which extra commands can be forced to

Derick Rethans · Derick Rethans · commit 424c41a72e05 · 2003-02-26T20:04:16.000Z
the sendmail deamon on a per-vhost base. The value in this ini setting
  will override all extra commands passed as the 5th parameter to mail()
  and will work in Safe Mode.
@- Added an extra ini setting (mail_force_extra_paramaters) which forces
@  the addition of the specified parameters to be passed as extra
@  parameters to the sendmail binary. These parameters will always replace
@  the value of the 5th parameter to mail(), even in safe mode. (Derick)
diff --git a/ext/standard/mail.c b/ext/standard/mail.c
@@ -86,6 +86,7 @@ PHP_FUNCTION(mail)
 	char *subject=NULL, *extra_cmd=NULL;
 	int to_len, message_len, headers_len;
 	int subject_len, extra_cmd_len, i;
+	char *force_extra_parameters = INI_STR("mail_force_extra_parameters");
 
 	if (PG(safe_mode) && (ZEND_NUM_ARGS() == 5)) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "SAFE MODE Restriction in effect.  The fifth parameter is disabled in SAFE MODE.");
@@ -137,7 +138,9 @@ PHP_FUNCTION(mail)
 		}
 	}
 
-	if (extra_cmd) {
+	if (force_extra_parameters) {
+		extra_cmd = estrdup(force_extra_parameters);
+	} else if (extra_cmd) {
 		extra_cmd = php_escape_shell_cmd(extra_cmd);
 	}
 	
diff --git a/main/main.c b/main/main.c
@@ -327,6 +327,7 @@ PHP_INI_BEGIN()
 	PHP_INI_ENTRY("precision",					"14",		PHP_INI_ALL,		OnSetPrecision)
 	PHP_INI_ENTRY("sendmail_from",				NULL,		PHP_INI_ALL,		NULL)
 	PHP_INI_ENTRY("sendmail_path",	DEFAULT_SENDMAIL_PATH,	PHP_INI_SYSTEM,		NULL)
+	PHP_INI_ENTRY("mail_force_extra_parameters",NULL,		PHP_INI_SYSTEM,		NULL)
 	PHP_INI_ENTRY("disable_functions",			"",			PHP_INI_SYSTEM,		NULL)
 
 	STD_PHP_INI_BOOLEAN("allow_url_fopen",		"1",		PHP_INI_ALL,		OnUpdateBool,			allow_url_fopen,			php_core_globals,	core_globals)

Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,7 @@ PHP_FUNCTION(mail)`
`86`	`86`	`char subject=NULL, extra_cmd=NULL;`
`87`	`87`	`int to_len, message_len, headers_len;`
`88`	`88`	`int subject_len, extra_cmd_len, i;`
	`89`	`+ char *force_extra_parameters = INI_STR("mail_force_extra_parameters");`
`89`	`90`
`90`	`91`	`if (PG(safe_mode) && (ZEND_NUM_ARGS() == 5)) {`
`91`	`92`	`php_error_docref(NULL TSRMLS_CC, E_WARNING, "SAFE MODE Restriction in effect. The fifth parameter is disabled in SAFE MODE.");`
`@@ -137,7 +138,9 @@ PHP_FUNCTION(mail)`
`137`	`138`	`}`
`138`	`139`	`}`
`139`	`140`
`140`		`- if (extra_cmd) {`
	`141`	`+ if (force_extra_parameters) {`
	`142`	`+ extra_cmd = estrdup(force_extra_parameters);`
	`143`	`+ } else if (extra_cmd) {`
`141`	`144`	`extra_cmd = php_escape_shell_cmd(extra_cmd);`
`142`	`145`	`}`
`143`	`146`