From c313144d04d5ac96a922dc11386b679af718f881f4ec84f3c4e51b6944914003 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <prusnak@opensuse.org>
Date: Fri, 7 Jan 2011 13:28:41 +0000
Subject: [PATCH] Accepting request 57266 from
 home:leonardocf:branches:security

OBS-URL: https://build.opensuse.org/request/show/57266
OBS-URL: https://build.opensuse.org/package/show/security/fail2ban?expand=0&rev=9
---
 fail2ban.changes   |  6 ++++++
 fail2ban.init      |  2 +-
 fail2ban.sysconfig | 18 +++++-------------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/fail2ban.changes b/fail2ban.changes
index 0a0ae49..8d25529 100644
--- a/fail2ban.changes
+++ b/fail2ban.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan  6 16:56:30 UTC 2011 - lchiquitto@novell.com
+
+- Use $FAIL2BAN_OPTIONS when starting (bnc#662495)
+- Clean up sysconfig file
+
 -------------------------------------------------------------------
 Tue Jul 27 20:39:41 UTC 2010 - cristian.rodriguez@opensuse.org
 
diff --git a/fail2ban.init b/fail2ban.init
index cc945cb..ee1aae4 100644
--- a/fail2ban.init
+++ b/fail2ban.init
@@ -66,7 +66,7 @@ case "$1" in
 	fi
 	## Start daemon with startproc(8). If this fails
 	## the return value is set appropriately by startproc.
-	startproc $FAIL2BAN_CLI -q start > /dev/null 2>&1
+	startproc $FAIL2BAN_CLI -q $FAIL2BAN_OPTIONS start > /dev/null 2>&1
 
 	# Remember status and be verbose
 	rc_status -v
diff --git a/fail2ban.sysconfig b/fail2ban.sysconfig
index 9b71cb3..c0560e3 100644
--- a/fail2ban.sysconfig
+++ b/fail2ban.sysconfig
@@ -1,18 +1,10 @@
-## Path:        System/Security/Fail2ban
-## Description: fail2ban options
-## Type:        string
-## Default:     fail2ban
+## Path:	System/Security/Fail2ban
+## Description:	fail2ban options
+## Type:	string
+## Default:	""
 ## ServiceReload: fail2ban
 ## ServiceRestart: fail2ban
 #
-IDENT="fail2ban"
-## Type:        string
-## Default:     "fail2ban daemon"
-DESCRIPTIVE="fail2ban daemon"
-## Type:        string
-## Default:     ""
+# Options for fail2ban
 #
-# change FAIL2BAN_OPTIONS for arguments of start of fail2ban
-# e.g.  FAIL2BAN_OPTIONS="-c /etc/fail2ban/fail2ban.conf"
 FAIL2BAN_OPTIONS=""
-