Add support for user-defined cdmrc.

Remove $userconfig and related code.

src/cdm

@@ -39,23 +39,14 @@ sysclientrc=/etc/X11/xinit/xinitrc
 # userserverrc=$HOME/.xserverrc
 # sysserverrc=/etc/X11/xinit/xserverrc
 
-# Source cdm configuration
+# Source cdm configurations.
-if [[ -f /etc/X11/cdm/cdmrc ]]; then
+
-	source /etc/X11/cdm/cdmrc
+if [[ -n "$1" ]]; then
-	count=0
+	source "$1"
-	while [[ ${count} -lt ${#userconfig[@]} ]]; do
+elif [[ -f "$HOME/.cdmrc" ]]; then
-		if [[ "$USER" == "${userconfig[${count}]}" ]]; then
+	source "$HOME/.cdmrc"
-			${userconfig[${count}]}
+elif [[ -f /etc/cdmrc ]]; then
-		fi
+	source /etc/cdmrc
-		let count=count+1
-	done
-	countfrom=${countfrom:-0}
-	cktimeout=${cktimeout:-30}
-else
-	eerror "A valid cdm configuration was not found!"
-	ewarn "Logging out."
-	sleep 3
-	exit 1
 fi
 
 # Offer all available sessions in /etc/X11/Sessions

src/cdmrc

@@ -32,34 +32,6 @@ suspendcommand='sudo pm-suspend'
 allowhibernate=no
 hibernatecommand='sudo pm-hibernate'
 
-# Set configuration for specific users?
-userconfig=(courtney)
-
-##########################
-### USER CONFIGURATION ###
-##########################
-
-courtney() {
-	# Set CDM theme
-	theme=lime
-
-	# List user allowed WM binary names
-	wmbinlist=(openbox-session)
-
-	# List user allowed WM display names
-	wmdisplist=(Openbox)
-
-	# Allow console login?
-	allowconsole=yes
-
-	# Allow shutdown?
-	allowshutdown=no
-
-	# Set specific display for user
-	# (Not honored unless locktty=yes)
-	# display=1
-}
-
 ############################
 ### SYSTEM CONFIGURATION ###
 ############################