Your message dated Sat, 24 Jul 2010 15:19:46 +0000
with message-id <[email protected]>
and subject line Bug#589757: fixed in xrdp 0.5.0~20100303cvs-5
has caused the Debian Bug report #589757,
regarding xrdp: Xrdp init.d script does not follow policy and is not
lsb-compliant
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
589757: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=589757
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: xrdp
Priority: important
Justification: Policy section 9.3.2
Tags: patch
The init.d script provided in the package for Xrdp does not comply with
Debian policy as it does not provide the force-reload action (see
policy section 9.3.2) even though it's 'usage' line claims to
Additionally:
- does not check the result of start-stop-daemon to show users when
it failed (if it did)
- fails to work for non-root users
- tests for errors too late (which generates many error messages when run
as non-root)
- it does not provide a 'status' target (not required, but useful)
- it does not force a 1-second wait for users when starting the daemons
Attached is a rewrite of the init.d script using LSB function which provides
both a 'status' target and better handling of errors. I'm providing both a
unified diff and the full init.d file proposed.
The 'status' target can be used by non-root users except for the xrdp daemon
since, for some reason, it creates its pidfile with a 077 umask and prevents
users from reading it. To sidestep this the init.d script adjusts the
permission of the pidfiles, however, for this to work properly, the xrdp
daemon needs to be patched with the attached patch to xrdp.c (which I'm also
sending upstream) which makes it create the pidfile as soon as it daemonizes
(and not wait 1000 msecs)
I would appreciate if you could take these changes and include them in your
next package upload.
Thank you
Regards
Javier
#!/bin/sh -e
#
# start/stop xrdp and sesman daemons
#
### BEGIN INIT INFO
# Provides: xrdp
# Required-Start: $network $remote_fs
# Required-Stop: $network $remote_fs
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: Start xrdp and sesman daemons
# Description: XRDP uses the Remote Desktop Protocol to present a
# graphical login to a remote client allowing connection
# to a VNC server or another RDP server.
### END INIT INFO
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
DAEMON=/usr/sbin/xrdp
PIDDIR=/var/run/xrdp
USERID=xrdp
RSAKEYS=/etc/xrdp/rsakeys.ini
NAME=xrdp
DESC="Remote Desktop Protocol server"
test -x $DAEMON || exit 0
. /lib/lsb/init-functions
check_root() {
if [ "$(id -u)" != "0" ]; then
log_failure_msg "You must be root to start, stop or restart $NAME."
exit 4
fi
}
running_pid() {
# Check if a given process pid's cmdline matches a given name
pid=$1
name=$2
[ -z "$pid" ] && return 1
[ ! -d /proc/$pid ] && return 1
cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1 |cut -d : -f 1`
# Is this the expected child?
[ "$cmd" != "$name" ] && return 1
return 0
}
running_proc() {
# Check if the process is running looking at /proc
# (works for all users)
pidfile=$1
binname=$2
# No pidfile, probably no daemon present
[ ! -r "$pidfile" ] && return 1
pid=`cat $pidfile`
running_pid $pid $binname || return 1
return 0
}
if [ -r /etc/default/$NAME ]; then
. /etc/default/$NAME
fi
# Tasks that can only be run as root
if [ "$(id -u)" = "0" ]; then
# Check for pid dir
if [ ! -d $PIDDIR ] ; then
mkdir $PIDDIR
fi
chown $USERID:$USERID $PIDDIR
# Check for rsa key
if [ ! -f $RSAKEYS ] || cmp $RSAKEYS /usr/share/doc/xrdp/rsakeys.ini > /dev/null; then
log_action_begin_msg "Generating xrdp RSA keys..."
(umask 077 ; xrdp-keygen xrdp $RSAKEYS)
chown $USERID:$USERID $RSAKEYS
if [ ! -f $RSAKEYS ] ; then
log_action_end_msg 1 "could not create $RSAKEYS"
exit 1
fi
log_action_end_msg 0 "done"
fi
fi
case "$1" in
start)
check_root
exitval=0
log_daemon_msg "Starting $DESC "
if running_proc $PIDDIR/$NAME.pid $DAEMON; then
log_progress_msg "$NAME apparently already running"
log_end_msg 0
exit 0
fi
log_progress_msg $NAME
start-stop-daemon --start --quiet --oknodo --pidfile $PIDDIR/$NAME.pid \
--chuid $USERID:$USERID --exec $DAEMON
exitval=$?
if [ "$SESMAN_START" = "yes" ] ; then
log_progress_msg "sesman"
start-stop-daemon --start --quiet --oknodo --pidfile $PIDDIR/xrdp-sesman.pid \
--exec /usr/sbin/xrdp-sesman
value=$?
[ $value -gt 0 ] && exitval=$value
fi
# Make pidfile readables for all users (for status to work)
[ -e $PIDDIR/xrdp-sesman.pid ] && chmod 0644 $PIDDIR/xrdp-sesman.pid
[ -e $PIDDIR/$NAME.pid ] && chmod 0644 $PIDDIR/$NAME.pid
# Note: Unfortunately, xrdp currently takes too long to create
# the pidffile unless properly patched
log_end_msg $exitval
;;
stop)
check_root
[ -n "$XRDP_UPGRADE" -a "$RESTART_ON_UPGRADE" = "no" ] && {
echo "Upgrade in progress, no restart of xrdp."
exit 0
}
exitval=0
log_daemon_msg "Stopping RDP Session manager "
log_progress_msg "sesman"
if running_proc $PIDDIR/xrdp-sesman.pid /usr/sbin/xrdp-sesman; then
start-stop-daemon --stop --quiet --oknodo --pidfile $PIDDIR/xrdp-sesman.pid \
--chuid $USERID:$USERID --exec /usr/sbin/xrdp-sesman
exitval=$?
else
log_progress_msg "apparently not running"
fi
log_progress_msg $NAME
if running_proc $PIDDIR/$NAME.pid $DAEMON; then
start-stop-daemon --stop --quiet --oknodo --pidfile $PIDDIR/$NAME.pid \
--exec $DAEMON
value=$?
[ $value -gt 0 ] && exitval=$value
else
log_progress_msg "apparently not running"
fi
log_end_msg $exitval
;;
restart|force-reload)
check_root
$0 stop
# Wait for things to settle down
sleep 1
$0 start
;;
reload)
log_warning_msg "Reloading $NAME daemon: not implemented, as the daemon"
log_warning_msg "cannot re-read the config file (use restart)."
;;
status)
exitval=0
log_daemon_msg "Checking status of $DESC" "$NAME"
if running_proc $PIDDIR/$NAME.pid $DAEMON; then
log_progress_msg "running"
log_end_msg 0
else
log_progress_msg "apparently not running"
log_end_msg 1 || true
exitval=1
fi
if [ "$SESMAN_START" = "yes" ] ; then
log_daemon_msg "Checking status of RDP Session Manager" "sesman"
if running_proc $PIDDIR/xrdp-sesman.pid /usr/sbin/xrdp-sesman; then
log_progress_msg "running"
log_end_msg 0
else
log_progress_msg "apparently not running"
log_end_msg 1 || true
exitval=1
fi
fi
exit $exitval
;;
*)
N=/etc/init.d/$NAME
echo "Usage: $N {start|stop|restart|force-reload|status}" >&2
exit 1
;;
esac
exit 0
--- xrdp.c.orig 2010-07-20 20:18:15.000000000 +0200
+++ xrdp.c 2010-07-20 20:18:48.000000000 +0200
@@ -537,17 +537,6 @@
/* exit, this is the main process */
g_exit(0);
}
- g_sleep(1000);
- g_file_close(0);
- g_file_close(1);
- g_file_close(2);
- g_file_open("/dev/null");
- g_file_open("/dev/null");
- g_file_open("/dev/null");
- /* end of daemonizing code */
- }
- if (!no_daemon)
- {
/* write the pid to file */
pid = g_getpid();
fd = g_file_open(pid_file); /* xrdp.pid */
@@ -563,6 +552,14 @@
g_file_write(fd, text, g_strlen(text));
g_file_close(fd);
}
+ g_sleep(1000);
+ g_file_close(0);
+ g_file_close(1);
+ g_file_close(2);
+ g_file_open("/dev/null");
+ g_file_open("/dev/null");
+ g_file_open("/dev/null");
+ /* end of daemonizing code */
}
#endif
g_threadid = tc_get_threadid();
--- init.d.orig 2010-07-20 18:58:43.000000000 +0200
+++ init.d 2010-07-20 20:41:27.000000000 +0200
@@ -1,14 +1,17 @@
-#! /bin/sh
+#!/bin/sh -e
#
# start/stop xrdp and sesman daemons
-
+#
### BEGIN INIT INFO
# Provides: xrdp
# Required-Start: $network $remote_fs
# Required-Stop: $network $remote_fs
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
-# Short-Description: start xrdp daemon
+# Short-Description: Start xrdp and sesman daemons
+# Description: XRDP uses the Remote Desktop Protocol to present a
+# graphical login to a remote client allowing connection
+# to a VNC server or another RDP server.
### END INIT INFO
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
@@ -17,65 +20,166 @@
USERID=xrdp
RSAKEYS=/etc/xrdp/rsakeys.ini
NAME=xrdp
-DESC=xrdp
+DESC="Remote Desktop Protocol server"
test -x $DAEMON || exit 0
+. /lib/lsb/init-functions
+
+check_root() {
+ if [ "$(id -u)" != "0" ]; then
+ log_failure_msg "You must be root to start, stop or restart $NAME."
+ exit 4
+ fi
+}
+
+running_pid() {
+# Check if a given process pid's cmdline matches a given name
+ pid=$1
+ name=$2
+ [ -z "$pid" ] && return 1
+ [ ! -d /proc/$pid ] && return 1
+ cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1 |cut -d : -f 1`
+ # Is this the expected child?
+ [ "$cmd" != "$name" ] && return 1
+ return 0
+}
+
+running_proc() {
+# Check if the process is running looking at /proc
+# (works for all users)
+ pidfile=$1
+ binname=$2
+
+ # No pidfile, probably no daemon present
+ [ ! -r "$pidfile" ] && return 1
+ pid=`cat $pidfile`
+
+ running_pid $pid $binname || return 1
+
+ return 0
+}
+
+
if [ -r /etc/default/$NAME ]; then
. /etc/default/$NAME
fi
-# Check for pid dir
-if [ ! -d $PIDDIR ] ; then
+# Tasks that can only be run as root
+if [ "$(id -u)" = "0" ]; then
+ # Check for pid dir
+ if [ ! -d $PIDDIR ] ; then
mkdir $PIDDIR
-fi
-chown $USERID:$USERID $PIDDIR
+ fi
+ chown $USERID:$USERID $PIDDIR
-# Check for rsa key
-if [ ! -f $RSAKEYS ] || cmp $RSAKEYS /usr/share/doc/xrdp/rsakeys.ini > /dev/null; then
- echo "Generating xrdp RSA keys..."
+ # Check for rsa key
+ if [ ! -f $RSAKEYS ] || cmp $RSAKEYS /usr/share/doc/xrdp/rsakeys.ini > /dev/null; then
+ log_action_begin_msg "Generating xrdp RSA keys..."
(umask 077 ; xrdp-keygen xrdp $RSAKEYS)
chown $USERID:$USERID $RSAKEYS
+ if [ ! -f $RSAKEYS ] ; then
+ log_action_end_msg 1 "could not create $RSAKEYS"
+ exit 1
+ fi
+ log_action_end_msg 0 "done"
+ fi
fi
-set -e
-
case "$1" in
start)
- echo -n "Starting $DESC: "
+ check_root
+ exitval=0
+ log_daemon_msg "Starting $DESC "
+ if running_proc $PIDDIR/$NAME.pid $DAEMON; then
+ log_progress_msg "$NAME apparently already running"
+ log_end_msg 0
+ exit 0
+ fi
+ log_progress_msg $NAME
start-stop-daemon --start --quiet --oknodo --pidfile $PIDDIR/$NAME.pid \
--chuid $USERID:$USERID --exec $DAEMON
- echo -n "$NAME"
- [ "$SESMAN_START" = "yes" ] && { \
+ exitval=$?
+ if [ "$SESMAN_START" = "yes" ] ; then
+ log_progress_msg "sesman"
start-stop-daemon --start --quiet --oknodo --pidfile $PIDDIR/xrdp-sesman.pid \
--exec /usr/sbin/xrdp-sesman
- echo -n " sesman"
- }
- echo "."
+ value=$?
+ [ $value -gt 0 ] && exitval=$value
+ fi
+ # Make pidfile readables for all users (for status to work)
+ [ -e $PIDDIR/xrdp-sesman.pid ] && chmod 0644 $PIDDIR/xrdp-sesman.pid
+ [ -e $PIDDIR/$NAME.pid ] && chmod 0644 $PIDDIR/$NAME.pid
+ # Note: Unfortunately, xrdp currently takes too long to create
+ # the pidffile unless properly patched
+ log_end_msg $exitval
;;
stop)
+ check_root
[ -n "$XRDP_UPGRADE" -a "$RESTART_ON_UPGRADE" = "no" ] && {
echo "Upgrade in progress, no restart of xrdp."
exit 0
}
- echo -n "Stopping $DESC: "
- start-stop-daemon --stop --quiet --oknodo --pidfile $PIDDIR/xrdp-sesman.pid \
- --chuid $USERID:$USERID --exec /usr/sbin/xrdp-sesman
- echo -n "sesman "
- start-stop-daemon --stop --quiet --oknodo --pidfile $PIDDIR/$NAME.pid \
+ exitval=0
+ log_daemon_msg "Stopping RDP Session manager "
+ log_progress_msg "sesman"
+ if running_proc $PIDDIR/xrdp-sesman.pid /usr/sbin/xrdp-sesman; then
+ start-stop-daemon --stop --quiet --oknodo --pidfile $PIDDIR/xrdp-sesman.pid \
+ --chuid $USERID:$USERID --exec /usr/sbin/xrdp-sesman
+ exitval=$?
+ else
+ log_progress_msg "apparently not running"
+ fi
+ log_progress_msg $NAME
+ if running_proc $PIDDIR/$NAME.pid $DAEMON; then
+ start-stop-daemon --stop --quiet --oknodo --pidfile $PIDDIR/$NAME.pid \
--exec $DAEMON
- sleep 1
- echo "$NAME."
+ value=$?
+ [ $value -gt 0 ] && exitval=$value
+ else
+ log_progress_msg "apparently not running"
+ fi
+ log_end_msg $exitval
;;
- restart)
+ restart|force-reload)
+ check_root
$0 stop
+ # Wait for things to settle down
+ sleep 1
$0 start
;;
+ reload)
+ log_warning_msg "Reloading $NAME daemon: not implemented, as the daemon"
+ log_warning_msg "cannot re-read the config file (use restart)."
+ ;;
+ status)
+ exitval=0
+ log_daemon_msg "Checking status of $DESC" "$NAME"
+ if running_proc $PIDDIR/$NAME.pid $DAEMON; then
+ log_progress_msg "running"
+ log_end_msg 0
+ else
+ log_progress_msg "apparently not running"
+ log_end_msg 1 || true
+ exitval=1
+ fi
+ if [ "$SESMAN_START" = "yes" ] ; then
+ log_daemon_msg "Checking status of RDP Session Manager" "sesman"
+ if running_proc $PIDDIR/xrdp-sesman.pid /usr/sbin/xrdp-sesman; then
+ log_progress_msg "running"
+ log_end_msg 0
+ else
+ log_progress_msg "apparently not running"
+ log_end_msg 1 || true
+ exitval=1
+ fi
+ fi
+ exit $exitval
+ ;;
*)
N=/etc/init.d/$NAME
- # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
- echo "Usage: $N {start|stop|restart|force-reload}" >&2
+ echo "Usage: $N {start|stop|restart|force-reload|status}" >&2
exit 1
;;
esac
signature.asc
Description: Digital signature
--- End Message ---
--- Begin Message ---
Source: xrdp
Source-Version: 0.5.0~20100303cvs-5
We believe that the bug you reported is fixed in the latest version of
xrdp, which is due to be installed in the Debian FTP archive:
xrdp_0.5.0~20100303cvs-5.debian.tar.gz
to main/x/xrdp/xrdp_0.5.0~20100303cvs-5.debian.tar.gz
xrdp_0.5.0~20100303cvs-5.dsc
to main/x/xrdp/xrdp_0.5.0~20100303cvs-5.dsc
xrdp_0.5.0~20100303cvs-5_amd64.deb
to main/x/xrdp/xrdp_0.5.0~20100303cvs-5_amd64.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Vincent Bernat <[email protected]> (supplier of updated xrdp package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Sat, 24 Jul 2010 16:40:34 +0200
Source: xrdp
Binary: xrdp
Architecture: source amd64
Version: 0.5.0~20100303cvs-5
Distribution: unstable
Urgency: low
Maintainer: Vincent Bernat <[email protected]>
Changed-By: Vincent Bernat <[email protected]>
Description:
xrdp - Remote Desktop Protocol (RDP) server
Closes: 589757
Changes:
xrdp (0.5.0~20100303cvs-5) unstable; urgency=low
.
* Rewrite of init.d by Javier Fernández-Sanguino Peña to be LSB
compliant. Closes: #589757.
* Bump Standards-Version to 3.9.0.
Checksums-Sha1:
d32afbecb88936563da1bac0d2e6c052a6b8a85e 1293 xrdp_0.5.0~20100303cvs-5.dsc
b9877a6b3629412c8c5b6468da4eec0a2a5e7181 10455
xrdp_0.5.0~20100303cvs-5.debian.tar.gz
d265a25b1158c06504596fdf015e46ccfc72f6a1 269086
xrdp_0.5.0~20100303cvs-5_amd64.deb
Checksums-Sha256:
3ff9dd073c8059143279f3cc7f57c1e2b6523937347d3ab8f3e2f057a78d7e02 1293
xrdp_0.5.0~20100303cvs-5.dsc
9e568e145caad70e03b2ddecd4efac116084d45a7ec27d691551c48c959c6750 10455
xrdp_0.5.0~20100303cvs-5.debian.tar.gz
e18397a077e6faed1d48bafc6b439aae829a7b66733e4b5fa52551e771405a06 269086
xrdp_0.5.0~20100303cvs-5_amd64.deb
Files:
691a6cacacb8984e24f76188d3220922 1293 net optional xrdp_0.5.0~20100303cvs-5.dsc
f0d6bb375041695bcea55564d2ece3db 10455 net optional
xrdp_0.5.0~20100303cvs-5.debian.tar.gz
b1d75296dec542bc5c9da3b86c203a7d 269086 net optional
xrdp_0.5.0~20100303cvs-5_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iEYEARECAAYFAkxLAUYACgkQKFvXofIqeU6gUQCgxJqOlLxKei1kiN9MAMJsKpVN
CMAAoLPmCzBdtOW1+KbuHMzKr+IaW+2j
=hQ2W
-----END PGP SIGNATURE-----
--- End Message ---
