[pkg-fso-commits] [SCM] Automatic Display Manager branch, master, updated. debian/0.10-1-3-g2f593f3

[Enrico Zini]

The following commit has been merged in the master branch:
commit db829a5644c81fe0ee63049754a0b48244084088
Author: Enrico Zini <enrico at enricozini.org>
Date:   Wed Aug 17 13:54:46 2011 +0200

    do not force "-nolisten tcp". Closes: #635992

diff --git a/debian/changelog b/debian/changelog
index 771e99c..a7321fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
 nodm (0.11-1) unstable; urgency=low
 
   * New upstream version
+     - do not force "-nolisten tcp". Closes: #635992
   * Do not require $NODM_XINIT to exist in order to start: that env var is now
     ignored. Closes: #634901
   * Do not require that $NODM_XSESSION points to a valid script now: nodm can
     start without it
 
- -- Enrico Zini <enrico at debian.org>  Wed, 17 Aug 2011 13:35:43 +0200
+ -- Enrico Zini <enrico at debian.org>  Wed, 17 Aug 2011 13:39:20 +0200
 
 nodm (0.10-1) unstable; urgency=low
 
diff --git a/dm.c b/dm.c
index 119db29..b5434cc 100644
--- a/dm.c
+++ b/dm.c
@@ -254,8 +254,7 @@ int nodm_display_manager_parse_xcmdline(struct nodm_display_manager* s, const ch
     unsigned argc = 0;
     // +1 for the X server pathname, +1 for the display name,
     // +1 for the VT number, +1 for the trailing NULL
-    // +2 for '-nolisten tcp'
-    argv =(char**)malloc((toks->we_wordc + 6) * sizeof(char*));
+    argv =(char**)malloc((toks->we_wordc + 4) * sizeof(char*));
     if (argv == NULL)
     {
         return_code = E_OS_ERROR;
@@ -284,9 +283,6 @@ int nodm_display_manager_parse_xcmdline(struct nodm_display_manager* s, const ch
         ++argc;
     }
 
-    int nolisten_idx = -2;
-    bool has_nolisten_tcp = false;
-
     // Copy other args
     while (in_arg < toks->we_wordc)
     {
@@ -294,20 +290,9 @@ int nodm_display_manager_parse_xcmdline(struct nodm_display_manager* s, const ch
         if (sscanf(toks->we_wordv[in_arg], "vt%d", &vtn) == 1)
             // if vtN has been provided by the caller, disable VT allocation
             s->vt.conf_initial_vt = -1;
-        else if (strcmp(toks->we_wordv[in_arg], "-nolisten") == 0)
-            nolisten_idx = in_arg;
-        else if (strcmp(toks->we_wordv[in_arg], "tcp") == 0 && nolisten_idx == in_arg - 1)
-            has_nolisten_tcp = true;
-
 
         argv[argc++] = toks->we_wordv[in_arg++];
     }
-    // Append -nolisten tcp if it wasn't in the command line
-    if (!has_nolisten_tcp)
-    {
-        argv[argc++] = "-nolisten";
-        argv[argc++] = "tcp";
-    }
     argv[argc] = NULL;
 
     s->srv.argv = (const char**)argv;

-- 
Automatic Display Manager