=== modified file 'README' --- README 2008-10-28 18:00:20 +0000 +++ README 2009-01-04 21:54:55 +0000 @@ -160,8 +160,8 @@ * Copyright - Copyright © 2008 Teddy Hogeborn - Copyright © 2008 Björn Påhlsson + Copyright © 2008,2009 Teddy Hogeborn + Copyright © 2008,2009 Björn Påhlsson ** License: === modified file 'debian/control' --- debian/control 2008-09-30 03:19:39 +0000 +++ debian/control 2009-01-04 21:20:50 +0000 @@ -4,9 +4,9 @@ Maintainer: Mandos Maintainers Uploaders: Teddy Hogeborn , Björn Påhlsson -Build-Depends: debhelper (>= 7), docbook-xsl, libavahi-core-dev, - libgpgme11-dev, libgnutls-dev, xsltproc, po-debconf, - pkg-config +Build-Depends: debhelper (>= 7), docbook-xml, docbook-xsl, + libavahi-core-dev, libgpgme11-dev, libgnutls-dev, xsltproc, + po-debconf, pkg-config Standards-Version: 3.8.0 Vcs-Bzr: http://ftp.fukt.bsnet.se/pub/mandos/trunk Vcs-Browser: http://bzr.fukt.bsnet.se/loggerhead/mandos/trunk/files === modified file 'debian/copyright' --- debian/copyright 2008-10-15 19:54:11 +0000 +++ debian/copyright 2009-01-04 21:54:55 +0000 @@ -5,8 +5,8 @@ Upstream-Source: Files: * -Copyright: Copyright © 2008 Teddy Hogeborn -Copyright: Copyright © 2008 Björn Påhlsson +Copyright: Copyright © 2008,2009 Teddy Hogeborn +Copyright: Copyright © 2008,2009 Björn Påhlsson License: GPL-3+ This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as === removed file 'debian/mandos-client.templates' --- debian/mandos-client.templates 2008-09-21 04:22:50 +0000 +++ debian/mandos-client.templates 1970-01-01 00:00:00 +0000 @@ -1,8 +0,0 @@ -Template: mandos-client/not-yet-configured -Type: note -_Description: Your system needs more configuration[ mandos-client] - Your system can not function as a Mandos client until a - password for this client has been added to the - configuration on the Mandos server. Please read - /usr/share/doc/mandos-client/README.Debian.gz to find out - how. === modified file 'debian/mandos.README.Debian' --- debian/mandos.README.Debian 2008-09-21 04:22:50 +0000 +++ debian/mandos.README.Debian 2009-01-04 22:15:01 +0000 @@ -1,7 +1,7 @@ -The Mandos server cannot run without at least one configured client in +The Mandos server is useless without at least one configured client in /etc/mandos/clients.conf. To create one, install the "mandos-client" package on a client computer, and run "mandos-keygen --password" there to get a config file stanza. Append that to /etc/mandos/clients.conf on the Mandos server. - -- Teddy Hogeborn , Sat, 20 Sep 2008 21:21:19 +0200 + -- Teddy Hogeborn , Sun, 4 Jan 2009 22:59:22 +0100 === removed file 'debian/mandos.templates' --- debian/mandos.templates 2008-09-21 04:22:50 +0000 +++ debian/mandos.templates 1970-01-01 00:00:00 +0000 @@ -1,9 +0,0 @@ -Template: mandos/not-yet-configured -Type: note -_Description: Your system needs more configuration[ mandos] - Your system has not yet been completely configured as a - Mandos server - clients need to be added to to - /etc/mandos/clients.conf. Please read - /usr/share/doc/mandos/README.Debian.gz to find out how. - . - (The server has not been started.) === removed file 'debian/po/POTFILES.in' --- debian/po/POTFILES.in 2008-09-21 04:22:50 +0000 +++ debian/po/POTFILES.in 1970-01-01 00:00:00 +0000 @@ -1,2 +0,0 @@ -[type: gettext/rfc822deb] mandos.templates -[type: gettext/rfc822deb] mandos-client.templates === removed file 'debian/po/sv.po' --- debian/po/sv.po 2008-09-21 04:22:50 +0000 +++ debian/po/sv.po 1970-01-01 00:00:00 +0000 @@ -1,66 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the mandos package. -# FIRST AUTHOR , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: 1.0\n" -"Report-Msgid-Bugs-To: mandos@packages.debian.org\n" -"POT-Creation-Date: 2008-09-20 23:01+0200\n" -"PO-Revision-Date: 2008-09-21 06:01+0200\n" -"Last-Translator: Teddy Hogeborn \n" -"Language-Team: Swedish \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: note -#. Description -#: ../mandos.templates:1001 -msgid "Your system needs more configuration[ mandos]" -msgstr "Ditt system behöver ytterligare konfigurering" - -#. Type: note -#. Description -#: ../mandos.templates:1001 -#| msgid "" -#| "Your system has not yet been completely configured as a Mandos server - " -#| "you need to setup /etc/mandos/clients.conf. Please read /usr/share/doc/" -#| "mandos/README.Debian.gz to find out how." -msgid "" -"Your system has not yet been completely configured as a Mandos server - " -"clients need to be added to to /etc/mandos/clients.conf. Please read /usr/" -"share/doc/mandos/README.Debian.gz to find out how." -msgstr "" -"Ditt system är inte helt inställd som en Mandos-server än -\n" -"det behövs läggas till klienter i Mandos-serverns\n" -"inställingar. Var vänlig läs\n" -"/usr/share/doc/mandos-client/README.Debian.gz för att få\n" -"veta hur." - -#. Type: note -#. Description -#: ../mandos.templates:1001 -msgid "(The server has not been started.)" -msgstr "(Servern har inte startats.)" - -#. Type: note -#. Description -#: ../mandos-client.templates:1001 -msgid "Your system needs more configuration[ mandos-client]" -msgstr "Ditt system behöver ytterligare konfigurering" - -#. Type: note -#. Description -#: ../mandos-client.templates:1001 -msgid "" -"Your system can not function as a Mandos client until a password for this " -"client has been added to the configuration on the Mandos server. Please " -"read /usr/share/doc/mandos-client/README.Debian.gz to find out how." -msgstr "" -"Ditt system kan inte fungera som en Mandos-klient förrän\n" -"ett krypterat lösenord har lagts till i Mandos-serverns\n" -"inställingar. Var vänlig läs\n" -"/usr/share/doc/mandos-client/README.Debian.gz för att få\n" -"veta hur." === modified file 'debian/rules' --- debian/rules 2008-09-30 18:59:44 +0000 +++ debian/rules 2009-01-04 22:26:07 +0000 @@ -38,7 +38,6 @@ rm -f build-arch-stamp build-indep-stamp configure-stamp dh_auto_clean dh_clean - debconf-updatepo install: install-indep install-arch install-indep: @@ -66,7 +65,6 @@ dh_testroot dh_installchangelogs dh_installdocs - dh_installdebconf dh_link dh_strip dh_compress === modified file 'mandos' --- mandos 2008-12-29 02:44:54 +0000 +++ mandos 2009-01-04 21:54:55 +0000 @@ -11,8 +11,8 @@ # and some lines in "main". # # Everything else is -# Copyright © 2008 Teddy Hogeborn -# Copyright © 2008 Björn Påhlsson +# Copyright © 2008,2009 Teddy Hogeborn +# Copyright © 2008,2009 Björn Påhlsson # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -1046,8 +1046,7 @@ use_dbus = use_dbus) for section in client_config.sections())) if not clients: - logger.critical(u"No clients defined") - sys.exit(1) + logger.warning(u"No clients defined") if debug: # Redirect stdin so all checkers get /dev/null @@ -1136,6 +1135,9 @@ self.ClientRemoved(object_path) return raise KeyError + @dbus.service.method(_interface) + def Quit(self): + main_loop.quit() del _interface === modified file 'mandos-clients.conf.xml' --- mandos-clients.conf.xml 2008-10-07 21:31:09 +0000 +++ mandos-clients.conf.xml 2009-01-04 21:54:55 +0000 @@ -3,7 +3,7 @@ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ /etc/mandos/clients.conf"> - + %common; ]> @@ -33,6 +33,7 @@ 2008 + 2009 Teddy Hogeborn Björn Påhlsson === modified file 'mandos-keygen' --- mandos-keygen 2008-11-12 05:46:49 +0000 +++ mandos-keygen 2009-01-04 21:54:55 +0000 @@ -2,8 +2,8 @@ # # Mandos key generator - create a new OpenPGP key for a Mandos client # -# Copyright © 2008 Teddy Hogeborn -# Copyright © 2008 Björn Påhlsson +# Copyright © 2008,2009 Teddy Hogeborn +# Copyright © 2008,2009 Björn Påhlsson # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by === modified file 'mandos-keygen.xml' --- mandos-keygen.xml 2008-10-04 01:55:56 +0000 +++ mandos-keygen.xml 2009-01-04 21:54:55 +0000 @@ -2,7 +2,7 @@ - + %common; ]> @@ -32,6 +32,7 @@ 2008 + 2009 Teddy Hogeborn Björn Påhlsson === modified file 'mandos.conf.xml' --- mandos.conf.xml 2008-12-29 02:44:54 +0000 +++ mandos.conf.xml 2009-01-04 21:54:55 +0000 @@ -3,7 +3,7 @@ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ /etc/mandos/mandos.conf"> - + %common; ]> @@ -33,6 +33,7 @@ 2008 + 2009 Teddy Hogeborn Björn Påhlsson === modified file 'mandos.xml' --- mandos.xml 2008-12-29 02:44:54 +0000 +++ mandos.xml 2009-01-04 21:54:55 +0000 @@ -2,7 +2,7 @@ - + %common; ]> @@ -32,6 +32,7 @@ 2008 + 2009 Teddy Hogeborn Björn Påhlsson @@ -236,7 +237,8 @@ - See also . + See also . + @@ -334,7 +336,7 @@ - + D-BUS INTERFACE The server will by default provide a D-Bus system bus interface. === modified file 'plugin-runner.c' --- plugin-runner.c 2008-11-11 16:07:18 +0000 +++ plugin-runner.c 2009-01-04 21:54:55 +0000 @@ -2,8 +2,8 @@ /* * Mandos plugin runner - Run Mandos plugins * - * Copyright © 2008 Teddy Hogeborn - * Copyright © 2008 Björn Påhlsson + * Copyright © 2008,2009 Teddy Hogeborn + * Copyright © 2008,2009 Björn Påhlsson * * This program is free software: you can redistribute it and/or * modify it under the terms of the GNU General Public License as === modified file 'plugin-runner.xml' --- plugin-runner.xml 2008-09-30 07:23:39 +0000 +++ plugin-runner.xml 2009-01-04 21:54:55 +0000 @@ -2,7 +2,7 @@ - + %common; ]> @@ -32,6 +32,7 @@ 2008 + 2009 Teddy Hogeborn Björn Påhlsson === modified file 'plugins.d/askpass-fifo.c' --- plugins.d/askpass-fifo.c 2008-11-11 16:07:18 +0000 +++ plugins.d/askpass-fifo.c 2009-01-04 21:54:55 +0000 @@ -2,8 +2,8 @@ /* * Passprompt - Read a password from a FIFO and output it * - * Copyright © 2008 Teddy Hogeborn - * Copyright © 2008 Björn Påhlsson + * Copyright © 2008,2009 Teddy Hogeborn + * Copyright © 2008,2009 Björn Påhlsson * * This program is free software: you can redistribute it and/or * modify it under the terms of the GNU General Public License as === modified file 'plugins.d/askpass-fifo.xml' --- plugins.d/askpass-fifo.xml 2008-10-04 20:09:53 +0000 +++ plugins.d/askpass-fifo.xml 2009-01-04 21:54:55 +0000 @@ -2,7 +2,7 @@ - + %common; ]> @@ -32,6 +32,7 @@ 2008 + 2009 Teddy Hogeborn Björn Påhlsson === modified file 'plugins.d/mandos-client.c' --- plugins.d/mandos-client.c 2008-11-11 16:07:18 +0000 +++ plugins.d/mandos-client.c 2009-01-04 21:54:55 +0000 @@ -9,8 +9,8 @@ * "browse_callback", and parts of "main". * * Everything else is - * Copyright © 2008 Teddy Hogeborn - * Copyright © 2008 Björn Påhlsson + * Copyright © 2008,2009 Teddy Hogeborn + * Copyright © 2008,2009 Björn Påhlsson * * This program is free software: you can redistribute it and/or * modify it under the terms of the GNU General Public License as === modified file 'plugins.d/mandos-client.xml' --- plugins.d/mandos-client.xml 2008-10-04 01:55:56 +0000 +++ plugins.d/mandos-client.xml 2009-01-04 21:54:55 +0000 @@ -2,7 +2,7 @@ - + %common; ]> @@ -32,6 +32,7 @@ 2008 + 2009 Teddy Hogeborn Björn Påhlsson === modified file 'plugins.d/password-prompt.c' --- plugins.d/password-prompt.c 2008-11-11 16:07:18 +0000 +++ plugins.d/password-prompt.c 2009-01-04 21:54:55 +0000 @@ -2,8 +2,8 @@ /* * Passprompt - Read a password from the terminal and print it * - * Copyright © 2008 Teddy Hogeborn - * Copyright © 2008 Björn Påhlsson + * Copyright © 2008,2009 Teddy Hogeborn + * Copyright © 2008,2009 Björn Påhlsson * * This program is free software: you can redistribute it and/or * modify it under the terms of the GNU General Public License as === modified file 'plugins.d/password-prompt.xml' --- plugins.d/password-prompt.xml 2008-10-04 01:55:56 +0000 +++ plugins.d/password-prompt.xml 2009-01-04 21:54:55 +0000 @@ -2,7 +2,7 @@ - + %common; ]> @@ -32,6 +32,7 @@ 2008 + 2009 Teddy Hogeborn Björn Påhlsson === modified file 'plugins.d/splashy.c' --- plugins.d/splashy.c 2008-11-11 16:07:18 +0000 +++ plugins.d/splashy.c 2009-01-04 21:54:55 +0000 @@ -2,8 +2,8 @@ /* * Passprompt - Read a password from splashy and output it * - * Copyright © 2008 Teddy Hogeborn - * Copyright © 2008 Björn Påhlsson + * Copyright © 2008,2009 Teddy Hogeborn + * Copyright © 2008,2009 Björn Påhlsson * * This program is free software: you can redistribute it and/or * modify it under the terms of the GNU General Public License as === modified file 'plugins.d/splashy.xml' --- plugins.d/splashy.xml 2008-10-04 03:11:39 +0000 +++ plugins.d/splashy.xml 2009-01-04 21:54:55 +0000 @@ -2,7 +2,7 @@ - + %common; ]> @@ -32,6 +32,7 @@ 2008 + 2009 Teddy Hogeborn Björn Påhlsson === modified file 'plugins.d/usplash.c' --- plugins.d/usplash.c 2008-11-11 16:07:18 +0000 +++ plugins.d/usplash.c 2009-01-04 21:54:55 +0000 @@ -2,8 +2,8 @@ /* * Passprompt - Read a password from usplash and output it * - * Copyright © 2008 Teddy Hogeborn - * Copyright © 2008 Björn Påhlsson + * Copyright © 2008,2009 Teddy Hogeborn + * Copyright © 2008,2009 Björn Påhlsson * * This program is free software: you can redistribute it and/or * modify it under the terms of the GNU General Public License as === modified file 'plugins.d/usplash.xml' --- plugins.d/usplash.xml 2008-10-04 03:11:39 +0000 +++ plugins.d/usplash.xml 2009-01-04 21:54:55 +0000 @@ -2,7 +2,7 @@ - + %common; ]> @@ -32,6 +32,7 @@ 2008 + 2009 Teddy Hogeborn Björn Påhlsson