From 6cd98f7437e688fbc1436c9d671421215d99a4a7 Mon Sep 17 00:00:00 2001
From: Eugeni Dodonov <eugeni@mandriva.org>
Date: Tue, 24 Mar 2009 13:32:38 +0000
Subject: Using correct logger.

---
 cron-sh/promisc_check.sh |  2 +-
 cron-sh/security.sh      |  2 +-
 msec.init                | 74 ------------------------------------------------
 msec.logrotate           | 16 -----------
 4 files changed, 2 insertions(+), 92 deletions(-)
 delete mode 100755 msec.init
 delete mode 100644 msec.logrotate

diff --git a/cron-sh/promisc_check.sh b/cron-sh/promisc_check.sh
index da06f32..4df9c25 100755
--- a/cron-sh/promisc_check.sh
+++ b/cron-sh/promisc_check.sh
@@ -4,7 +4,7 @@
 
 Syslog() {
     if [[ ${SYSLOG_WARN} == yes ]]; then
-        logger -- "${1}"
+        logger -t msec -- "${1}"
     fi
 }
 
diff --git a/cron-sh/security.sh b/cron-sh/security.sh
index c1001aa..9d48da5 100755
--- a/cron-sh/security.sh
+++ b/cron-sh/security.sh
@@ -196,7 +196,7 @@ fi
 Syslog() {
     if [[ ${SYSLOG_WARN} == yes ]]; then
     while read line; do
-        logger -- "${line}"
+        logger -t msec -- "${line}"
     done < ${1}
     fi
 }
diff --git a/msec.init b/msec.init
deleted file mode 100755
index f10e7e4..0000000
--- a/msec.init
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/sh
-#
-# Enables MSEC policy on system startup
-#
-# description: Enables MSEC security policy on system startup
-# chkconfig: 345 13 20
-#
-### BEGIN INIT INFO
-# Provides: msec
-# Default-Start: 3 4 5
-# Short-Description: Enables MSEC security policy
-# Description: Enables MSEC security settings, defined by current policy
-### END INIT INFO
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-if [ ! -f /etc/security/msec/security.conf ] ; then
-	# no msec configuration, aborting
-	exit
-fi
-
-. /etc/security/msec/security.conf
-
-# See how we were called.
-case "$1" in
-  start)
-	if [ "$ENABLE_STARTUP_MSEC" = "yes" ]; then
-		gprintf "Enabling MSEC security policy"
-		/usr/sbin/msec -q
-		echo_success
-		echo
-	fi
-	if [ "$ENABLE_STARTUP_PERMS" = "yes" ]; then
-		gprintf "Setting and checking MSEC permissions"
-		/usr/sbin/msecperms -q
-		echo_success
-		echo
-	elif [ "$ENABLE_STARTUP_PERMS" = "enforce" ]; then
-		gprintf "Setting and enforcing MSEC permissions"
-		/usr/sbin/msecperms -q
-		echo_success
-		echo
-	fi
-	;;
-  stop)
-  	# nothing to do
-	;;
-  status)
-	if [ "$ENABLE_STARTUP_MSEC" = "yes" ]; then
-		gprintf "MSEC security policy on startup: enabled"
-	else
-		gprintf "MSEC security policy on startup: disabled"
-	fi
-	echo
-	if [ "$ENABLE_STARTUP_PERMS" = "yes" ]; then
-		gprintf "MSEC permissions on startup: enabled"
-	elif [ "$ENABLE_STARTUP_PERMS" = "enforce" ]; then
-		gprintf "MSEC permissions on startup: enforced"
-	else
-		gprintf "MSEC permissions on startup: disabled"
-	fi
-	echo
-	;;
-  restart)
-	$0 stop
-	$0 start
-	;;
-  *)
-	gprintf "Usage: %s\n" "$0 {start|stop|restart|status}"
-	exit 1
-esac
-
-exit 0
diff --git a/msec.logrotate b/msec.logrotate
deleted file mode 100644
index 38903b6..0000000
--- a/msec.logrotate
+++ /dev/null
@@ -1,16 +0,0 @@
-# We create the log files to keep logrotate quiet in the case where
-# uucico is not run at all between two log rotations. It would be nice if
-# logrotate could be configured to silently ignore the case of a log
-# file not existing
-
-/var/log/security.log {
-    create 644 root root
-	monthly
-	compress
-}
-
-# updating permissions on rotated logs
-sharedscripts
-postrotate
-	test -f /usr/sbin/msecperms && /usr/sbin/msecperms -q -e '/var/log/*'
-endscript
-- 
cgit v1.2.1