Repaired files and modes

Repaired init functions

lib/cache.lib.sh

@@ -1,5 +1,30 @@
 # Zaf cache related functions
 
+zaf_cache_init(){
+	[ -z "$ZAF_CACHE_DIR" ] && ZAF_CACHE_DIR=${ZAF_TMP_BASE}c
+	if [ -n "$ZAF_CACHE_DIR" ]; then
+		mkdir -p "$ZAF_CACHE_DIR"
+		if zaf_is_root; then
+			zaf_trc "Cache: Changing perms to $ZAF_CACHE_DIR (zabbix/$ZAF_ZABBIX_GID/0770)"
+			chown $ZAF_FILES_UID "$ZAF_CACHE_DIR"
+			chgrp $ZAF_FILES_GID "$ZAF_CACHE_DIR"
+			chmod $ZAF_FILES_UMASK "$ZAF_CACHE_DIR"
+		fi
+		if [ -w $ZAF_CACHE_DIR ]; then
+			zaf_trc "Cache: Removing stale entries"
+			(cd $ZAF_CACHE_DIR && find ./ -type f -name '*.info' -mmin +1 | \
+			while read line ; do
+				echo rm -f $line $(basename $line .info)
+			done 
+			)
+		else
+			zaf_err "Cache dir is not accessible! Become root or member of $ZAF_FILES_GID group!"
+		fi
+	else
+		zaf_err "Cache dir not set."
+	fi
+}
+
 zaf_cache_clean(){
 	if [ -n "$ZAF_CACHE_DIR" ]; then
 		zaf_wrn "Removing cache entries"
@@ -7,11 +32,7 @@ zaf_cache_clean(){
 	else
 		zaf_err "Cache dir not set."
 	fi
-	mkdir -p "$ZAF_CACHE_DIR"
-	if zaf_is_root; then
-		chmod 770 "$ZAF_CACHE_DIR"
-		chgrp $(id -g zabbix) "$ZAF_CACHE_DIR"
-	fi
+	zaf_cache_init
 }
 
 # Get cache key from requested param

lib/os.lib.sh

@@ -21,6 +21,9 @@ zaf_configure_os_freebsd() {
 }
 
 zaf_detect_system() {
+	ZAF_FILES_UID=zabbix
+	ZAF_FILES_GID=zabbix
+	ZAF_FILES_UMASK=0770
 	if which dpkg >/dev/null; then
 		ZAF_PKG=dpkg
 		ZAF_OS=$(lsb_release -is|zaf_tolower)

lib/preload.sh

@@ -9,26 +9,13 @@
 . ${ZAF_LIB_DIR}/zbxapi.lib.sh
 . ${ZAF_LIB_DIR}/cache.lib.sh
 
-[ -z "$ZAF_TMP_BASE" ] && ZAF_TMP_BASE=/tmp/zaf
-[ -z "$ZAF_TMP_DIR" ] && ZAF_TMP_DIR="${ZAF_TMP_BASE}-$(zaf_random)"
-[ -z "$ZAF_CACHE_DIR" ] && ZAF_CACHE_DIR=${ZAF_TMP_BASE}c
-
-rm -rf "${ZAF_TMP_DIR}"
-
-if ! [ -d "${ZAF_TMP_DIR}" ]; then
-	mkdir "${ZAF_TMP_DIR}"
+if ! type zaf_version >/dev/null; then
+	echo "Problem loading libraries?"
+	exit 2
 fi
-
-! [ -d "${ZAF_CACHE_DIR}" ] && mkdir "${ZAF_CACHE_DIR}"
-[ -z "$ZAF_DEBUG" ] && ZAF_DEBUG=1
-
-if [ "$ZAF_DEBUG" -le 3 ]; then
-	trap "rm -rf ${ZAF_TMP_DIR}" EXIT
-else
-	trap 'zaf_wrn "Leaving $ZAF_TMP_DIR" contents due to ZAF_DEBUG.' EXIT
-fi
-
-#trap 'touch /tmp/aaaa' ALARM
+zaf_debug_init
+zaf_tmp_init
+zaf_cache_init
 
 export ZAF_LIB_DIR
 export ZAF_TMP_DIR

lib/zaf.lib.sh

@@ -38,6 +38,12 @@ zaf_hlp() {
 	dl=$(expr $cols - $kl)
 	printf %-${kl}s%-${dl}s%b "$1" "$2" "\n"
 }
+# $1 if nonempty, log to stderr too
+zaf_debug_init() {
+	[ -z "$ZAF_DEBUG" ] && ZAF_DEBUG=1
+	export ZAF_DEBUG
+	[ -n "$1" ] && export ZAF_LOG_STDERR="-s"
+}
 
 zaf_version(){
 	echo $ZAF_VERSION
@@ -236,6 +242,23 @@ zaf_date_add() {
 	date -d "$1 seconds" "+%Y-%m-%d %H:%M:%S" 2>/dev/null || date -d "$(expr $(date +%s) + $1)" -D %s "+%Y-%m-%d %H:%M:%S"
 }
 
+zaf_tmp_init() {
+	[ -z "$ZAF_TMP_BASE" ] && ZAF_TMP_BASE=/tmp/zaf
+	ZAF_TMP_DIR="${ZAF_TMP_BASE}-$(zaf_random)"
+	mkdir -p $ZAF_TMP_DIR
+	if zaf_is_root; then
+		chown $ZAF_FILES_UID "$ZAF_TMP_DIR"
+		chgrp $ZAF_FILES_GID "$ZAF_TMP_DIR"
+		chmod $ZAF_FILES_UMASK "$ZAF_TMP_DIR"
+	fi
+	# If debug is on, do not remove tmp dir 
+	if [ "$ZAF_DEBUG" -le 3 ]; then
+		trap "rm -rf ${ZAF_TMP_DIR}" EXIT
+	else
+		trap 'zaf_wrn "Leaving $ZAF_TMP_DIR" contents due to ZAF_DEBUG.' EXIT
+	fi
+}
+
 # Create temp file and return its name
 # $1 prefix or empty
 zaf_tmpfile() {