=== modified file 'Makefile'
--- Makefile	2010-09-13 05:56:48 +0000
+++ Makefile	2010-09-14 18:22:03 +0000
@@ -86,8 +86,9 @@
 	plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo \
 	plugins.d/plymouth
 CPROGS=plugin-runner $(PLUGINS)
-PROGS=mandos mandos-keygen mandos-ctl $(CPROGS)
+PROGS=mandos mandos-keygen mandos-ctl mandos-monitor $(CPROGS)
 DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
+	mandos-monitor.8 \
 	plugins.d/mandos-client.8mandos \
 	plugins.d/password-prompt.8mandos mandos.conf.5 \
 	plugins.d/usplash.8mandos plugins.d/splashy.8mandos \
@@ -132,6 +133,13 @@
 		 legalnotice.xml
 	$(DOCBOOKTOHTML)
 
+mandos-monitor.8: mandos-monitor.xml common.ent overview.xml \
+		legalnotice.xml
+	$(DOCBOOKTOMAN)
+mandos-monitor.8.xhtml: mandos-monitor.xml common.ent overview.xml \
+		 legalnotice.xml
+	$(DOCBOOKTOHTML)
+
 mandos.conf.5: mandos.conf.xml common.ent mandos-options.xml \
 		legalnotice.xml
 	$(DOCBOOKTOMAN)
@@ -178,6 +186,11 @@
 		--expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 		$@)
 
+mandos-monitor: Makefile
+	$(strip $(SED) --in-place \
+		--expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
+		$@)
+
 mandos.lsm: Makefile
 	$(strip $(SED) --in-place \
 		--expression='s/^\(Version:\).*/\1\t$(version)/' \
@@ -261,6 +274,10 @@
 install-server: doc
 	install --directory $(CONFDIR)
 	install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
+	install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
+		mandos-ctl
+	install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
+		mandos-monitor
 	install --mode=u=rw,go=r --target-directory=$(CONFDIR) \
 		mandos.conf
 	install --mode=u=rw --target-directory=$(CONFDIR) \
@@ -343,6 +360,8 @@
 
 uninstall-server:
 	-rm --force $(PREFIX)/sbin/mandos \
+		$(PREFIX)/sbin/mandos-ctl \
+		$(PREFIX)/sbin/mandos-monitor \
 		$(MANDIR)/man8/mandos.8.gz \
 		$(MANDIR)/man5/mandos.conf.5.gz \
 		$(MANDIR)/man5/mandos-clients.conf.5.gz

=== modified file 'mandos-monitor'
--- mandos-monitor	2010-09-12 03:08:51 +0000
+++ mandos-monitor	2010-09-14 18:22:03 +0000
@@ -325,10 +325,6 @@
 #             self.proxy.unpause()
 #         elif key == u"RET":
 #             self.open()
-#        elif key == u"+":
-#            self.proxy.Approve(True)
-#        elif key == u"-":
-#            self.proxy.Approve(False)
         else:
             return key
     
@@ -504,8 +500,8 @@
         """Toggle visibility of the log buffer."""
         self.log_visible = not self.log_visible
         self.rebuild()
-        self.log_message(u"Log visibility changed to: "
-                         + unicode(self.log_visible))
+        #self.log_message(u"Log visibility changed to: "
+        #                 + unicode(self.log_visible))
     
     def change_log_display(self):
         """Change type of log display.
@@ -516,7 +512,7 @@
             self.log_wrap = u"clip"
         for textwidget in self.log:
             textwidget.set_wrap_mode(self.log_wrap)
-        self.log_message(u"Wrap mode: " + self.log_wrap)
+        #self.log_message(u"Wrap mode: " + self.log_wrap)
     
     def find_and_remove_client(self, path, name):
         """Find an client from its object path and remove it.

=== added file 'mandos-monitor.xml'
--- mandos-monitor.xml	1970-01-01 00:00:00 +0000
+++ mandos-monitor.xml	2010-09-14 18:22:03 +0000
@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+	"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY COMMANDNAME "mandos-monitor">
+<!ENTITY TIMESTAMP "2010-09-14">
+<!ENTITY % common SYSTEM "common.ent">
+%common;
+]>
+
+<refentry xmlns:xi="http://www.w3.org/2001/XInclude">
+  <refentryinfo>
+    <title>Mandos Manual</title>
+    <!-- NWalsh’s docbook scripts use this to generate the footer: -->
+    <productname>Mandos</productname>
+    <productnumber>&version;</productnumber>
+    <date>&TIMESTAMP;</date>
+    <authorgroup>
+      <author>
+	<firstname>Björn</firstname>
+	<surname>Påhlsson</surname>
+	<address>
+	  <email>belorn@fukt.bsnet.se</email>
+	</address>
+      </author>
+      <author>
+	<firstname>Teddy</firstname>
+	<surname>Hogeborn</surname>
+	<address>
+	  <email>teddy@fukt.bsnet.se</email>
+	</address>
+      </author>
+    </authorgroup>
+    <copyright>
+      <year>2010</year>
+      <holder>Teddy Hogeborn</holder>
+      <holder>Björn Påhlsson</holder>
+    </copyright>
+    <xi:include href="legalnotice.xml"/>
+  </refentryinfo>
+  
+  <refmeta>
+    <refentrytitle>&COMMANDNAME;</refentrytitle>
+    <manvolnum>8</manvolnum>
+  </refmeta>
+  
+  <refnamediv>
+    <refname><command>&COMMANDNAME;</command></refname>
+    <refpurpose>
+      Text-based GUI to control the Mandos server.
+    </refpurpose>
+  </refnamediv>
+  
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&COMMANDNAME;</command>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  
+  <refsect1 id="description">
+    <title>DESCRIPTION</title>
+    <para>
+      <command>&COMMANDNAME;</command> is an interactive program to
+      monitor and control the operations of the Mandos server (see
+      <citerefentry><refentrytitle>mandos</refentrytitle><manvolnum
+      >8</manvolnum></citerefentry>).
+    </para>
+  </refsect1>
+  
+  <refsect1 id="purpose">
+    <title>PURPOSE</title>
+    <para>
+      The purpose of this is to enable <emphasis>remote and unattended
+      rebooting</emphasis> of client host computer with an
+      <emphasis>encrypted root file system</emphasis>.  See <xref
+      linkend="overview"/> for details.
+    </para>
+  </refsect1>
+  
+  <refsect1 id="overview">
+    <title>OVERVIEW</title>
+    <xi:include href="overview.xml"/>
+    <para>
+      This program is used to monitor and control the Mandos server.
+      In particular, it can be used to approve Mandos clients which
+      have been configured to require approval.  It also shows all
+      significant events reported by the Mandos server.
+    </para>
+  </refsect1>
+  
+  <refsect1 id="keys">
+    <title>KEYS</title>
+    <para>
+      This program is used to monitor and control the Mandos server.
+      In particular, it can be used to approve Mandos clients which
+      have been configured to require approval.  It also shows all
+      significant events reported by the Mandos server.
+    </para>
+    <table>
+      <title>Global Keys</title><tgroup cols="2"><thead>
+      <row>
+	<entry>Keys</entry>
+	<entry>Function</entry>
+      </row>
+      </thead><tbody>
+      <row>
+	<entry>q, Q</entry>
+	<entry>Quit</entry>
+      </row>
+      <row>
+	<entry>Ctrl-L</entry>
+	<entry>Redraw screen</entry>
+      </row>
+      <row>
+	<entry>?, F1</entry>
+	<entry>Show help</entry>
+      </row>
+      <row>
+	<entry>l, D</entry>
+	<entry>Toggle log window</entry>
+      </row>
+      <row>
+	<entry>TAB</entry>
+	<entry>Switch window</entry>
+      </row>
+      <row>
+	<entry>w, i</entry>
+	<entry>Toggle log window line wrap</entry>
+      </row>
+      <row>
+	<entry>Up, Ctrl-P, k</entry>
+	<entry>Move up a line</entry>
+      </row>
+      <row>
+	<entry>Down, Ctrl-N, j</entry>
+	<entry>Move down a line</entry>
+      </row>
+      <row>
+	<entry>PageUp, Meta-V, b</entry>
+	<entry>Move up a page</entry>
+      </row>
+      <row>
+	<entry>PageDown, Ctrl-V, SPACE, f</entry>
+	<entry>Move down a page</entry>
+      </row>
+    </tbody></tgroup></table>
+    <table>
+      <title>Client List Keys</title><tgroup cols="2"><thead>
+      <row>
+	<entry>Keys</entry>
+	<entry>Function</entry>
+      </row>
+      </thead><tbody>
+      <row>
+	<entry>+</entry>
+	<entry>Enable client</entry>
+      </row>
+      <row>
+	<entry>-</entry>
+	<entry>Disable client</entry>
+      </row>
+      <row>
+	<entry>a</entry>
+	<entry>Approve client</entry>
+      </row>
+      <row>
+	<entry>d</entry>
+	<entry>Deny client</entry>
+      </row>
+      <row>
+	<entry>r, _, Ctrl-K</entry>
+	<entry>Remove client</entry>
+      </row>
+      <row>
+	<entry>s</entry>
+	<entry>Start checker for client</entry>
+      </row>
+      <row>
+	<entry>S</entry>
+	<entry>Stop checker for client</entry>
+      </row>
+      <row>
+	<entry>C</entry>
+	<entry>Force a successful check for this client.</entry>
+      </row>
+    </tbody></tgroup></table>
+  </refsect1>
+  
+  <refsect1 id="bugs">
+    <title>BUGS</title>
+    <para>
+      This program can currently only be used to monitor and control a
+      Mandos server with the default D-Bus service name of
+      <quote>Mandos</quote>.
+    </para>
+  </refsect1>
+  
+  <refsect1 id="example">
+    <title>EXAMPLE</title>
+    <informalexample>
+      <para>
+	This program takes no options:
+      </para>
+      <para>
+	<userinput>&COMMANDNAME;</userinput>
+      </para>
+    </informalexample>
+  </refsect1>
+  
+  <refsect1 id="security">
+    <title>SECURITY</title>
+    <para>
+      This program must be permitted to access the Mandos server via
+      the D-Bus interface.  This normally requires the root user, but
+      could be configured otherwise by reconfiguring the D-Bus server.
+    </para>
+  </refsect1>
+  
+  <refsect1 id="see_also">
+    <title>SEE ALSO</title>
+    <para>
+      <citerefentry><refentrytitle>mandos</refentrytitle>
+      <manvolnum>8</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>mandos-ctl</refentrytitle>
+      <manvolnum>8</manvolnum></citerefentry>
+    </para>
+  </refsect1>
+  
+</refentry>
+<!-- Local Variables: -->
+<!-- time-stamp-start: "<!ENTITY TIMESTAMP [\"']" -->
+<!-- time-stamp-end: "[\"']>" -->
+<!-- time-stamp-format: "%:y-%02m-%02d" -->
+<!-- End: -->

=== modified file 'mandos.lsm'
--- mandos.lsm	2010-09-12 03:22:48 +0000
+++ mandos.lsm	2010-09-14 18:22:03 +0000
@@ -1,7 +1,7 @@
 Begin4
 Title:		Mandos
 Version:	1.0.14
-Entered-date:	2010-09-12
+Entered-date:	2010-09-14
 Description:	The Mandos system allows computers to have encrypted
 root file systems and at the same time be capable of remote and/or
 unattended reboots.