[pkg-fso-commits] [SCM] Automatic Display Manager branch, pamhelper, updated. debian/0.1-41-g0270b18

[Enrico Zini]

The following commit has been merged in the pamhelper branch:
commit 0270b18b89782612def42794c99bcc0a3ecd7cd3
Author: Enrico Zini <enrico at enricozini.org>
Date:   Sun Feb 22 13:54:44 2009 +0000

    Exec the command in the subshell
    
    This gives us shell command line processing, but does not leave an extra shell process hanging around.

diff --git a/nodm.c b/nodm.c
index acc388a..e4fbbc9 100644
--- a/nodm.c
+++ b/nodm.c
@@ -317,9 +317,9 @@ void run_and_restart(const char* xinit, const char* xsession, const char* xoptio
 	const char* args[4];
 
 	if (xoptions != NULL)
-		snprintf(command, BUFSIZ, "%s %s -- %s", xinit, xsession, xoptions);
+		snprintf(command, BUFSIZ, "exec %s %s -- %s", xinit, xsession, xoptions);
 	else
-		snprintf(command, BUFSIZ, "%s %s", xinit, xsession);
+		snprintf(command, BUFSIZ, "exec %s %s", xinit, xsession);
 	command[BUFSIZ-1] = 0;
 
 	args[0] = "/bin/sh";

-- 
Automatic Display Manager