Merge remote branch 'mainline/master'

Conflicts:
	etc/inc/filter.inc

2 files changed, 22 insertions, 8 deletions

diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index 784b37b..97a4cc2 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -1064,6 +1064,14 @@ function filter_nat_rules_generate() {
 	$natrules .= "# TFTP proxy\n";
 	$natrules .= "rdr-anchor \"tftp-proxy/*\"\n";
 
+	if (!empty($config['system']['tftpinterface'])) {
+		$tftpifs = explode(",", $config['system']['tftpinterface']);
+		foreach($tftpifs as $tftpif) {
+			if ($FilterIflist[$tftpif])
+				$natrules .= "rdr pass on {$FilterIflist[$tftpif]['if']} proto udp from any to any port tftp -> 127.0.0.1 port 6969\n";
+		}
+	}
+
 	$interface_counter = 0;
 	$vpns_list = filter_get_vpns_list();
 	$direct_networks_list = filter_get_direct_networks_list();
@@ -1085,7 +1093,7 @@ function filter_nat_rules_generate() {
 	// Open inetd.conf write handle
 	$inetd_fd = fopen("/var/etc/inetd.conf","w");
 	/* add tftp protocol helper */
-	fwrite($inetd_fd, "tftp\tdgram\tudp\twait\t\troot\t/usr/local/sbin/tftp-proxy\ttftp-proxy -v\n");
+	fwrite($inetd_fd, "tftp-proxy\tdgram\tudp\twait\t\troot\t/usr/local/sbin/tftp-proxy\ttftp-proxy -v\n");
 
 	if(isset($config['nat']['rule'])) {
 		if(!isset($config['system']['disablenatreflection'])) {
@@ -2008,8 +2016,7 @@ EOD;
 # package manager late specific hook
 anchor "packagelate"
 
-EOD;
-	$ipfrules .= <<<EOD
+anchor "tftp-proxy/*"
 
 anchor "limitingesr"
 
@@ -2446,11 +2453,10 @@ function discover_pkg_rules($ruletype) {
 				log_error($errorrules);
 				file_put_contents("{$g['tmp_path']}/rules.packages.{$pkg_inc}", "#{$errorrules}\n");
 				return "";
-			} else {
-				return $rules;
 			}
 		}
 	}
+	return $rules;
 }
 
 // vim: ts=4 sw=4 noexpandtab
diff --git a/etc/inc/notices.inc b/etc/inc/notices.inc
index d2cf505..6880844 100644
--- a/etc/inc/notices.inc
+++ b/etc/inc/notices.inc
@@ -297,6 +297,7 @@ function notify_via_smtp($message) {
 	$smtp->ssl = 0;
 	$smtp->debug = 0;
 	$smtp->html_debug = 0;
+	$smtp->localhost=$config['system']['hostname'].".".$config['system']['domain'];
 	
 	if($config['notifications']['smtp']['fromaddress'])
 		$from = $config['notifications']['smtp']['fromaddress'];
@@ -345,9 +346,12 @@ function notify_via_growl($message) {
 	global $config;
 	$growl_ip = $config['notifications']['growl']['ipaddress'];
 	$growl_password = $config['notifications']['growl']['password'];
+	$growl_name = $config['notifications']['growl']['name'];
+	$growl_notification = $config['notifications']['growl']['notification_name'];
+	
 	if(!empty($growl_ip)) {
-		$growl = new Growl($growl_ip, $growl_password);
-		$growl->notify("pfSense growl alert", "pfSense", "{$message}");
+		$growl = new Growl($growl_ip, $growl_password, $growl_name);
+		$growl->notify("{$growl_notification}", "pfSense", "{$message}");
 	}
 }
 
@@ -364,8 +368,12 @@ function register_via_growl() {
 	global $config;
 	$growl_ip = $config['notifications']['growl']['ipaddress'];
 	$growl_password = $config['notifications']['growl']['password'];
+	$growl_name = $config['notifications']['growl']['name'];
+	$growl_notification = $config['notifications']['growl']['notification_name'];
+	
 	if($growl_ip) {
-		$growl = new Growl($growl_ip, $growl_password);
+	  $growl = new Growl($growl_ip, $growl_password, $growl_name);
+		$growl->addNotification($growl_notification);
 		$growl->register();
 	}
 }