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

[Enrico Zini]

The following commit has been merged in the pamhelper branch:
commit 9aa0ed2404ae0fa89b28843495e97f2992dd67d8
Author: Enrico Zini <enrico at enricozini.org>
Date:   Fri Feb 20 14:41:23 2009 +0000

    Read $NODM_COMMAND before setting up environment
    
    This is not a big change now, but if in the future we want to remove the NODM variables from the path, we can do so without breaking run_session

diff --git a/nodm.c b/nodm.c
index 33f9c33..81c85f0 100644
--- a/nodm.c
+++ b/nodm.c
@@ -117,6 +117,9 @@ static struct pam_conv conv = {
 /* User we are changing to */
 static char name[BUFSIZ];
 
+/* Command that we are running */
+static char command[BUFSIZ];
+
 static pam_handle_t *pamh = NULL;
 static int caught = 0;
 
@@ -199,17 +202,17 @@ static void catch_signals (int sig)
  * have been applied.  Some work was needed to get it integrated into
  * su.c from shadow.
  */
-static int run_shell (int* status)
+static int run_shell (const char* command, int* status)
 {
 	int child;
 	sigset_t ourset;
 	struct sigaction action;
-	char* args[5];
+	const char* args[5];
 
 	args[0] = "/bin/sh";
 	args[1] = "-l";
 	args[2] = "-c";
-	args[3] = getenv("NODM_COMMAND");
+	args[3] = command;
 	args[4] = NULL;
 
 	syslog (LOG_INFO, "Running %s %s %s '%s'", args[0], args[1], args[2], args[3]);
@@ -304,7 +307,7 @@ killed:
 	return -1;
 }
 
-void run_session()
+void run_session(const char* command)
 {
 	static int retry_times[] = { 0, 0, 30, 30, 60, 60, -1 };
 	int restart_count = 0;
@@ -317,7 +320,7 @@ void run_session()
 		time_t begin = time(NULL);
 		time_t end;
 		int status;
-		if (run_shell(&status))
+		if (run_shell(command, &status))
 			return;
 		end = time(NULL);
 
@@ -397,6 +400,12 @@ int main (int argc, char **argv)
 	else
 		STRFCPY(name, getenv("NODM_USER"));
 
+	/* Get the command that we should run */
+	if (getenv("NODM_COMMAND") == NULL)
+		strcpy(command, "/usr/bin/xinit /etc/X11/Xsession -- vt7 -nolisten tcp");
+	else
+		STRFCPY(command, getenv("NODM_COMMAND"));
+
 	ret = pam_start (NAME, name, &conv, &pamh);
 	if (ret != PAM_SUCCESS) {
 		syslog (LOG_ERR, "pam_start: error %d", ret);
@@ -501,7 +510,7 @@ int main (int argc, char **argv)
 	setenv ("LOGNAME", pwent.pw_name, 1);
 	chdir (pwent.pw_dir);
 
-	run_session();
+	run_session(command);
 
 	ret = pam_close_session (pamh, 0);
 	if (ret != PAM_SUCCESS) {

-- 
Automatic Display Manager