--- mcore-src/trunk/mcore-tools/src/include/daemon.global.class.in	2014/01/10 23:51:35	2228
+++ mcore-src/trunk/mcore-tools/src/include/daemon.global.class.in	2015/09/17 07:27:10	2555
@@ -1,14 +1,20 @@
 # $Id$
 
 # loads client classes from $MCORE_LIBDIR
-load_client_classes()
+load_classes()
 {
-	local i
+	local class
+	local classtype
+
+	case $1 in
+		client|control) classtype="$1" ;;
+		*) die "Unknown classes type '$1'" ;;
+	esac
 
 	# client specific
-	for i in $(find ${MCORE_LIBDIR}/include -type f -name \*.client.class)
+	for class in $(find ${MCORE_LIBDIR}/include -type f -name \*.${classtype}.class)
 	do
-		source ${i} || eecho "error loading ${i}"
+		include ${class} || eecho "error loading ${class}"
 	done
 }
 
@@ -28,9 +34,7 @@
 	local pid
 	for pid in $(pidof sslsvd)
 	do
-		kill -15 ${pid}
-		sleep 1
-		kill -9 ${pid}
+		kill -SIGTERM ${pid}
 	done
 }
 
@@ -54,37 +58,59 @@
 # run_class $method $caller $argv1 $argv2 ... $argvN
 run_class()
 {
-	local method="$1"
-	local caller="$2"
+	local method="${GLOBAL_ARGV[0]}"
+	local caller="${GLOBAL_ARGV[1]}"
 	local class
 	local cmd
-	local argv
+	local i
+	local count
 
 	if valid_session
 	then
 		class="${caller%.*}"
 		cmd="${caller#*.}"
-		argv="${@/${caller}/}" # remove caller
-		argv="${argv/${method}/}" # remove method
 
-#		echo "method=${method}"
-# 		echo "caller=${caller}"
-# 		echo "class=${class}"
-# 		echo "cmd=${cmd}"
-# 		echo "argv=${argv}"
+		# copy GLOBAL_ARGV to CLASS_ARGV array without method and caller.class
+		unset CLASS_ARGV
+		count="${#GLOBAL_ARGV[*]}"
+		for (( i=2; i<count; i++ ))
+		do
+			CLASS_ARGV[${i}-2]="${GLOBAL_ARGV[${i}]}"
+		done
+
+#		decho "method=${method}"
+#		decho "caller=${caller}"
+#		decho "class=${class}"
+#		decho "cmd=${cmd}"
+#		decho "class argv=$(printf '\"%s\" ' ${CLASS_ARGV[*]}; printf '\n')"
 
 		# check if class.cmd exist
 		if [[ ! -z $(typeset -f "${method}"_"${class}"_"${cmd}") ]]
 		then
-			"${method}"_"${class}"_"${cmd}" ${argv}
+			"${method}"_"${class}"_"${cmd}"
 		else
- 			eecho "unkown method '${method}' . class '${class}' . cmd '${cmd}'"
+ 			eecho "unknown method '${method}' . class '${class}' . cmd '${cmd}'"
 		fi
 	else
 		invalid_session
 	fi
 }
 
+run_push_config()
+{
+	local config
+
+	for config in $(print_push_config)
+	do
+		if [[ -n $(typeset -f push_config_${config}) ]]
+		then
+			push_config_"${config}"
+		else
+			decho "no function 'push_config_${config}' for '${config}' found."
+		fi
+	done
+}
+
 help_topics()
 {
 	local i
@@ -96,6 +122,7 @@
 	mecho "\tget      - shows current value for a settings"
 	mecho "\tset      - sets value for a setting"
 	mecho "\tauth     - authenticate to the daemon"
+	mecho "\tcertauth - authenticate to the daemon via fingerprint"
 	mecho "\tprovide  - shows provides of a system"
 	mecho "\trequire  - verify plugin requirements"
 	mecho "\treload   - reloads all client classes plugins"
@@ -210,6 +237,52 @@
 	# do not escape, or CRLFS get printed to screen too
 	rvecho ${sorted}
 }
+
+is_provided()
+{
+	local feature="$1"
+	local i
+	local retval
+
+	retval=1
+	for i in $(print_provide)
+	do
+		if [[ ${i} = ${feature} ]]
+		then
+			retval=0
+			break
+		fi
+	done
+
+	return "${retval}"
+}
+
+push_config()
+{
+	local push_configs="$@"
+	local i
+
+	for i in ${push_configs}
+	do
+		# check for duplicate provides
+		if no_duplicate "${PUSH_CONFIG}" "${i}"
+		then
+			export PUSH_CONFIG="${PUSH_CONFIG} ${i}"
+		else
+			decho "duplicate push_config '${i}' detected!" 
+		fi
+	done
+}
+
+print_push_config()
+{
+	local sorted
+
+	# sort them alpabetically
+	sorted=$(for i in ${PUSH_CONFIG}; do echo "${i}"; done | sort)
+	# do not escape, or CRLFS get printed to screen too
+	rvecho ${sorted}
+}
 
 help_daemon_mroot()
 {