[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/kdm/backend
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2010-02-28 20:38:55
Message-ID: 1267389535.079313.31778.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1097268 by ossi:

remove OpenBSD-specific auth file hack

now that ServerUID exists, this should be redundant.
it kinda never made sense anyway - whatever made the X server
run with non-root rights should have also made sure it has
access to this file's contents.

CCMAIL: espie@nerim.net

 M  +0 -14     auth.c  


--- trunk/KDE/kdebase/workspace/kdm/backend/auth.c #1097267:1097268
@@ -41,9 +41,6 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <stdlib.h>
-#ifdef __OpenBSD__
-#include <pwd.h>
-#endif
 
 #include <sys/ioctl.h>
 
@@ -366,9 +363,6 @@
 {
 	FILE *auth_file;
 	int i;
-#ifdef __OpenBSD__
-	struct passwd *x11;
-#endif
 
 	if (!d->authFile && d->clientAuthFile && *d->clientAuthFile)
 		strDup( &d->authFile, d->clientAuthFile );
@@ -385,14 +379,6 @@
 			return False;
 		}
 	}
-#ifdef __OpenBSD__
-	/* Give read capability to group _x11 */
-	if (!(x11 = getpwnam( "_x11" )))
-		logError( "Cannot find _x11 user\n" );
-	else
-		fchown( fileno( auth_file ), x11->pw_uid, x11->pw_gid );
-	endpwent();
-#endif
 	debug( "file: %s  auth: %p\n", d->authFile, auths );
 	for (i = 0; i < count; i++) {
 		/*
[prev in list] [next in list] [prev in thread] [next in thread]