--- kdebase-3.3.1/kcontrol/kdm/background.cpp~	2004-11-18 17:57:21 +0300

+++ kdebase-3.3.1/kcontrol/kdm/background.cpp	2004-11-18 17:57:43 +0300

@@ -51,7 +51,7 @@ KBackground::KBackground(QWidget *parent

 		" This is done by running some program (possibly xsetroot) in the script"

 		" specified in the Setup= option in kdmrc (usually Xsetup).") );

     config->setGroup( "X-*-Greeter" );

-    m_simpleConf=new KSimpleConfig(config->readEntry( "BackgroundCfg",KDE_CONFDIR "/kdm/backgroundrc" ) );

+    m_simpleConf=new KSimpleConfig(config->readEntry( "BackgroundCfg",X11CONFDIR "/kdm/backgroundrc" ) );

     m_background = new BGDialog( this, m_simpleConf, false );

     connect(m_background, SIGNAL(changed(bool)), SIGNAL(changed(bool)));

--- kdebase-3.3.1/kcontrol/kdm/main.cpp~	2004-11-18 17:47:08 +0300

+++ kdebase-3.3.1/kcontrol/kdm/main.cpp	2004-11-18 17:48:03 +0300

@@ -149,7 +149,7 @@ KDModule::KDModule(QWidget *parent, cons

     kdWarning() << "user(s) '" << tgmapci.data().join(",")

 	<< "' have unknown GID " << tgmapci.key() << endl;

-  config = new KSimpleConfig( QString::fromLatin1( KDE_CONFDIR "/kdm/kdmrc" ));

+  config = new KSimpleConfig( QString::fromLatin1( X11CONFDIR "/kdm/kdmrc" ));

   QVBoxLayout *top = new QVBoxLayout(this);

   tab = new QTabWidget(this);

--- kdebase-3.3/kdm/kfrontend/kdmctl.c~	2004-09-30 17:38:05 +0400

+++ kdebase-3.3/kdm/kfrontend/kdmctl.c	2004-09-30 17:38:13 +0400

@@ -146,7 +146,7 @@ main( int argc, char **argv )

 {

 	char *dpy = getenv( "DISPLAY" );

 	const char *ctl = getenv( "DM_CONTROL" );

-	const char *cfg = KDE_CONFDIR "/kdm/kdmrc";

+	const char *cfg = X11CONFDIR "/kdm/kdmrc";

 	char *ptr;

 	int fd;

--- kdebase-3.3/kdm/kfrontend/config.def~	2004-09-30 17:31:24 +0400

+++ kdebase-3.3/kdm/kfrontend/config.def	2004-09-30 17:36:04 +0400

@@ -3,7 +3,7 @@

 #define RCVERMAJOR 2

 #define RCVERMINOR 2

-#define KDMCONF KDE_CONFDIR "/kdm"

+#define KDMCONF X11CONFDIR "/kdm"

 #define KDMDATA KDE_DATADIR "/kdm"

 #ifdef _AIX

@@ -13,10 +13,10 @@

 # define HALT_CMD	"/sbin/shutdown -h now"

 # define REBOOT_CMD	"/sbin/shutdown -r now"

 #elif defined(__SVR4)

-# define HALT_CMD	"/usr/sbin/halt"

-# define REBOOT_CMD	"/usr/sbin/reboot"

+# define HALT_CMD	"/sbin/poweroff"

+# define REBOOT_CMD	"/sbin/reboot"

 #else

-# define HALT_CMD	"/sbin/halt"

+# define HALT_CMD	"/sbin/poweroff"

 # define REBOOT_CMD	"/sbin/reboot"

 #endif

@@ -2055,7 +2055,7 @@ Description:

 Key: MinShowUID

 Type: int

-Default: 0

+Default: 500

 User: greeter(lowUserId)

 # will be overwritten

 Instance: #*/

--- kdebase-3.3/kdm/kfrontend/confproc.pl~	2004-09-30 17:45:26 +0400

+++ kdebase-3.3/kdm/kfrontend/confproc.pl	2004-09-30 17:45:38 +0400

@@ -515,7 +515,7 @@ while (<INFILE>) {

               $doc_ref .= "<para>Empty by default.</para>\n";

             } else {

               $ddflt =~ s/\"//g;

-              $ddflt =~ s,KDMCONF ,\${<envar>kde_confdir</envar>}/kdm,;

+              $ddflt =~ s,KDMCONF ,\${<envar>/etc/X11</envar>}/kdm,;

               $ddflt =~ s,KDMDATA ,\${<envar>kde_datadir</envar>}/kdm,;

               $ddflt =~ s,XBINDIR ,\${<envar>x_bindir</envar>},;

               $doc_ref .= "<para>The default is <quote>".$ddflt."</quote>.</para>\n";