=== modified file 'Makefile'
--- Makefile	2008-09-06 16:11:50 +0000
+++ Makefile	2008-09-06 16:31:49 +0000
@@ -47,10 +47,10 @@
 # DocBook-to-man post-processing to fix a \n escape bug
 MANPOST=sed --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
 
-PLUGINS=plugins.d/password-prompt plugins.d/password-request
+PLUGINS=plugins.d/password-prompt plugins.d/mandos-client
 PROGS=plugin-runner $(PLUGINS)
 DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
-	plugins.d/password-request.8mandos \
+	plugins.d/mandos-client.8mandos \
 	plugins.d/password-prompt.8mandos mandos.conf.5 \
 	mandos-clients.conf.5
 
@@ -81,12 +81,12 @@
 plugin-runner.8mandos: plugin-runner.xml overview.xml legalnotice.xml
 	$(DOCBOOKTOMAN)
 
-plugins.d/password-request.8mandos: plugins.d/password-request.xml \
+plugins.d/mandos-client.8mandos: plugins.d/mandos-client.xml \
 					mandos-options.xml \
 					overview.xml legalnotice.xml
 	$(DOCBOOKTOMAN)
 
-plugins.d/password-request: plugins.d/password-request.o
+plugins.d/mandos-client: plugins.d/mandos-client.o
 	$(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
 		$(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
@@ -109,7 +109,7 @@
 run-client: all keydir/seckey.txt keydir/pubkey.txt
 	./plugin-runner --plugin-dir=plugins.d \
 		--config-file=plugin-runner.conf \
-		--options-for=password-request:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
+		--options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt
 
 # Used by run-client
 keydir/seckey.txt keydir/pubkey.txt: mandos-keygen
@@ -171,7 +171,7 @@
 		plugins.d/password-prompt
 	install --mode=u=rwxs,go=rx \
 		--target-directory=$(PREFIX)/lib/mandos/plugins.d \
-		plugins.d/password-request
+		plugins.d/mandos-client
 	install --mode=u=rwx,go=rx \
 		--target-directory=$(PREFIX)/lib/mandos/plugins.d \
 		plugins.d/usplash
@@ -188,8 +188,8 @@
 		> $(MANDIR)/man8/plugin-runner.8mandos.gz
 	gzip --best --to-stdout plugins.d/password-prompt.8mandos \
 		> $(MANDIR)/man8/password-prompt.8mandos.gz
-	gzip --best --to-stdout plugins.d/password-request.8mandos \
-		> $(MANDIR)/man8/password-request.8mandos.gz
+	gzip --best --to-stdout plugins.d/mandos-client.8mandos \
+		> $(MANDIR)/man8/mandos-client.8mandos.gz
 # Post-installation stuff
 	-$(PREFIX)/sbin/mandos-keygen --dir "$(KEYDIR)"
 	update-initramfs -k all -u
@@ -213,7 +213,7 @@
 	-rm --force $(PREFIX)/sbin/mandos-keygen \
 		$(PREFIX)/lib/mandos/plugin-runner \
 		$(PREFIX)/lib/mandos/plugins.d/password-prompt \
-		$(PREFIX)/lib/mandos/plugins.d/password-request \
+		$(PREFIX)/lib/mandos/plugins.d/mandos-client \
 		$(PREFIX)/lib/mandos/plugins.d/usplash \
 		/usr/share/initramfs-tools/hooks/mandos \
 		/usr/share/initramfs-tools/conf-hooks.d/mandos \
@@ -221,7 +221,7 @@
 		$(MANDIR)/man8/plugin-runner.8mandos.gz \
 		$(MANDIR)/man8/mandos-keygen.8.gz \
 		$(MANDIR)/man8/password-prompt.8mandos.gz \
-		$(MANDIR)/man8/password-request.8mandos.gz
+		$(MANDIR)/man8/mandos-client.8mandos.gz
 	if [ "$(CONFDIR)" != "$(PREFIX)/lib/mandos" ]; then \
 		rm --force $(CONFDIR)/plugins.d/README; \
 	fi

=== modified file 'TODO'
--- TODO	2008-09-05 07:11:24 +0000
+++ TODO	2008-09-06 16:31:49 +0000
@@ -2,7 +2,7 @@
 
 * plugin-runner
 
-* password-request
+* mandos-client
 ** [#B] Temporarily lower kernel log level
    for less printouts during sucessfull boot.
 ** IPv4 support

=== modified file 'mandos-keygen.xml'
--- mandos-keygen.xml	2008-09-03 19:13:50 +0000
+++ mandos-keygen.xml	2008-09-06 16:31:49 +0000
@@ -3,7 +3,7 @@
 	"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY VERSION "1.0">
 <!ENTITY COMMANDNAME "mandos-keygen">
-<!ENTITY TIMESTAMP "2008-09-03">
+<!ENTITY TIMESTAMP "2008-09-06">
 ]>
 
 <refentry xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -159,7 +159,7 @@
     <para>
       <command>&COMMANDNAME;</command> is a program to generate the
       OpenPGP key used by
-      <citerefentry><refentrytitle>password-request</refentrytitle>
+      <citerefentry><refentrytitle>mandos-client</refentrytitle>
       <manvolnum>8mandos</manvolnum></citerefentry>.  The key is
       normally written to /etc/mandos for later installation into the
       initrd image, but this, and most other things, can be changed
@@ -479,7 +479,7 @@
       <manvolnum>5</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>mandos</refentrytitle>
       <manvolnum>8</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>password-request</refentrytitle>
+      <citerefentry><refentrytitle>mandos-client</refentrytitle>
       <manvolnum>8mandos</manvolnum></citerefentry>
     </para>
   </refsect1>

=== modified file 'mandos-options.xml'
--- mandos-options.xml	2008-09-03 05:04:40 +0000
+++ mandos-options.xml	2008-09-06 16:31:49 +0000
@@ -6,7 +6,7 @@
 This file is used by both mandos(8) and mandos.conf(5), since these
 options can be used both on the command line and in the config file.
 
-It is also used for some texts by password-request(8mandos).
+It is also used for some texts by mandos-client(8mandos).
 -->
 
 <section>

=== modified file 'mandos.xml'
--- mandos.xml	2008-09-05 16:24:33 +0000
+++ mandos.xml	2008-09-06 16:31:49 +0000
@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY VERSION "1.0">
 <!ENTITY COMMANDNAME "mandos">
-<!ENTITY TIMESTAMP "2008-09-05">
+<!ENTITY TIMESTAMP "2008-09-06">
 ]>
 
 <refentry xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -529,7 +529,7 @@
       </para>
       <para>
 	For more details on client-side security, see
-	<citerefentry><refentrytitle>password-request</refentrytitle>
+	<citerefentry><refentrytitle>mandos-client</refentrytitle>
 	<manvolnum>8mandos</manvolnum></citerefentry>.
       </para>
     </refsect2>
@@ -543,7 +543,7 @@
 	<manvolnum>5</manvolnum></citerefentry>, <citerefentry>
 	<refentrytitle>mandos.conf</refentrytitle>
 	<manvolnum>5</manvolnum></citerefentry>, <citerefentry>
-	<refentrytitle>password-request</refentrytitle>
+	<refentrytitle>mandos-client</refentrytitle>
 	<manvolnum>8mandos</manvolnum></citerefentry>, <citerefentry>
 	<refentrytitle>sh</refentrytitle><manvolnum>1</manvolnum>
       </citerefentry>

=== modified file 'plugin-runner.conf'
--- plugin-runner.conf	2008-09-05 07:11:24 +0000
+++ plugin-runner.conf	2008-09-06 16:31:49 +0000
@@ -2,8 +2,8 @@
 ## installed as "/etc/mandos/plugin-runner.conf", which will be copied
 ## to "/conf/conf.d/mandos/plugin-runner.conf" in the initrd.img file.
 ## 
-## The default network interface for password-request(8mandos) is
+## The default network interface for mandos-client(8mandos) is
 ## "eth0".  Uncomment this line and change it if necessary.
 ## 
 
-#--options-for=password-request:--interface=eth0
+#--options-for=mandos-client:--interface=eth0

=== modified file 'plugin-runner.xml'
--- plugin-runner.xml	2008-09-06 15:34:21 +0000
+++ plugin-runner.xml	2008-09-06 16:31:49 +0000
@@ -571,13 +571,13 @@
       <para>
 	Run plugins from a different directory, read a different
 	configuration file, and add two options to the
-	<citerefentry><refentrytitle >password-request</refentrytitle>
+	<citerefentry><refentrytitle >mandos-client</refentrytitle>
 	<manvolnum>8mandos</manvolnum></citerefentry> plugin:
       </para>
       <para>
 
 <!-- do not wrap this line -->
-<userinput>&COMMANDNAME;  --config-file=/etc/mandos/plugin-runner.conf --plugin-dir /usr/lib/mandos/plugins.d --options-for=password-request:--pubkey=/etc/keys/mandos/pubkey.txt,--seckey=/etc/keys/mandos/seckey.txt</userinput>
+<userinput>&COMMANDNAME;  --config-file=/etc/mandos/plugin-runner.conf --plugin-dir /usr/lib/mandos/plugins.d --options-for=mandos-client:--pubkey=/etc/keys/mandos/pubkey.txt,--seckey=/etc/keys/mandos/seckey.txt</userinput>
 
       </para>
     </informalexample>
@@ -625,7 +625,7 @@
       <manvolnum>8</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>password-prompt</refentrytitle>
       <manvolnum>8mandos</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>password-request</refentrytitle>
+      <citerefentry><refentrytitle>mandos-client</refentrytitle>
       <manvolnum>8mandos</manvolnum></citerefentry>
     </para>
   </refsect1>

=== renamed file 'plugins.d/password-request.c' => 'plugins.d/mandos-client.c'
--- plugins.d/password-request.c	2008-09-06 15:34:21 +0000
+++ plugins.d/mandos-client.c	2008-09-06 16:31:49 +0000
@@ -111,7 +111,7 @@
 
 bool debug = false;
 static const char mandos_protocol_version[] = "1";
-const char *argp_program_version = "password-request 1.0";
+const char *argp_program_version = "mandos-client 1.0";
 const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
 
 /* Used for passing in values through the Avahi callback functions */

=== renamed file 'plugins.d/password-request.xml' => 'plugins.d/mandos-client.xml'
--- plugins.d/password-request.xml	2008-09-04 14:12:10 +0000
+++ plugins.d/mandos-client.xml	2008-09-06 16:31:49 +0000
@@ -2,8 +2,8 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 	"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY VERSION "1.0">
-<!ENTITY COMMANDNAME "password-request">
-<!ENTITY TIMESTAMP "2008-09-04">
+<!ENTITY COMMANDNAME "mandos-client">
+<!ENTITY TIMESTAMP "2008-09-06">
 ]>
 
 <refentry xmlns:xi="http://www.w3.org/2001/XInclude">

=== modified file 'plugins.d/password-prompt.xml'
--- plugins.d/password-prompt.xml	2008-09-04 13:36:59 +0000
+++ plugins.d/password-prompt.xml	2008-09-06 16:31:49 +0000
@@ -3,7 +3,7 @@
 	"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY VERSION "1.0">
 <!ENTITY COMMANDNAME "password-prompt">
-<!ENTITY TIMESTAMP "2008-09-04">
+<!ENTITY TIMESTAMP "2008-09-06">
 ]>
 
 <refentry xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -290,7 +290,7 @@
     <para>
       <citerefentry><refentrytitle>crypttab</refentrytitle>
       <manvolnum>5</manvolnum></citerefentry>
-      <citerefentry><refentrytitle>password-request</refentrytitle>
+      <citerefentry><refentrytitle>mandos-client</refentrytitle>
       <manvolnum>8mandos</manvolnum></citerefentry>
       <citerefentry><refentrytitle>plugin-runner</refentrytitle>
       <manvolnum>8mandos</manvolnum></citerefentry>,