<strong>Report forwarded</strong> to <code>debian-bugs-dist@lists.debian.org, Stephen Early &lt;sde1000@debian.org&gt;</code>:<br>
<code>Bug#6610</code>; Package <code>xbase</code>.


debian-bugs-dist@lists.debian.orgStephen Early &lt;sde1000@debian.org&gt;

Sorry, this message was lost when this bug report was restored from a backup.


<strong>Acknowledgement sent</strong> to <code>aj@dungeon.inka.de (Andreas Jellinghaus)</code>:<br>
New bug report received and forwarded.  Copy sent to <code>Stephen Early &lt;sde1000@debian.org&gt;</code>.


aj@dungeon.inka.de (Andreas Jellinghaus)

Sorry, this message was lost when this bug report was restored from a backup.


Received: (at submit) by bugs.debian.org; 15 Jan 1997 16:05:20 +0000
Received: (qmail 8502 invoked from network); 15 Jan 1997 16:05:14 -0000
Received: from quechua.inka.de (HELO mail.ka.inka.de) (root@193.197.84.5)
  by master.debian.org with SMTP; 15 Jan 1997 16:05:12 -0000
Received: from uu.inka.de ([193.197.84.8]) by mail.ka.inka.de
	 with smtp (ident root using rfc1413) id m0vkXnT-0004IrC
	(Debian Smail-3.2 1996-Jul-4 #2); Wed, 15 Jan 1997 17:02:39 +0100 (MET)
Received: from dungeon.inka.de (aj@dungeon.inka.de) by uu.inka.de
	 with bsmtp (S3.1.29.1) id <m0vkXnS-000Dk9C>; Wed, 15 Jan 97 17:02 MET
Received: by dungeon.inka.de
	id m0vkXl7-0001GoC
	(Debian Smail-3.2 1996-Jul-4 #2); Wed, 15 Jan 1997 17:00:13 +0100 (MET)
Message-Id: <m0vkXl7-0001GoC@dungeon.inka.de>
From: aj@dungeon.inka.de (Andreas Jellinghaus)
Subject: xbase: start xdm-shadow if /etc/shadow exist
To: submit@bugs.debian.org
Date: Wed, 15 Jan 1997 17:00:12 +0100 (MET)
X-Mailer: ELM [version 2.4 PL25 PGP2]
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
Content-Length: 918       

Package: xbase
Version: 3.2-2


--- /etc/init.d/xdm.orig	Wed Jan 15 16:51:41 1997
+++ /etc/init.d/xdm	Wed Jan 15 16:52:53 1997
@@ -20,14 +20,25 @@
   start)
     if [ $run_xdm = 1 ]
     then
-      start-stop-daemon --start --verbose --exec /usr/bin/X11/xdm
+      if [ -f /etc/shadow ]
+      then
+        start-stop-daemon --start --verbose --exec /usr/bin/X11/xdm-shadow
+      else
+        start-stop-daemon --start --verbose --exec /usr/bin/X11/xdm
+      fi
     fi
     ;;
   stop)
     if [ $run_xdm = 1 ]
     then
-      start-stop-daemon --stop --verbose --pidfile /var/run/xdm-pid \
-	--exec /usr/bin/X11/xdm
+      if [ -f /etc/shadow ]
+      then
+        start-stop-daemon --stop --verbose --pidfile /var/run/xdm-pid \
+	  --exec /usr/bin/X11/xdm-shadow
+      else
+        start-stop-daemon --stop --verbose --pidfile /var/run/xdm-pid \
+	  --exec /usr/bin/X11/xdm
+      fi
     fi
     ;;
   *)



<strong>Information forwarded</strong> to <code>debian-bugs-dist@lists.debian.org, Stephen Early &lt;sde1000@debian.org&gt;</code>:<br>
<code>Bug#6610</code>; Package <code>xbase</code>.


debian-bugs-dist@lists.debian.orgStephen Early &lt;sde1000@debian.org&gt;

Sorry, this message was lost when this bug report was restored from a backup.


<strong>Acknowledgement sent</strong> to <code>marekm@i17linuxb.ists.pwr.wroc.pl (Marek Michalkiewicz)</code>:<br>
Extra info received and forwarded to list.  Copy sent to <code>Stephen Early &lt;sde1000@debian.org&gt;</code>.


marekm@i17linuxb.ists.pwr.wroc.pl (Marek Michalkiewicz)

Sorry, this message was lost when this bug report was restored from a backup.


Received: (at 6610) by bugs.debian.org; 15 Jan 1997 19:18:58 +0000
Received: (qmail 20012 invoked from network); 15 Jan 1997 19:18:53 -0000
Received: from i17linuxb.ists.pwr.wroc.pl (root@156.17.35.8)
  by master.debian.org with SMTP; 15 Jan 1997 19:18:48 -0000
Received: by i17linuxb.ists.pwr.wroc.pl
	id m0vkank-0007uPC
	(Debian Smail-3.2 1996-Jul-4 #2); Wed, 15 Jan 1997 20:15:08 +0100 (MET)
Message-Id: <m0vkank-0007uPC@i17linuxb.ists.pwr.wroc.pl>
From: marekm@i17linuxb.ists.pwr.wroc.pl (Marek Michalkiewicz)
Subject: Re: Bug#6610: xbase: start xdm-shadow if /etc/shadow exist
To: aj@dungeon.inka.de, 6610@bugs.debian.org
Date: Wed, 15 Jan 1997 20:15:07 +0100 (MET)
In-Reply-To: <m0vkXl7-0001GoC@dungeon.inka.de> from "Andreas Jellinghaus" at Jan 15, 97 05:00:12 pm
X-Mailer: ELM [version 2.4 PL25 PGP2]
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-2
Content-Transfer-Encoding: 8bit
Content-Length: 981       

Andreas Jellinghaus:
> Package: xbase
> Version: 3.2-2
> 
> 
> --- /etc/init.d/xdm.orig	Wed Jan 15 16:51:41 1997
> +++ /etc/init.d/xdm	Wed Jan 15 16:52:53 1997
> @@ -20,14 +20,25 @@
>    start)
>      if [ $run_xdm = 1 ]
>      then
> -      start-stop-daemon --start --verbose --exec /usr/bin/X11/xdm
> +      if [ -f /etc/shadow ]
> +      then
> +        start-stop-daemon --start --verbose --exec /usr/bin/X11/xdm-shadow
> +      else
> +        start-stop-daemon --start --verbose --exec /usr/bin/X11/xdm
> +      fi
>      fi
[...]

That's unnecessary.  Much simpler (xdm-shadow works with both
shadow and non-shadow passwords):

# mv /usr/X11R6/bin/xdm-shadow /usr/X11R6/bin/xdm

As a quick hack (if we don't feel like changing the Imakefiles),
the xdm-shadow binary could simply be moved in debian/tmp, just
before building the binary packages.  I reported this to the
XFree86 maintainers and they promised to fix it, so a quick hack
like this should be OK for now.

Marek