If $DISPLAY is set, don't restart kdm, wdm, and xdm by default; instead,

display a debconf error if they haven't been restarted.

11 files changed, 393 insertions, 223 deletions

diff --git a/changelog b/changelog
index 462ce889..87952943 100644
--- a/changelog
+++ b/changelog
@@ -15,8 +15,10 @@ pam (0.99.7.1-5) UNRELEASED; urgency=low
   * Fix up the comments in /etc/pam.d/common-password to make it clear that
     the options are specific to pam_unix.  Closes: #414559.
   * Patch 038: fix another thinko in the getline handling.
+  * If $DISPLAY is set, don't restart kdm, wdm, and xdm by default; instead,
+    display a debconf error if they haven't been restarted.
 
- -- Steve Langasek <vorlon@debian.org>  Sun, 02 Sep 2007 11:24:06 -0700
+ -- Steve Langasek <vorlon@debian.org>  Mon, 03 Sep 2007 14:01:41 -0700
 
 pam (0.99.7.1-4) unstable; urgency=low
 
diff --git a/libpam0g.postinst b/libpam0g.postinst
index 834e9e3e..c9f754db 100755
--- a/libpam0g.postinst
+++ b/libpam0g.postinst
@@ -52,10 +52,53 @@ filerc() {
     echo ""
 }
 
+installed_services() {
+    check="$@"
+
+    # Only get the ones that are installed, and configured
+    check=$(dpkg -s $check 2> /dev/null | egrep '^Package:|^Status:' | awk '{if ($1 ~ /^Package:/) { package=$2 } else if ($0 ~ /^Status: .* installed$/) { print package }}')
+
+    # some init scripts don't match the package names
+    check=$(echo $check | \
+	sed -e's/\bapache2-common\b/apache2/g' \
+	    -e's/\bat\b/atd/g' \
+	    -e's/\bdovecot-common\b/dovecot/g' \
+	    -e's/\bdante-server\b/danted/g' \
+	    -e's/\bexim4-base\b/exim4/g' \
+	    -e's/\bheartbeat-2\b/heartbeat/g' \
+	    -e's/\bhylafax-server\b/hylafax/g' \
+	    -e's/\bpartimage-server\b/partimaged/g' \
+	    -e's/\bsasl2-bin\b/saslauthd/g' \
+    )
+
+    for service in $check; do
+	if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+	   idl=$(ls /etc/init.d/${service} 2> /dev/null | head -n 1)
+	   if [ -n "$idl" ] && [ -x $idl ]; then
+		services="$service $services"
+	   else
+		echo "WARNING: init script for $service not found." >&2
+	   fi
+	else
+	    if [ -f /usr/share/file-rc/rc ] || [ -f /usr/lib/file-rc/rc ] && [ -f /etc/runlevel.conf ]; then
+		idl=$(filerc $rl $service)
+	    else
+		idl=$(ls /etc/rc${rl}.d/S??${service} 2> /dev/null | head -n 1)
+	    fi
+	    if [ -n "$idl" ] && [ -x $idl ]; then
+	        services="$service $services"
+	    fi
+	fi
+    done
+    echo "$services"
+}
+
 if [ "$1" = "configure" ]
 then
     if [ ! -z "$2" ]; then
 	if dpkg --compare-versions "$2" lt 0.99.7.1-3; then
+	    db_version 2.0
+
 	    echo -n "Checking for services that may need to be restarted..."
 
 	    check="apache2-common at bayonne cherokee courier-authdaemon"
@@ -63,53 +106,21 @@ then
 	    check="$check dante-server diald dovecot-common exim exim4-base"
 	    check="$check fcron fireflier-server freeradius gdm heartbeat"
 	    check="$check heartbeat-2 hylafax-server iiimf-server inn2"
-	    check="$check kannel kdm linesrv linesrv-mysql lsh-server"
+	    check="$check kannel linesrv linesrv-mysql lsh-server"
 	    check="$check muddleftpd netatalk nuauth partimage-server"
 	    check="$check perdition pgpool popa3d postgresql-7.4"
 	    check="$check postgresql-8.1 postgresql-8.2 proftpd pure-ftpd"
 	    check="$check pure-ftpd-ldap pure-ftpd-mysql"
 	    check="$check pure-ftpd-postgresql racoon samba sasl2-bin"
 	    check="$check sfs-server solid-pop3d squid squid3 tac-plus"
-	    check="$check vsftpd wdm wu-ftpd wzdftpd xdm xrdp yardradius"
-	    check="$check yaws"
-	    # Only get the ones that are installed, and configured
-	    check=$(dpkg -s $check 2> /dev/null | egrep '^Package:|^Status:' | awk '{if ($1 ~ /^Package:/) { package=$2 } else if ($0 ~ /^Status: .* installed$/) { print package }}')
-	    # some init scripts don't match the package names
-	    check=$(echo $check | \
-		sed -e's/\bapache2-common\b/apache2/g' \
-		    -e's/\bat\b/atd/g' \
-		    -e's/\bdovecot-common\b/dovecot/g' \
-		    -e's/\bdante-server\b/danted/g' \
-		    -e's/\bexim4-base\b/exim4/g' \
-		    -e's/\bheartbeat-2\b/heartbeat/g' \
-		    -e's/\bhylafax-server\b/hylafax/g' \
-		    -e's/\bpartimage-server\b/partimaged/g' \
-		    -e's/\bsasl2-bin\b/saslauthd/g' \
-	    )
+	    check="$check vsftpd wu-ftpd wzdftpd xrdp yardradius yaws"
+	    if [ -z "$DISPLAY" ]; then
+		check="$check kdm wdm xdm"
+	    fi
 
 	    echo "Checking init scripts..."
-	    for service in $check; do
-		if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-		   idl=$(ls /etc/init.d/${service} 2> /dev/null | head -n 1)
-		   if [ -n "$idl" ] && [ -x $idl ]; then
-			services="$service $services"
-		   else
-			echo "WARNING: init script for $service not found."
-		   fi
-		else
-		    if [ -f /usr/share/file-rc/rc ] || [ -f /usr/lib/file-rc/rc ] && [ -f /etc/runlevel.conf ]; then
-			idl=$(filerc $rl $service)
-		    else
-			idl=$(ls /etc/rc${rl}.d/S??${service} 2> /dev/null | head -n 1)
-		    fi
-		    if [ -n "$idl" ] && [ -x $idl ]; then
-		        services="$service $services"
-		    fi
-		fi
-	    done
+	    services=$(installed_services "$check")
 	    if [ -n "$services" ]; then
-		db_version 2.0
-
 		db_reset libpam0g/restart-services
 		db_set libpam0g/restart-services "$services"
 		db_input critical libpam0g/restart-services || true
@@ -161,7 +172,6 @@ then
 		    done
 		    echo
 		    if [ -n "$failed" ]; then
-			db_fset libpam0g/restart-failed seen false
 			db_subst libpam0g/restart-failed services "$failed"
 			db_input critical libpam0g/restart-failed || true
 			db_go || true
@@ -170,12 +180,28 @@ then
 		    fi
 		    echo
 		fi
-		# Shut down the frontend, to make sure none of the
-		# restarted services keep a connection open to it
-		db_stop
 	    else
 		echo "Nothing to restart."
 	    fi
+
+	    if [ -n "$DISPLAY" ]; then
+		dms=""
+		for service in kdm wdm xdm; do
+		    case "$services" in
+			*$service*)	;;
+			*)	dms="$dms $service"
+		    esac
+		done
+		services=$(installed_services "$dms")
+		if [ -n "$services" ]; then
+		    db_input critical libpam0g/xdm-needs-restart || true
+		    db_go || true
+		fi
+	    fi
+
+	    # Shut down the frontend, to make sure none of the
+	    # restarted services keep a connection open to it
+	    db_stop
 	fi # end upgrading and $2 lt 0.99.7.1-3
     fi # Upgrading
 fi
diff --git a/libpam0g.templates b/libpam0g.templates
index 8515b042..fe7b5e0e 100644
--- a/libpam0g.templates
+++ b/libpam0g.templates
@@ -6,16 +6,19 @@ _Description: Services to restart for PAM library upgrade:
  list of init.d scripts for services to be restarted now, and correct it
  if needed.
  .
- Among the services that require restarting are the display managers kdm,
- wdm, and xdm.  If you are upgrading from within an X session started with
- one of these display managers, restarting that service will terminate your
- X session.  It is recommended that you remove that service from the list
- here and restart it later at your convenience.
- .
  Some other services such as xscreensaver, gnome-screensaver, and xlockmore
  cannot be restarted for you.  You will not be able to authenticate to these
  services until you restart them manually.
 
+Template: libpam0g/xdm-needs-restart
+Type: error
+_Description: Display manager must be restarted manually
+ The kdm, wdm, and xdm display managers require a restart for the new
+ version of libpam, but restarting these services would terminate any X
+ session running inside.  Because the $DISPLAY variable is set in your
+ environment, these services have not been restarted for you.  You will
+ therefore need to restart them by hand before they will be usable again.
+
 Template: libpam0g/restart-failed
 Type: error
 #flag:translate!:3
diff --git a/po/cs.po b/po/cs.po
index 8c728032..2426df57 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam\n"
 "Report-Msgid-Bugs-To: vorlon@debian.org\n"
-"POT-Creation-Date: 2007-08-30 08:07-0700\n"
+"POT-Creation-Date: 2007-09-03 23:24-0700\n"
 "PO-Revision-Date: 2007-08-31 22:48+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -39,22 +39,6 @@ msgstr ""
 #. Description
 #: ../libpam0g.templates:1001
 msgid ""
-"Among the services that require restarting are the display managers kdm, "
-"wdm, and xdm.  If you are upgrading from within an X session started with "
-"one of these display managers, restarting that service will terminate your X "
-"session.  It is recommended that you remove that service from the list here "
-"and restart it later at your convenience."
-msgstr ""
-"Mezi službami vyžadujícími restart jsou i správci displejů kdm, wdm a xdm. "
-"Aktualizujete-li z X sezení spuštěného některým ze zmíněných programů, "
-"znamená to, že restart příslušné služby ukončí stávající X sezení.  V takovém "
-"případě doporučujeme službu ze seznamu odstranit a restartovat později, až "
-"pro to nastane vhodnější příležitost."
-
-#. Type: string
-#. Description
-#: ../libpam0g.templates:1001
-msgid ""
 "Some other services such as xscreensaver, gnome-screensaver, and xlockmore "
 "cannot be restarted for you.  You will not be able to authenticate to these "
 "services until you restart them manually."
@@ -66,12 +50,29 @@ msgstr ""
 #. Type: error
 #. Description
 #: ../libpam0g.templates:2001
+msgid "Display manager must be restarted manually"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../libpam0g.templates:2001
+msgid ""
+"The kdm, wdm, and xdm display managers require a restart for the new version "
+"of libpam, but restarting these services would terminate any X session "
+"running inside.  Because the $DISPLAY variable is set in your environment, "
+"these services have not been restarted for you.  You will therefore need to "
+"restart them by hand before they will be usable again."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../libpam0g.templates:3001
 msgid "Failure restarting some services for PAM upgrade"
 msgstr "Restartování některých služeb při aktualizaci PAMu selhalo"
 
 #. Type: error
 #. Description
-#: ../libpam0g.templates:2001
+#: ../libpam0g.templates:3001
 msgid ""
 "The following services could not be restarted for the PAM library upgrade:"
 msgstr ""
@@ -79,9 +80,22 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../libpam0g.templates:2001
+#: ../libpam0g.templates:3001
 msgid ""
 "You will need to start these manually by running '/etc/init.d/<service> "
 "start'."
 msgstr ""
 "Tyto služby budete muset spustit ručně příkazem '/etc/init.d/<služba> start'."
+
+#~ msgid ""
+#~ "Among the services that require restarting are the display managers kdm, "
+#~ "wdm, and xdm.  If you are upgrading from within an X session started with "
+#~ "one of these display managers, restarting that service will terminate "
+#~ "your X session.  It is recommended that you remove that service from the "
+#~ "list here and restart it later at your convenience."
+#~ msgstr ""
+#~ "Mezi službami vyžadujícími restart jsou i správci displejů kdm, wdm a "
+#~ "xdm. Aktualizujete-li z X sezení spuštěného některým ze zmíněných "
+#~ "programů, znamená to, že restart příslušné služby ukončí stávající X "
+#~ "sezení.  V takovém případě doporučujeme službu ze seznamu odstranit a "
+#~ "restartovat později, až pro to nastane vhodnější příležitost."
diff --git a/po/de.po b/po/de.po
index 3385cd7e..485e8070 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam 0.99.7.1-4\n"
 "Report-Msgid-Bugs-To: vorlon@debian.org\n"
-"POT-Creation-Date: 2007-08-30 08:07-0700\n"
+"POT-Creation-Date: 2007-09-03 23:24-0700\n"
 "PO-Revision-Date: 2007-08-30 22:38+0200\n"
 "Last-Translator: Sven Joachim <svenjoac@gmx.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -27,39 +27,22 @@ msgstr "Neu zu startende Dienste für das Upgrade der PAM-Bibliothek:"
 msgid ""
 "Most services that use PAM need to be restarted to use modules built for "
 "this new version of libpam.  Please review the following space-separated "
-"list of init.d scripts for services to be restarted now, and correct it "
-"if needed."
+"list of init.d scripts for services to be restarted now, and correct it if "
+"needed."
 msgstr ""
 "Die meisten Dienste, die PAM verwenden, müssen neu gestartet werden, um "
-"Module dieser neuen Version von libpam verwenden zu können. Bitte "
-"überprüfen Sie die folgende, Leerzeichen-getrennte Liste von init.d-"
-"Skripten für Dienste, die jetzt neu zu starten sind, und korrigieren Sie "
-"diese Liste nötigenfalls."
+"Module dieser neuen Version von libpam verwenden zu können. Bitte überprüfen "
+"Sie die folgende, Leerzeichen-getrennte Liste von init.d-Skripten für "
+"Dienste, die jetzt neu zu starten sind, und korrigieren Sie diese Liste "
+"nötigenfalls."
 
 #. Type: string
 #. Description
 #: ../libpam0g.templates:1001
 msgid ""
-"Among the services that require restarting are the display managers kdm, "
-"wdm, and xdm.  If you are upgrading from within an X session started with "
-"one of these display managers, restarting that service will terminate "
-"your X session.  It is recommended that you remove that service from the "
-"list here and restart it later at your convenience."
-msgstr ""
-"Unter den Diensten, die einen Neustart erfordern, sind die Display-"
-"Manager kdm, wdm und xdm. Falls Sie das Upgrade unter einer X-Sitzung "
-"durchführen, die von einem dieser Display-Manager gestartet wurde, wird "
-"der Neustart dieses Dienstes ihre X-Sitzung beenden. Es wird empfohlen, "
-"dass Sie diesen Dienst hier aus der Liste entfernen und ihn später neu "
-"starten, wenn es Ihnen passt."
-
-#. Type: string
-#. Description
-#: ../libpam0g.templates:1001
-msgid ""
-"Some other services such as xscreensaver, gnome-screensaver, and "
-"xlockmore cannot be restarted for you.  You will not be able to "
-"authenticate to these services until you restart them manually."
+"Some other services such as xscreensaver, gnome-screensaver, and xlockmore "
+"cannot be restarted for you.  You will not be able to authenticate to these "
+"services until you restart them manually."
 msgstr ""
 "Einige andere Dienste wie xscreensaver, gnome-screensaver und xlockmore "
 "können nicht automatisch neu gestartet werden. Sie werden sich gegenüber "
@@ -69,24 +52,55 @@ msgstr ""
 #. Type: error
 #. Description
 #: ../libpam0g.templates:2001
+msgid "Display manager must be restarted manually"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../libpam0g.templates:2001
+msgid ""
+"The kdm, wdm, and xdm display managers require a restart for the new version "
+"of libpam, but restarting these services would terminate any X session "
+"running inside.  Because the $DISPLAY variable is set in your environment, "
+"these services have not been restarted for you.  You will therefore need to "
+"restart them by hand before they will be usable again."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../libpam0g.templates:3001
 msgid "Failure restarting some services for PAM upgrade"
 msgstr "Fehler beim Neustart einiger Dienste für das PAM-Upgrade"
 
 #. Type: error
 #. Description
-#: ../libpam0g.templates:2001
+#: ../libpam0g.templates:3001
 msgid ""
 "The following services could not be restarted for the PAM library upgrade:"
 msgstr ""
-"Die folgenden Dienste konnten für das Upgrade der PAM-Bibliothek nicht "
-"neu gestartet werden:"
+"Die folgenden Dienste konnten für das Upgrade der PAM-Bibliothek nicht neu "
+"gestartet werden:"
 
 #. Type: error
 #. Description
-#: ../libpam0g.templates:2001
+#: ../libpam0g.templates:3001
 msgid ""
 "You will need to start these manually by running '/etc/init.d/<service> "
 "start'."
 msgstr ""
-"Sie müssen diese manuell neu starten, indem Sie »/etc/init.d/<Dienst> "
-"start« ausführen."
+"Sie müssen diese manuell neu starten, indem Sie »/etc/init.d/<Dienst> start« "
+"ausführen."
+
+#~ msgid ""
+#~ "Among the services that require restarting are the display managers kdm, "
+#~ "wdm, and xdm.  If you are upgrading from within an X session started with "
+#~ "one of these display managers, restarting that service will terminate "
+#~ "your X session.  It is recommended that you remove that service from the "
+#~ "list here and restart it later at your convenience."
+#~ msgstr ""
+#~ "Unter den Diensten, die einen Neustart erfordern, sind die Display-"
+#~ "Manager kdm, wdm und xdm. Falls Sie das Upgrade unter einer X-Sitzung "
+#~ "durchführen, die von einem dieser Display-Manager gestartet wurde, wird "
+#~ "der Neustart dieses Dienstes ihre X-Sitzung beenden. Es wird empfohlen, "
+#~ "dass Sie diesen Dienst hier aus der Liste entfernen und ihn später neu "
+#~ "starten, wenn es Ihnen passt."
diff --git a/po/es.po b/po/es.po
index cc796669..e1f41f07 100644
--- a/po/es.po
+++ b/po/es.po
@@ -33,7 +33,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam 0.79-4\n"
 "Report-Msgid-Bugs-To: vorlon@debian.org\n"
-"POT-Creation-Date: 2007-08-30 08:07-0700\n"
+"POT-Creation-Date: 2007-09-03 23:24-0700\n"
 "PO-Revision-Date: 2007-08-31 01:42+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -57,18 +57,11 @@ msgid ""
 "this new version of libpam.  Please review the following space-separated "
 "list of init.d scripts for services to be restarted now, and correct it if "
 "needed."
-msgstr "Es necesario reiniciar la mayoría de los servicios que utilizan PAM para que utilicen los módulos de esta versión de libpam. Por favor, revise la lista separada por espacios mostrada a continuación que indica los servicios a reiniciar ahora y corrígala si es necesario."
-
-#. Type: string
-#. Description
-#: ../libpam0g.templates:1001
-msgid ""
-"Among the services that require restarting are the display managers kdm, "
-"wdm, and xdm.  If you are upgrading from within an X session started with "
-"one of these display managers, restarting that service will terminate your X "
-"session.  It is recommended that you remove that service from the list here "
-"and restart it later at your convenience."
-msgstr "Entre los servicios que deben reiniciarse están los gestores de pantalla kdm, wdm y xdm. El reinicio del servicio terminará su sesión de X si está actualizando desde una sesión de X arrancada desde alguno de estos gestores. Se le recomienda eliminar el servicio de la lista y reiniciarlo más adelante cuando lo considere oportuno."
+msgstr ""
+"Es necesario reiniciar la mayoría de los servicios que utilizan PAM para que "
+"utilicen los módulos de esta versión de libpam. Por favor, revise la lista "
+"separada por espacios mostrada a continuación que indica los servicios a "
+"reiniciar ahora y corrígala si es necesario."
 
 #. Type: string
 #. Description
@@ -77,25 +70,62 @@ msgid ""
 "Some other services such as xscreensaver, gnome-screensaver, and xlockmore "
 "cannot be restarted for you.  You will not be able to authenticate to these "
 "services until you restart them manually."
-msgstr "No se podrán reiniciar algunos servicios como puedan ser «xscreensaver», «gnome-screensaver» y «xlockmore». No podrá autenticarse en estos servicios hasta que los reinicie manualmente."
+msgstr ""
+"No se podrán reiniciar algunos servicios como puedan ser «xscreensaver», "
+"«gnome-screensaver» y «xlockmore». No podrá autenticarse en estos servicios "
+"hasta que los reinicie manualmente."
+
+#. Type: error
+#. Description
+#: ../libpam0g.templates:2001
+msgid "Display manager must be restarted manually"
+msgstr ""
 
 #. Type: error
 #. Description
 #: ../libpam0g.templates:2001
+msgid ""
+"The kdm, wdm, and xdm display managers require a restart for the new version "
+"of libpam, but restarting these services would terminate any X session "
+"running inside.  Because the $DISPLAY variable is set in your environment, "
+"these services have not been restarted for you.  You will therefore need to "
+"restart them by hand before they will be usable again."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../libpam0g.templates:3001
 msgid "Failure restarting some services for PAM upgrade"
 msgstr "Fallo al reiniciar alguno de los servicios en la actualización de PAM"
 
 #. Type: error
 #. Description
-#: ../libpam0g.templates:2001
+#: ../libpam0g.templates:3001
 msgid ""
 "The following services could not be restarted for the PAM library upgrade:"
-msgstr "No se pudieron reiniciar los servicios indicados a continuación para la actualización de la librería de PAM:"
+msgstr ""
+"No se pudieron reiniciar los servicios indicados a continuación para la "
+"actualización de la librería de PAM:"
 
 #. Type: error
 #. Description
-#: ../libpam0g.templates:2001
+#: ../libpam0g.templates:3001
 msgid ""
 "You will need to start these manually by running '/etc/init.d/<service> "
 "start'."
-msgstr "Deberá arrancar manualmente estos servicios ejecutando «/etc/init.d/<servicio> start»."
+msgstr ""
+"Deberá arrancar manualmente estos servicios ejecutando «/etc/init.d/"
+"<servicio> start»."
+
+#~ msgid ""
+#~ "Among the services that require restarting are the display managers kdm, "
+#~ "wdm, and xdm.  If you are upgrading from within an X session started with "
+#~ "one of these display managers, restarting that service will terminate "
+#~ "your X session.  It is recommended that you remove that service from the "
+#~ "list here and restart it later at your convenience."
+#~ msgstr ""
+#~ "Entre los servicios que deben reiniciarse están los gestores de pantalla "
+#~ "kdm, wdm y xdm. El reinicio del servicio terminará su sesión de X si está "
+#~ "actualizando desde una sesión de X arrancada desde alguno de estos "
+#~ "gestores. Se le recomienda eliminar el servicio de la lista y reiniciarlo "
+#~ "más adelante cuando lo considere oportuno."
diff --git a/po/pt.po b/po/pt.po
index 88ccb88e..0dd4ecb4 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam 0.99.7.1-3\n"
 "Report-Msgid-Bugs-To: vorlon@debian.org\n"
-"POT-Creation-Date: 2007-08-30 08:07-0700\n"
+"POT-Creation-Date: 2007-09-03 23:24-0700\n"
 "PO-Revision-Date: 2007-09-01 13:24+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -41,50 +41,66 @@ msgstr ""
 #. Description
 #: ../libpam0g.templates:1001
 msgid ""
-"Among the services that require restarting are the display managers kdm, "
-"wdm, and xdm.  If you are upgrading from within an X session started with "
-"one of these display managers, restarting that service will terminate your X "
-"session.  It is recommended that you remove that service from the list here "
-"and restart it later at your convenience."
-msgstr ""
-"Entre os serviços que precisam ser reiniciados estão os gestores de 'display' "
-"kdm, wdm, e xdm. Se você está a actualizar de dentro duma sessão X iniciada "
-"por um destes gestores de 'display', reiniciar esse serviço irá terminar a "
-"sua sessão X. É recomendado que remova esse serviço desta lista aqui e o "
-"reinicie mais tarde quando lhe for conveniente."
-
-#. Type: string
-#. Description
-#: ../libpam0g.templates:1001
-msgid ""
 "Some other services such as xscreensaver, gnome-screensaver, and xlockmore "
 "cannot be restarted for you.  You will not be able to authenticate to these "
 "services until you restart them manually."
 msgstr ""
-"Outros serviços como o xscreensaver, gnome-screensaver, e xlockmore não podem "
-"ser reiniciados para si. Você não vai poder autenticar-se nestes serviços até "
-"que você os reinicie manualmente."
+"Outros serviços como o xscreensaver, gnome-screensaver, e xlockmore não "
+"podem ser reiniciados para si. Você não vai poder autenticar-se nestes "
+"serviços até que você os reinicie manualmente."
+
+#. Type: error
+#. Description
+#: ../libpam0g.templates:2001
+msgid "Display manager must be restarted manually"
+msgstr ""
 
 #. Type: error
 #. Description
 #: ../libpam0g.templates:2001
+msgid ""
+"The kdm, wdm, and xdm display managers require a restart for the new version "
+"of libpam, but restarting these services would terminate any X session "
+"running inside.  Because the $DISPLAY variable is set in your environment, "
+"these services have not been restarted for you.  You will therefore need to "
+"restart them by hand before they will be usable again."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../libpam0g.templates:3001
 msgid "Failure restarting some services for PAM upgrade"
 msgstr "Falha ao reiniciar alguns serviços para a actualização PAM"
 
 #. Type: error
 #. Description
-#: ../libpam0g.templates:2001
-msgid "The following services could not be restarted for the PAM library upgrade:"
+#: ../libpam0g.templates:3001
+msgid ""
+"The following services could not be restarted for the PAM library upgrade:"
 msgstr ""
 "Os seguintes serviços não puderam ser reiniciados para a actualização da "
 "biblioteca PAM:"
 
 #. Type: error
 #. Description
-#: ../libpam0g.templates:2001
+#: ../libpam0g.templates:3001
 msgid ""
 "You will need to start these manually by running '/etc/init.d/<service> "
 "start'."
 msgstr ""
 "Você precisa de iniciar manualmente estes serviços fazendo '/etc/init.d/"
 "<service> start'."
+
+#~ msgid ""
+#~ "Among the services that require restarting are the display managers kdm, "
+#~ "wdm, and xdm.  If you are upgrading from within an X session started with "
+#~ "one of these display managers, restarting that service will terminate "
+#~ "your X session.  It is recommended that you remove that service from the "
+#~ "list here and restart it later at your convenience."
+#~ msgstr ""
+#~ "Entre os serviços que precisam ser reiniciados estão os gestores de "
+#~ "'display' kdm, wdm, e xdm. Se você está a actualizar de dentro duma "
+#~ "sessão X iniciada por um destes gestores de 'display', reiniciar esse "
+#~ "serviço irá terminar a sua sessão X. É recomendado que remova esse "
+#~ "serviço desta lista aqui e o reinicie mais tarde quando lhe for "
+#~ "conveniente."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index bafac5cd..495d307e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam_0.99.7.1-4\n"
 "Report-Msgid-Bugs-To: vorlon@debian.org\n"
-"POT-Creation-Date: 2007-08-30 08:07-0700\n"
+"POT-Creation-Date: 2007-09-03 23:24-0700\n"
 "PO-Revision-Date: 2007-08-30 15:53-0300\n"
 "Last-Translator: Eder L. Marques <frolic@debian-ce.org>\n"
 "Language-Team: l10n Portuguese <debian-l10n-portuguese@lists.debian.org>\n"
@@ -41,22 +41,6 @@ msgstr ""
 #. Description
 #: ../libpam0g.templates:1001
 msgid ""
-"Among the services that require restarting are the display managers kdm, "
-"wdm, and xdm.  If you are upgrading from within an X session started with "
-"one of these display managers, restarting that service will terminate your X "
-"session.  It is recommended that you remove that service from the list here "
-"and restart it later at your convenience."
-msgstr ""
-"Entre os serviços que precisam ser reiniciados estão os gerenciadores de "
-"display kdm, wdm e xdm. Se você está atualizando dentro de uma sessão X "
-"iniciada por um destes gerenciadores de display, reiniciar o servico irá "
-"terminar com a sua sessão X. É recomendado que você remova o serviço da "
-"lista e reinicie-o mais tarde de acordo com a sua conveniência."
-
-#. Type: string
-#. Description
-#: ../libpam0g.templates:1001
-msgid ""
 "Some other services such as xscreensaver, gnome-screensaver, and xlockmore "
 "cannot be restarted for you.  You will not be able to authenticate to these "
 "services until you restart them manually."
@@ -68,12 +52,29 @@ msgstr ""
 #. Type: error
 #. Description
 #: ../libpam0g.templates:2001
+msgid "Display manager must be restarted manually"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../libpam0g.templates:2001
+msgid ""
+"The kdm, wdm, and xdm display managers require a restart for the new version "
+"of libpam, but restarting these services would terminate any X session "
+"running inside.  Because the $DISPLAY variable is set in your environment, "
+"these services have not been restarted for you.  You will therefore need to "
+"restart them by hand before they will be usable again."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../libpam0g.templates:3001
 msgid "Failure restarting some services for PAM upgrade"
 msgstr "Falha ao reiniciar alguns serviços para a atualização da PAM"
 
 #. Type: error
 #. Description
-#: ../libpam0g.templates:2001
+#: ../libpam0g.templates:3001
 msgid ""
 "The following services could not be restarted for the PAM library upgrade:"
 msgstr ""
@@ -82,9 +83,22 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../libpam0g.templates:2001
+#: ../libpam0g.templates:3001
 msgid ""
 "You will need to start these manually by running '/etc/init.d/<service> "
 "start'."
 msgstr ""
 "Você deverá iniciá-los manualmente executando '/etc/init.d/<serviço> start'."
+
+#~ msgid ""
+#~ "Among the services that require restarting are the display managers kdm, "
+#~ "wdm, and xdm.  If you are upgrading from within an X session started with "
+#~ "one of these display managers, restarting that service will terminate "
+#~ "your X session.  It is recommended that you remove that service from the "
+#~ "list here and restart it later at your convenience."
+#~ msgstr ""
+#~ "Entre os serviços que precisam ser reiniciados estão os gerenciadores de "
+#~ "display kdm, wdm e xdm. Se você está atualizando dentro de uma sessão X "
+#~ "iniciada por um destes gerenciadores de display, reiniciar o servico irá "
+#~ "terminar com a sua sessão X. É recomendado que você remova o serviço da "
+#~ "lista e reinicie-o mais tarde de acordo com a sua conveniência."
diff --git a/po/ru.po b/po/ru.po
index 2ea84d7e..30859c27 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.99.7.1-4\n"
 "Report-Msgid-Bugs-To: vorlon@debian.org\n"
-"POT-Creation-Date: 2007-08-30 08:07-0700\n"
+"POT-Creation-Date: 2007-09-03 23:24-0700\n"
 "PO-Revision-Date: 2007-09-01 09:32+0400\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -15,7 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Type: string
 #. Description
@@ -33,25 +34,9 @@ msgid ""
 "needed."
 msgstr ""
 "Чтобы задействовать новые версии модулей из libpam нужно перезапустить "
-"большинство сервисов, использующих PAM. Внимательно просмотрите "
-"список (элементы разделяются пробелом) сценариев сервисов из init.d, которые "
-"будут перезапущены и исправьте, если что не так."
-
-#. Type: string
-#. Description
-#: ../libpam0g.templates:1001
-msgid ""
-"Among the services that require restarting are the display managers kdm, "
-"wdm, and xdm.  If you are upgrading from within an X session started with "
-"one of these display managers, restarting that service will terminate your X "
-"session.  It is recommended that you remove that service from the list here "
-"and restart it later at your convenience."
-msgstr ""
-"Среди перезапускаемых сервисов есть менеджеры входа в систему: kdm, "
-"wdm и xdm. Если вы выполняете обновление из X-сессии и используется "
-"один из этих менеджеров, то перезапуск сервиса прервёт вашу X-сессию. "
-"Рекомендуется удалить такой сервис из списка и перезапустить его позже "
-"когда будет удобно."
+"большинство сервисов, использующих PAM. Внимательно просмотрите список "
+"(элементы разделяются пробелом) сценариев сервисов из init.d, которые будут "
+"перезапущены и исправьте, если что не так."
 
 #. Type: string
 #. Description
@@ -68,20 +53,52 @@ msgstr ""
 #. Type: error
 #. Description
 #: ../libpam0g.templates:2001
+msgid "Display manager must be restarted manually"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../libpam0g.templates:2001
+msgid ""
+"The kdm, wdm, and xdm display managers require a restart for the new version "
+"of libpam, but restarting these services would terminate any X session "
+"running inside.  Because the $DISPLAY variable is set in your environment, "
+"these services have not been restarted for you.  You will therefore need to "
+"restart them by hand before they will be usable again."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../libpam0g.templates:3001
 msgid "Failure restarting some services for PAM upgrade"
 msgstr "При обновлении PAM перезапуск некоторых сервисов завершился неудачно"
 
 #. Type: error
 #. Description
-#: ../libpam0g.templates:2001
-msgid "The following services could not be restarted for the PAM library upgrade:"
-msgstr "При обновлении библиотеки PAM не удалось перезапустить следующие сервисы:"
+#: ../libpam0g.templates:3001
+msgid ""
+"The following services could not be restarted for the PAM library upgrade:"
+msgstr ""
+"При обновлении библиотеки PAM не удалось перезапустить следующие сервисы:"
 
 #. Type: error
 #. Description
-#: ../libpam0g.templates:2001
+#: ../libpam0g.templates:3001
 msgid ""
 "You will need to start these manually by running '/etc/init.d/<service> "
 "start'."
-msgstr "Вам нужно перезапустить их вручную, выполнив '/etc/init.d/<серсис> start'."
+msgstr ""
+"Вам нужно перезапустить их вручную, выполнив '/etc/init.d/<серсис> start'."
 
+#~ msgid ""
+#~ "Among the services that require restarting are the display managers kdm, "
+#~ "wdm, and xdm.  If you are upgrading from within an X session started with "
+#~ "one of these display managers, restarting that service will terminate "
+#~ "your X session.  It is recommended that you remove that service from the "
+#~ "list here and restart it later at your convenience."
+#~ msgstr ""
+#~ "Среди перезапускаемых сервисов есть менеджеры входа в систему: kdm, wdm и "
+#~ "xdm. Если вы выполняете обновление из X-сессии и используется один из "
+#~ "этих менеджеров, то перезапуск сервиса прервёт вашу X-сессию. "
+#~ "Рекомендуется удалить такой сервис из списка и перезапустить его позже "
+#~ "когда будет удобно."
diff --git a/po/templates.pot b/po/templates.pot
index b9d2975e..81c456e2 100644
--- a/po/templates.pot
+++ b/po/templates.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: pam 0.99.7.1-4\n"
+"Project-Id-Version: pam 0.99.7.1-5\n"
 "Report-Msgid-Bugs-To: vorlon@debian.org\n"
-"POT-Creation-Date: 2007-08-30 08:07-0700\n"
+"POT-Creation-Date: 2007-09-03 23:24-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,17 +36,6 @@ msgstr ""
 #. Description
 #: ../libpam0g.templates:1001
 msgid ""
-"Among the services that require restarting are the display managers kdm, "
-"wdm, and xdm.  If you are upgrading from within an X session started with "
-"one of these display managers, restarting that service will terminate your X "
-"session.  It is recommended that you remove that service from the list here "
-"and restart it later at your convenience."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../libpam0g.templates:1001
-msgid ""
 "Some other services such as xscreensaver, gnome-screensaver, and xlockmore "
 "cannot be restarted for you.  You will not be able to authenticate to these "
 "services until you restart them manually."
@@ -55,19 +44,36 @@ msgstr ""
 #. Type: error
 #. Description
 #: ../libpam0g.templates:2001
-msgid "Failure restarting some services for PAM upgrade"
+msgid "Display manager must be restarted manually"
 msgstr ""
 
 #. Type: error
 #. Description
 #: ../libpam0g.templates:2001
 msgid ""
+"The kdm, wdm, and xdm display managers require a restart for the new version "
+"of libpam, but restarting these services would terminate any X session "
+"running inside.  Because the $DISPLAY variable is set in your environment, "
+"these services have not been restarted for you.  You will therefore need to "
+"restart them by hand before they will be usable again."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../libpam0g.templates:3001
+msgid "Failure restarting some services for PAM upgrade"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../libpam0g.templates:3001
+msgid ""
 "The following services could not be restarted for the PAM library upgrade:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../libpam0g.templates:2001
+#: ../libpam0g.templates:3001
 msgid ""
 "You will need to start these manually by running '/etc/init.d/<service> "
 "start'."
diff --git a/po/vi.po b/po/vi.po
index 73059de1..a6941133 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam\n"
 "Report-Msgid-Bugs-To: vorlon@debian.org\n"
-"POT-Creation-Date: 2007-08-30 08:07-0700\n"
+"POT-Creation-Date: 2007-09-03 23:24-0700\n"
 "PO-Revision-Date: 2007-08-31 21:13+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -16,60 +16,88 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.7b1\n"
 
-#: ../libpam0g.templates:1001
 #. Type: string
 #. Description
+#: ../libpam0g.templates:1001
 msgid "Services to restart for PAM library upgrade:"
 msgstr "Dịch vụ cần khởi chạy lại khi nâng cấp thư viện PAM:"
 
-#: ../libpam0g.templates:1001
 #. Type: string
 #. Description
+#: ../libpam0g.templates:1001
 msgid ""
 "Most services that use PAM need to be restarted to use modules built for "
 "this new version of libpam.  Please review the following space-separated "
 "list of init.d scripts for services to be restarted now, and correct it if "
 "needed."
-msgstr "Phần lớn dịch vụ sử dụng PAM cũng cần phải được khởi chạy lại để sử dụng các mô-đun được xây dựng cho phân vùng libpam mới này. Hãy xem lại danh sách định giới bằng dấu cách theo đây hiển thị các dịch vụ cần khởi chạy lại ngay bây giờ, và sửa chữa nếu cần thiết."
+msgstr ""
+"Phần lớn dịch vụ sử dụng PAM cũng cần phải được khởi chạy lại để sử dụng các "
+"mô-đun được xây dựng cho phân vùng libpam mới này. Hãy xem lại danh sách "
+"định giới bằng dấu cách theo đây hiển thị các dịch vụ cần khởi chạy lại ngay "
+"bây giờ, và sửa chữa nếu cần thiết."
 
-#: ../libpam0g.templates:1001
 #. Type: string
 #. Description
-msgid ""
-"Among the services that require restarting are the display managers kdm, "
-"wdm, and xdm.  If you are upgrading from within an X session started with "
-"one of these display managers, restarting that service will terminate your X "
-"session.  It is recommended that you remove that service from the list here "
-"and restart it later at your convenience."
-msgstr "Các dịch vụ cần khởi chạy lại bao gồm trình quản lý trình bày kđm, wdm và xdm. Nếu bạn đang nâng cấp từ bên trong phiên chạy X được bắt đầu bằng một của những trình quản lý trình bày này, việc khởi chạy lại dịch vụ đó sẽ cũng chấm dứt phiên chạy X của bạn. Khuyên bạn gỡ bỏ dịch vụ đó khỏi danh sách ở đây, rồi khởi chạy lại nó về sau."
-
 #: ../libpam0g.templates:1001
-#. Type: string
-#. Description
 msgid ""
 "Some other services such as xscreensaver, gnome-screensaver, and xlockmore "
 "cannot be restarted for you.  You will not be able to authenticate to these "
 "services until you restart them manually."
-msgstr "Một số dịch vụ khác như xscreensaver, gnome-screensaver, và xlockmore không thể được khởi chạy lại cho bạn.Bạn sẽ không thể xác thực được tới dịch vụ như vậy nếu bạn chưa tự khởi chạy lại nó."
+msgstr ""
+"Một số dịch vụ khác như xscreensaver, gnome-screensaver, và xlockmore không "
+"thể được khởi chạy lại cho bạn.Bạn sẽ không thể xác thực được tới dịch vụ "
+"như vậy nếu bạn chưa tự khởi chạy lại nó."
+
+#. Type: error
+#. Description
+#: ../libpam0g.templates:2001
+msgid "Display manager must be restarted manually"
+msgstr ""
 
+#. Type: error
+#. Description
 #: ../libpam0g.templates:2001
+msgid ""
+"The kdm, wdm, and xdm display managers require a restart for the new version "
+"of libpam, but restarting these services would terminate any X session "
+"running inside.  Because the $DISPLAY variable is set in your environment, "
+"these services have not been restarted for you.  You will therefore need to "
+"restart them by hand before they will be usable again."
+msgstr ""
+
 #. Type: error
 #. Description
+#: ../libpam0g.templates:3001
 msgid "Failure restarting some services for PAM upgrade"
 msgstr "Lỗi khởi chạy lại một số dịch vụ để nâng cấp PAM"
 
-#: ../libpam0g.templates:2001
 #. Type: error
 #. Description
+#: ../libpam0g.templates:3001
 msgid ""
 "The following services could not be restarted for the PAM library upgrade:"
-msgstr "Những dịch vụ theo đây không thể được khởi chạy lại để nâng cấp thư viện PAM:"
+msgstr ""
+"Những dịch vụ theo đây không thể được khởi chạy lại để nâng cấp thư viện PAM:"
 
-#: ../libpam0g.templates:2001
 #. Type: error
 #. Description
+#: ../libpam0g.templates:3001
 msgid ""
 "You will need to start these manually by running '/etc/init.d/<service> "
 "start'."
-msgstr "Bạn cần phải tự khởi chạy lại chúng bằng cách chạy lệnh « /etc/init.d/<tên_dịch_vụ> start »."
-""
+msgstr ""
+"Bạn cần phải tự khởi chạy lại chúng bằng cách chạy lệnh « /etc/init.d/"
+"<tên_dịch_vụ> start »."
+
+#~ msgid ""
+#~ "Among the services that require restarting are the display managers kdm, "
+#~ "wdm, and xdm.  If you are upgrading from within an X session started with "
+#~ "one of these display managers, restarting that service will terminate "
+#~ "your X session.  It is recommended that you remove that service from the "
+#~ "list here and restart it later at your convenience."
+#~ msgstr ""
+#~ "Các dịch vụ cần khởi chạy lại bao gồm trình quản lý trình bày kđm, wdm và "
+#~ "xdm. Nếu bạn đang nâng cấp từ bên trong phiên chạy X được bắt đầu bằng "
+#~ "một của những trình quản lý trình bày này, việc khởi chạy lại dịch vụ đó "
+#~ "sẽ cũng chấm dứt phiên chạy X của bạn. Khuyên bạn gỡ bỏ dịch vụ đó khỏi "
+#~ "danh sách ở đây, rồi khởi chạy lại nó về sau."