Merge pull request #733 from marcelloc/master

7 files changed, 50 insertions, 40 deletions

diff --git a/config/postfix/adexport.pl b/config/postfix/adexport.pl
index 185848f1..25a8a267 100755
--- a/config/postfix/adexport.pl
+++ b/config/postfix/adexport.pl
@@ -1,9 +1,9 @@
-#!/usr/bin/perl -w
+#!/usr/local/bin/perl -w
 ##############################################################################
 #
 # Script to export a list of all email addresses from Active Directory
 # Brian Landers <brian@packetslave.com>
-# 
+#
 # This code is in the public domain.  Your use of this code is at your own
 # risk, and no warranty is implied.  The author accepts no liability for any
 # damages or risks incurred by its use.
@@ -42,7 +42,7 @@ use Net::LDAP;
 use Net::LDAP::Control::Paged;
 use Net::LDAP::Constant qw( LDAP_CONTROL_PAGED );
 
-#our ($cn,$passwd,$base); 
+#our ($cn,$passwd,$base);
 #($cn,$passwd,$base)=@_ARGV;
 #print "$cn \n $passwd \n $base";
 #exit;
@@ -74,10 +74,10 @@ foreach( @servers ) {
 # 1000 records by default.  We have to use paging to get the full list.
 
 my $page = Net::LDAP::Control::Paged->new( size => 100 );
- 
+
 # Try to bind (login) to the server now that we're connected
-my $msg = $ldap->bind( dn       => $bind, 
-                       password => $passwd 
+my $msg = $ldap->bind( dn       => $bind,
+                       password => $passwd
                      );
 
 # If we can't bind, we can't continue
@@ -122,7 +122,7 @@ if( $cookie ) {
 }
 
 # Finally, unbind from the server
-$ldap->unbind; 
+$ldap->unbind;
 
 # ------------------------------------------------------------------------
 # Callback function that gets called for each record we get from the server
@@ -131,16 +131,16 @@ $ldap->unbind;
 #
 
 sub handle_object {
-  
+
   my $msg  = shift;       # Net::LDAP::Message object
   my $data = shift;       # May be Net::LDAP::Entry or Net::LDAP::Reference
-  
+
   # Only process if we actually got data
   return unless $data;
-  
+
   return handle_entry( $msg, $data )     if $data->isa("Net::LDAP::Entry");
   return handle_reference( $msg, $data ) if $data->isa("Net::LDAP::Reference");
-  
+
   # If we get here, it was something we're not prepared to handle,
   # so just return silently.
 
@@ -153,35 +153,35 @@ sub handle_object {
 # ones we haven't seen before.
 
 sub handle_entry {
-  
+
   my $msg  = shift;
   my $data = shift;
-  
+
   # Extract the email addressess, selecting only the SMTP ones, and
   # filter them so that we only get unique addresses
 
-  my @mails = grep { /^smtp:/i && !$gSeen{$_}++ } 
+  my @mails = grep { /^smtp:/i && !$gSeen{$_}++ }
                    $data->get_value( "proxyAddresses" );
- 
-  # If we found any, strip off the SMTP: identifier and print them out 
+
+  # If we found any, strip off the SMTP: identifier and print them out
   if( @mails ) {
     print map { s/^smtp:(.+)$/\L$1\n/i; $_ } @mails;
   }
 }
 
 # ------------------------------------------------------------------------
-# Handler for a Net::LDAP::Reference object.  This is a 'redirect' to 
+# Handler for a Net::LDAP::Reference object.  This is a 'redirect' to
 # another portion of the directory.  We simply extract the references
 # from the object and resubmit them to the handle_object function for
 # processing.
 
 sub handle_reference {
-  
+
   my $msg  = shift;
   my $data = shift;
-  
+
   foreach my $obj( $data->references() ) {
-  
+
     # Oooh, recursion!  Might be a reference to another reference, after all
     return handle_object( $msg, $obj );
   }
diff --git a/config/postfix/postfix.inc b/config/postfix/postfix.inc
index 8f27680d..99af671b 100755
--- a/config/postfix/postfix.inc
+++ b/config/postfix/postfix.inc
@@ -35,12 +35,15 @@ require_once("functions.inc");
 require_once("pkg-utils.inc");
 require_once("globals.inc");
 
-$pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
-if ($pf_version > 2.0)
-	define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m"));
-else
-  define('POSTFIX_LOCALBASE','/usr/local');
-
+$pfs_version = substr(trim(file_get_contents("/etc/version")),0,3);
+if (is_dir('/usr/pbi/postfix-' . php_uname("m"))) {
+	if ($pfs_version == 2.2)
+		define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m")."/local");
+	else
+		define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m"));
+} else {
+	define('POSTFIX_LOCALBASE','/usr/local');
+}
 
 $uname=posix_uname();
 if ($uname['machine']=='amd64')
diff --git a/config/postfix/postfix_queue.php b/config/postfix/postfix_queue.php
index 4f072eba..6f8a7e19 100755
--- a/config/postfix/postfix_queue.php
+++ b/config/postfix/postfix_queue.php
@@ -34,12 +34,15 @@ $uname=posix_uname();
 if ($uname['machine']=='amd64')
         ini_set('memory_limit', '250M');
 
-$pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
-if ($pf_version > 2.0)
-	define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m"));
-else
-  define('POSTFIX_LOCALBASE','/usr/local');
-
+$pfs_version = substr(trim(file_get_contents("/etc/version")),0,3);
+if (is_dir('/usr/pbi/postfix-' . php_uname("m"))) {
+	if ($pfs_version == 2.2)
+		define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m")."/local");
+	else
+		define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m"));
+} else {
+	define('POSTFIX_LOCALBASE','/usr/local');
+}
 function get_cmd(){
 	if ($_REQUEST['cmd'] =='mailq'){
 		#exec("/usr/local/bin/mailq" . escapeshellarg('^'.$m.$j." ".$hour.".*".$grep)." /var/log/maillog", $lists);
diff --git a/config/postfix/postfix_view_config.php b/config/postfix/postfix_view_config.php
index f82c9371..f50ae991 100644
--- a/config/postfix/postfix_view_config.php
+++ b/config/postfix/postfix_view_config.php
@@ -29,11 +29,15 @@
 */
 $shortcut_section = "postfix";
 require("guiconfig.inc");
-$pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
-if ($pf_version > 2.0)
-	define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m"));
-else
-  define('POSTFIX_LOCALBASE','/usr/local');
+$pfs_version = substr(trim(file_get_contents("/etc/version")),0,3);
+if (is_dir('/usr/pbi/postfix-' . php_uname("m"))) {
+	if ($pfs_version == 2.2)
+		define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m")."/local");
+	else
+		define('POSTFIX_LOCALBASE', '/usr/pbi/postfix-' . php_uname("m"));
+} else {
+	define('POSTFIX_LOCALBASE','/usr/local');
+}
 
 function get_file($file){
 	$files['main']=POSTFIX_LOCALBASE."/etc/postfix/main.cf";
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index c1384852..aa797bf9 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -415,7 +415,7 @@
 		<pkginfolink>https://forum.pfsense.org/index.php/topic,40622.0.html</pkginfolink>
 		<config_file>https://packages.pfsense.org/packages/config/postfix/postfix.xml</config_file>
 		<depends_on_package_pbi>postfix-2.11.0-##ARCH##.pbi</depends_on_package_pbi>
-		<version>2.10.2 pkg v.2.3.8</version>
+		<version>2.10.2 pkg v.2.3.9</version>
 		<status>Release</status>
 		<required_version>2.2</required_version>
 		<configurationfile>postfix.xml</configurationfile>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index cfd39999..c6e3651f 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -533,7 +533,7 @@
 		<depends_on_package>postfix-2.10.2,1.tbz</depends_on_package>
 		<depends_on_package>perl5-5.16.3_4.tbz</depends_on_package>
 		<depends_on_package_pbi>postfix-2.10.2-i386.pbi</depends_on_package_pbi>
-		<version>2.10.2 pkg v.2.3.7</version>
+		<version>2.10.2 pkg v.2.3.9</version>
 		<status>Release</status>
 		<required_version>2.1</required_version>
 		<configurationfile>postfix.xml</configurationfile>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index b7af100b..e8c75712 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -520,7 +520,7 @@
 		<depends_on_package>postfix-2.10.2,1.tbz</depends_on_package>
 		<depends_on_package>perl5-5.16.3_4.tbz</depends_on_package>
 		<depends_on_package_pbi>postfix-2.10.2-amd64.pbi</depends_on_package_pbi>
-		<version>2.10.2 pkg v.2.3.7</version>
+		<version>2.10.2 pkg v.2.3.9</version>
 		<status>Release</status>
 		<required_version>2.1</required_version>
 		<configurationfile>postfix.xml</configurationfile>