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

[Christopher Martin]

Author: chrsmrtn
Date: 2006-06-12 20:52:23 +0000 (Mon, 12 Jun 2006)
New Revision: 3946

Modified:
   trunk/packages/kdebase/debian/patches/26_face_load.diff
Log:
Sync patch with latest (not in SVN) branch.


Modified: trunk/packages/kdebase/debian/patches/26_face_load.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/26_face_load.diff	2006-06-12 19:56:06 UTC (rev 3945)
+++ trunk/packages/kdebase/debian/patches/26_face_load.diff	2006-06-12 20:52:23 UTC (rev 3946)
@@ -1,41 +1,53 @@
 --- kde.orig/kdm/kfrontend/kgreeter.cpp
 +++ kde.patched/kdm/kfrontend/kgreeter.cpp
-@@ -167,6 +167,8 @@
+@@ -167,6 +167,13 @@
  KGreeter::insertUser( const QImage &default_pix,
                        const QString &username, struct passwd *ps )
  {
-+	seteuid( ps->pw_uid );
++        if (setegid( ps->pw_gid ))
++                return;
++        if (seteuid( ps->pw_uid )) {
++                setegid(0);
++                return;
++        }
 +
  	if (userList)
  		userList->append( username );
  	if (!userView)
-@@ -202,6 +204,8 @@
+@@ -202,6 +209,9 @@
  		realname.append( "\n" ).append( username );
  		new UserListViewItem( userView, realname, QPixmap( p ), username );
  	}
 +
-+	seteuid( 0 );
++        seteuid( 0 );
++        setegid( 0 );
  }
  
  class KCStringList : public QValueList<QCString> {
-@@ -248,10 +252,8 @@
+@@ -248,15 +258,8 @@
  {
  	struct passwd *ps;
  
 -	// XXX remove seteuid-voodoo when we run as nobody
  	if (!(ps = getpwnam( "nobody" )))
  		return;
--	seteuid( ps->pw_uid );
+-        if (setegid( ps->pw_gid )) 
+-                return;
+-        if (seteuid( ps->pw_uid )) {
+-                setegid(0);
+-                return;
+-        }
  
  	QImage default_pix;
  	if (userView) {
-@@ -315,9 +317,6 @@
+@@ -320,10 +323,6 @@
  		if (userList)
  			userList->sort();
  	}
 -
 -	// XXX remove seteuid-voodoo when we run as nobody
 -	seteuid( 0 );
+-        setegid( 0 );
  }
  
  void