rev 3928 - trunk/packages/kdebase/debian/patches

[Christopher Martin]

Author: chrsmrtn
Date: 2006-06-09 16:27:51 +0000 (Fri, 09 Jun 2006)
New Revision: 3928

Modified:
   trunk/packages/kdebase/debian/patches/29_return_value_checks.diff
Log:
Sync the return_value_checks patch with our patch 26
(which allows faces to be read more easily). Now it applies.


Modified: trunk/packages/kdebase/debian/patches/29_return_value_checks.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/29_return_value_checks.diff	2006-06-09 15:46:52 UTC (rev 3927)
+++ trunk/packages/kdebase/debian/patches/29_return_value_checks.diff	2006-06-09 16:27:51 UTC (rev 3928)
@@ -47,25 +47,25 @@
    setenv("KDE_DEBUG", "true", 1);
 --- kde.orig/kdm/kfrontend/kgreeter.cpp
 +++ kde.patched/kdm/kfrontend/kgreeter.cpp
-@@ -251,7 +251,12 @@
- 	// XXX remove seteuid-voodoo when we run as nobody
- 	if (!(ps = getpwnam( "nobody" )))
- 		return;
+@@ -167,7 +167,12 @@
+ KGreeter::insertUser( const QImage &default_pix,
+                       const QString &username, struct passwd *ps )
+ {
 -	seteuid( ps->pw_uid );
-+        if (setegid( ps->pw_gid )) 
++        if (setegid( ps->pw_gid ))
 +                return;
 +        if (seteuid( ps->pw_uid )) {
 +                setegid(0);
 +                return;
 +        }
  
- 	QImage default_pix;
- 	if (userView) {
-@@ -318,6 +323,7 @@
+ 	if (userList)
+ 		userList->append( username );
+@@ -206,6 +211,7 @@
+ 	}
  
- 	// XXX remove seteuid-voodoo when we run as nobody
  	seteuid( 0 );
 +        setegid( 0 );
  }
  
- void
+ class KCStringList : public QValueList<QCString> {