From 5ab9a6d35da4cf3c2190dcff67bb4b5761ba472c Mon Sep 17 00:00:00 2001
From: Jaromir Capik <jcapik@redhat.com>
Date: Aug 05 2015 14:18:35 +0000
Subject: - Making mysql/postgresql policies optional (#1249109)


---

diff --git a/pure-ftpd.pureftpd.te b/pure-ftpd.pureftpd.te
index 76b9e70..84766f4 100644
--- a/pure-ftpd.pureftpd.te
+++ b/pure-ftpd.pureftpd.te
@@ -2,7 +2,7 @@ policy_module(pureftpd, 1.0)
 
 require {
 	type ftpd_t;
-};
+}
 
 # Read /var/run/utmp
 init_read_utmp(ftpd_t)
@@ -12,14 +12,18 @@ init_dontaudit_write_utmp(ftpd_t)
 # Network connect
 corenet_tcp_connect_mysqld_port(ftpd_t)
 # Socket file connect
-mysql_stream_connect(ftpd_t);
-mysql_rw_db_sockets(ftpd_t)
+optional_policy(`
+    mysql_stream_connect(ftpd_t)
+    mysql_rw_db_sockets(ftpd_t)
+')
 
 ### Allow connect to postgresql
 # Network connect
 corenet_tcp_connect_postgresql_port(ftpd_t)
 # Socket file connect
-postgresql_stream_connect(ftpd_t)
+optional_policy(`
+    postgresql_stream_connect(ftpd_t)
+')
 
 # Allow connect to ldap
 sysnet_use_ldap(ftpd_t)
diff --git a/pure-ftpd.spec b/pure-ftpd.spec
index 3ef0753..d438b33 100644
--- a/pure-ftpd.spec
+++ b/pure-ftpd.spec
@@ -1,6 +1,6 @@
 Name:       pure-ftpd
 Version:    1.0.42
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Lightweight, fast and secure FTP server
 
 Group:      System Environment/Daemons
@@ -242,6 +242,9 @@ fi
 
 
 %changelog
+* Wed Aug 05 2015 Jaromir Capik <jcapik@redhat.com> - 1.0.42-2
+- Making mysql/postgresql policies optional (#1249109)
+
 * Mon Jul 27 2015 Jaromir Capik <jcapik@redhat.com> - 1.0.42-1
 - Updating to 1.0.42 (#1236253)