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

List:       kde-commits
Subject:    branches/KDE/3.5/kdelibs/kinit
From:       Dirk Mueller <mueller () kde ! org>
Date:       2007-08-10 18:23:03
Message-ID: 1186770183.193369.9861.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 698691 by mueller:

fix consolekit support


 M  +0 -1      kinit.cpp  
 M  +10 -0     setproctitle.cpp  


--- branches/KDE/3.5/kdelibs/kinit/kinit.cpp #698690:698691
@@ -1755,7 +1755,6 @@
 
    /** Prepare to change process name **/
    kdeinit_initsetproctitle(argc, argv, envp);
-   kdeinit_setproctitle("kdeinit Starting up...");
    kdeinit_library_path();
    // Don't make our instance the global instance
    // (do it only after kdeinit_library_path, that one indirectly uses KConfig,
--- branches/KDE/3.5/kdelibs/kinit/setproctitle.cpp #698690:698691
@@ -173,6 +173,15 @@
 		else
 			continue;
 	}
+
+        /*
+         * On linux, we don't want to reuse the memory allocated for
+         * the environment, as there are tools that try to read our environment
+         * variables while we're running (ConsoleKit does that). 
+         * There is no way to move or resize it, so just not touchint it
+         * seems to be the only option
+         */
+#ifndef __linux__
 	for (i=0; envp[i] != NULL; i++)
 	{
 		if (LastArgv + 1 == envp[i])
@@ -180,6 +189,7 @@
 		else
 			continue;
 	}
+#endif
 }
 
 #if SPT_TYPE != SPT_BUILTIN
[prev in list] [next in list] [prev in thread] [next in thread]