Sync values and order of configs in src/cdm and src/cdmrc.

src/cdm

@@ -58,16 +58,17 @@ fi
 
 # Default options.
 
-dialogrc=${dialogrc:-}
-countfrom=${countfrom:-0}
 binlist=${binlist:-()}
 namelist=${namelist:-()}
+flaglist=${flaglist:-()}
+dialogrc=${dialogrc:-}
+countfrom=${countfrom:-0}
+display=${display:-0}
 xtty=${xtty:-7}
+serverargs=${serverargs:-'-nolisten tcp'}
 locktty=${locktty:-no}
-display=${display:-0}
 consolekit=${consolekit:-yes}
 cktimeout=${cktimeout:-30}
-serverargs=${serverargs:-'-nolisten tcp'}
 
 # Offer all available sessions in /etc/X11/Sessions,
 # if binlist if not explicitly set in cdmrc.

src/cdmrc

@@ -46,11 +46,11 @@ xtty=7
 serverargs='-nolisten tcp'
 
 # Should cdm(1) stick to the specified display?
-locktty=yes
+locktty=no
 
 # Use consolekit for X session?
 consolekit=yes
 
 # Timeout for waiting for X session to register with consolekit.
-cktimeout=5
+cktimeout=30