From ba6565f6b08505fb70f8cec4abec09df42be25f5 Mon Sep 17 00:00:00 2001
From: Marcello Coutinho <marcellocoutinho@gmail.com>
Date: Tue, 18 Nov 2014 15:15:39 -0200
Subject: Mailscanner - remove 2.0 folder check

---
 config/mailscanner/mailscanner.inc | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'config/mailscanner')

diff --git a/config/mailscanner/mailscanner.inc b/config/mailscanner/mailscanner.inc
index b6bcc310..31c85a6a 100644
--- a/config/mailscanner/mailscanner.inc
+++ b/config/mailscanner/mailscanner.inc
@@ -1,8 +1,8 @@
 <?php
 /*
-	postfix.inc
+	mailscanner.inc
 	part of the Postfix package for pfSense
-	Copyright (C) 2011-2013 Marcello Coutinho
+	Copyright (C) 2011-2014 Marcello Coutinho
 	All rights reserved.
 
 	Redistribution and use in source and binary forms, with or without
@@ -33,10 +33,11 @@ require("globals.inc");
 #require("guiconfig.inc");
 
 $pf_version=substr(trim(file_get_contents("/etc/version")),0,3);
-if ($pf_version > 2.0)
-	define('MAILSCANNER_PREFIX', '/usr/pbi/mailscanner-' . php_uname("m"));
+define('MAILSCANNER_PREFIX', '/usr/pbi/mailscanner-' . php_uname("m"));
+if ($pf_version == "2.1")
+	define('MAILSCANNER_LOCALBASE', MAILSCANNER_PREFIX);
 else
-  define('MAILSCANNER_PREFIX','/usr/local');
+	define('MAILSCANNER_LOCALBASE', MAILSCANNER_PREFIX . '/local');
 
 $uname=posix_uname();
 if ($uname['machine']=='amd64')
-- 
cgit v1.2.3