From: Carsten Lohrke <carlo@gentoo.org>
Date: Wed, 14 Jun 2006 21:19:55 +0000 (+0000)
Subject: Missed to commit patch.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=120279fd1f6658e3ce4c17866846af202582b4c9;p=gentoo.git

Missed to commit patch.
Package-Manager: portage-2.1
---

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index 22ea55497dd5..898333b465c2 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.287 2006/06/14 18:40:50 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.288 2006/06/14 21:18:53 carlo Exp $
+
+  14 Jun 2006; Carsten Lohrke <carlo@gentoo.org>
+  +files/post-3.5.0-kdebase-kdm.diff:
+  Missed to commit patch.
 
 *kdebase-3.5.3-r1 (14 Jun 2006)
 
diff --git a/kde-base/kdebase/files/post-3.5.0-kdebase-kdm.diff b/kde-base/kdebase/files/post-3.5.0-kdebase-kdm.diff
new file mode 100644
index 000000000000..129a10594be4
--- /dev/null
+++ b/kde-base/kdebase/files/post-3.5.0-kdebase-kdm.diff
@@ -0,0 +1,21 @@
+Index: kdm/backend/client.c
+===================================================================
+--- kdm/backend/client.c	(revision 547560)
++++ kdm/backend/client.c	(working copy)
+@@ -1537,16 +1542,6 @@ ReadDmrc()
+ 
+ 	if (!StrApp( &fname, p->pw_dir, "/.dmrc", (char *)0 ))
+ 		return GE_Error;
+-	if ((curdmrc = iniLoad( fname ))) {
+-		free( fname );
+-		return GE_Ok;
+-	}
+-
+-	if (errno != EACCES) {
+-		free( fname );
+-		return GE_NoFile;
+-	}
+-
+ 	if (pipe( pfd ))
+ 		return GE_Error;
+ 	if ((pid = Fork()) < 0) {
diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog
index bfee3d57e0f6..1f1f40826f80 100644
--- a/kde-base/kdm/ChangeLog
+++ b/kde-base/kdm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdm
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.56 2006/06/14 18:20:26 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.57 2006/06/14 21:19:55 carlo Exp $
+
+  14 Jun 2006; Carsten Lohrke <carlo@gentoo.org>
+  +files/post-3.5.0-kdebase-kdm.diff:
+  Missed to commit patch.
 
 *kdm-3.5.3-r1 (14 Jun 2006)
 *kdm-3.5.2-r1 (14 Jun 2006)
diff --git a/kde-base/kdm/files/post-3.5.0-kdebase-kdm.diff b/kde-base/kdm/files/post-3.5.0-kdebase-kdm.diff
new file mode 100644
index 000000000000..129a10594be4
--- /dev/null
+++ b/kde-base/kdm/files/post-3.5.0-kdebase-kdm.diff
@@ -0,0 +1,21 @@
+Index: kdm/backend/client.c
+===================================================================
+--- kdm/backend/client.c	(revision 547560)
++++ kdm/backend/client.c	(working copy)
+@@ -1537,16 +1542,6 @@ ReadDmrc()
+ 
+ 	if (!StrApp( &fname, p->pw_dir, "/.dmrc", (char *)0 ))
+ 		return GE_Error;
+-	if ((curdmrc = iniLoad( fname ))) {
+-		free( fname );
+-		return GE_Ok;
+-	}
+-
+-	if (errno != EACCES) {
+-		free( fname );
+-		return GE_NoFile;
+-	}
+-
+ 	if (pipe( pfd ))
+ 		return GE_Error;
+ 	if ((pid = Fork()) < 0) {