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

List:       kde-commits
Subject:    KDE/kdebase/workspace/kdm
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2010-05-09 12:09:32
Message-ID: 20100509120932.25D7AAC8B1 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1124555 by ossi:

append additional x server args after the display name

solaris' server is a bit picky about argument order.

fixes bug 236170

 M  +2 -1      backend/server.c  
 M  +3 -0      config.def  


--- trunk/KDE/kdebase/workspace/kdm/backend/server.c #1124554:1124555
@@ -56,7 +56,6 @@
 #endif
 
 	if (!(argv = parseArgs( 0, d->serverCmd )) ||
-	    !(argv = parseArgs( argv, args )) ||
 	    !(argv = addStrArr( argv, d->name, -1 )))
 		exit( 47 );
 #ifdef HAVE_VTS
@@ -65,6 +64,8 @@
 	                        sprintf( vtstr, "vt%d", d->serverVT ) )))
 		exit( 47 );
 #endif
+	if (!(argv = parseArgs( argv, args )))
+		exit( 47 );
 
 	if (!changeUser( d->serverUID, d->authFile ))
 		exit( 49 );
--- trunk/KDE/kdebase/workspace/kdm/config.def #1124554:1124555
@@ -1363,6 +1363,9 @@
  This string is subject to word splitting.
 Description:
  The command line to start the &X-Server;, without display number and VT spec.
+ Note that with some &X-Server;s (in particular, OpenSolaris') it is necessary
+ to put most additional arguments into <option>ServerArgsLocal</option> and
+ <option>ServerArgsRemote</option> even if they are the same for both.
  This string is subject to word splitting.
  </para><para>
  The default is something reasonable for the system on which &kdm; was built,
[prev in list] [next in list] [prev in thread] [next in thread]