=== modified file 'DBUS-API'
--- DBUS-API 2010-09-26 17:36:30 +0000
+++ DBUS-API 2010-09-26 18:32:58 +0000
@@ -147,5 +147,26 @@
*** Rejected(s: Reason)
This client was not given its secret for a specified Reason.
+* Copyright
+
+ Copyright © 2010 Teddy Hogeborn
+ Copyright © 2010 Björn Påhlsson
+
+** License:
+
+ 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 the Free Software Foundation, either version 3 of the
+ License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see
+ .
+
#+STARTUP: showall
=== modified file 'README'
--- README 2009-11-03 00:12:35 +0000
+++ README 2010-09-26 18:32:58 +0000
@@ -144,7 +144,9 @@
plugins to run, all competing to be the first to find a password and
provide it to the plugin runner.
- Three additional plugins are provided:
+ Four additional plugins are provided:
+ * plymouth(8mandos)
+ This prompts for a password when using plymouth(8).
* usplash(8mandos)
This prompts for a password when using usplash(8).
* splashy(8mandos)
@@ -160,8 +162,8 @@
* Copyright
- Copyright © 2008,2009 Teddy Hogeborn
- Copyright © 2008,2009 Björn Påhlsson
+ Copyright © 2008-2010 Teddy Hogeborn
+ Copyright © 2008-2010 Björn Påhlsson
** License:
=== modified file 'TODO'
--- TODO 2010-09-26 17:36:30 +0000
+++ TODO 2010-09-26 18:32:58 +0000
@@ -2,9 +2,6 @@
* Use _attribute_((nonnull)) wherever possible.
-* Release critical
-** Update copyright year to add 2010
-
* mandos-client
** TODO [#B] use scandir(3) instead of readdir(3)
** TODO [#B] Prefix all debug output with "Mandos plugin " + program_invocation_short_name
=== modified file 'debian/control'
--- debian/control 2010-09-09 22:26:35 +0000
+++ debian/control 2010-09-26 18:32:58 +0000
@@ -16,7 +16,7 @@
Architecture: all
Depends: ${misc:Depends}, python (>=2.5), python-gnutls, python-dbus,
python-avahi, python-gobject, avahi-daemon, adduser,
- python-urwid
+ python-urwid, python (>=2.6) | python-multiprocessing
Recommends: fping
Description: a server giving encrypted passwords to Mandos clients
This is the server part of the Mandos system, which allows
=== modified file 'debian/copyright'
--- debian/copyright 2009-01-04 21:54:55 +0000
+++ debian/copyright 2010-09-26 18:32:58 +0000
@@ -5,8 +5,8 @@
Upstream-Source:
Files: *
-Copyright: Copyright © 2008,2009 Teddy Hogeborn
-Copyright: Copyright © 2008,2009 Björn Påhlsson
+Copyright: Copyright © 2008-2010 Teddy Hogeborn
+Copyright: Copyright © 2008-2010 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
=== modified file 'debian/mandos-client.README.Debian'
--- debian/mandos-client.README.Debian 2009-09-08 06:28:20 +0000
+++ debian/mandos-client.README.Debian 2010-09-26 18:32:58 +0000
@@ -1,9 +1,11 @@
* Choose the Client Network Interface
- You MUST make sure that the correct network interface is specified
- in the DEVICE setting in the "/etc/initramfs-tools/initramfs.conf"
- file. *If* this is changed, it will be necessary to update the
- initrd image by running the command
+ Please make sure that the correct network interface is specified in
+ the DEVICE setting in the "/etc/initramfs-tools/initramfs.conf"
+ file. If the setting is empty, the interface will be autodetected
+ at boot time, which may not be correct. *If* the DEVICE setting is
+ changed, it will be necessary to update the initrd image by running
+ the command
update-initramfs -k all -u
@@ -84,4 +86,4 @@
work, "--options-for=mandos-client:--connect=:" needs
to be manually added to the file "/etc/mandos/plugin-runner.conf".
- -- Teddy Hogeborn , Tue, 8 Sep 2009 08:25:58 +0200
+ -- Teddy Hogeborn , Sun, 26 Sep 2010 20:08:05 +0200
=== modified file 'mandos'
--- mandos 2010-09-26 17:36:30 +0000
+++ mandos 2010-09-26 18:32:58 +0000
@@ -11,8 +11,8 @@
# "AvahiService" class, and some lines in "main".
#
# Everything else is
-# Copyright © 2008,2009 Teddy Hogeborn
-# Copyright © 2008,2009 Björn Påhlsson
+# Copyright © 2008-2010 Teddy Hogeborn
+# Copyright © 2008-2010 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-clients.conf.xml'
--- mandos-clients.conf.xml 2010-09-25 19:55:17 +0000
+++ mandos-clients.conf.xml 2010-09-26 18:32:58 +0000
@@ -3,7 +3,7 @@
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
/etc/mandos/clients.conf">
-
+
%common;
]>
@@ -34,6 +34,7 @@
2008
2009
+ 2010
Teddy Hogeborn
Björn Påhlsson
=== modified file 'mandos-ctl'
--- mandos-ctl 2010-09-26 17:44:43 +0000
+++ mandos-ctl 2010-09-26 18:32:58 +0000
@@ -1,5 +1,26 @@
#!/usr/bin/python
# -*- mode: python; coding: utf-8 -*-
+#
+# Mandos Monitor - Control and monitor the Mandos server
+#
+# Copyright © 2008-2010 Teddy Hogeborn
+# Copyright © 2008-2010 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+#
+# Contact the authors at .
+#
from __future__ import division
import sys
=== modified file 'mandos-keygen'
--- mandos-keygen 2010-09-13 06:19:45 +0000
+++ mandos-keygen 2010-09-26 18:32:58 +0000
@@ -2,8 +2,8 @@
#
# Mandos key generator - create a new OpenPGP key for a Mandos client
#
-# Copyright © 2008,2009 Teddy Hogeborn
-# Copyright © 2008,2009 Björn Påhlsson
+# Copyright © 2008-2010 Teddy Hogeborn
+# Copyright © 2008-2010 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-monitor'
--- mandos-monitor 2010-09-26 17:36:30 +0000
+++ mandos-monitor 2010-09-26 18:32:58 +0000
@@ -1,5 +1,26 @@
#!/usr/bin/python
# -*- mode: python; coding: utf-8 -*-
+#
+# Mandos Monitor - Control and monitor the Mandos server
+#
+# Copyright © 2009,2010 Teddy Hogeborn
+# Copyright © 2009,2010 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+#
+# Contact the authors at .
+#
from __future__ import division, absolute_import, with_statement
=== modified file 'mandos.xml'
--- mandos.xml 2010-09-25 21:24:49 +0000
+++ mandos.xml 2010-09-26 18:32:58 +0000
@@ -2,7 +2,7 @@
-
+
%common;
]>
@@ -33,6 +33,7 @@
2008
2009
+ 2010
Teddy Hogeborn
Björn Påhlsson
=== modified file 'plugins.d/askpass-fifo.c'
--- plugins.d/askpass-fifo.c 2010-09-07 16:48:58 +0000
+++ plugins.d/askpass-fifo.c 2010-09-26 18:32:58 +0000
@@ -2,8 +2,8 @@
/*
* Askpass-FIFO - Read a password from a FIFO and output it
*
- * Copyright © 2008,2009 Teddy Hogeborn
- * Copyright © 2008,2009 Björn Påhlsson
+ * Copyright © 2008-2010 Teddy Hogeborn
+ * Copyright © 2008-2010 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 2010-08-10 19:08:24 +0000
+++ plugins.d/mandos-client.xml 2010-09-26 18:32:58 +0000
@@ -2,7 +2,7 @@
-
+
%common;
]>
=== modified file 'plugins.d/password-prompt.c'
--- plugins.d/password-prompt.c 2010-09-07 16:48:58 +0000
+++ plugins.d/password-prompt.c 2010-09-26 18:32:58 +0000
@@ -2,8 +2,8 @@
/*
* Password-prompt - Read a password from the terminal and print it
*
- * Copyright © 2008,2009 Teddy Hogeborn
- * Copyright © 2008,2009 Björn Påhlsson
+ * Copyright © 2008-2010 Teddy Hogeborn
+ * Copyright © 2008-2010 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/plymouth.c'
--- plugins.d/plymouth.c 2010-09-24 18:33:39 +0000
+++ plugins.d/plymouth.c 2010-09-26 18:32:58 +0000
@@ -1,3 +1,27 @@
+/* -*- coding: utf-8 -*- */
+/*
+ * Usplash - Read a password from usplash and output it
+ *
+ * Copyright © 2010 Teddy Hogeborn
+ * Copyright © 2010 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 the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ * .
+ *
+ * Contact the authors at .
+ */
+
#define _GNU_SOURCE /* asprintf(), TEMP_FAILURE_RETRY() */
#include /* sig_atomic_t, struct sigaction,
sigemptyset(), sigaddset(), SIGINT,
=== modified file 'plugins.d/plymouth.xml'
--- plugins.d/plymouth.xml 2010-09-23 20:14:08 +0000
+++ plugins.d/plymouth.xml 2010-09-26 18:32:58 +0000
@@ -2,7 +2,7 @@
-
+
%common;
]>
@@ -31,8 +31,7 @@
- 2008
- 2009
+ 2010
Teddy Hogeborn
Björn Påhlsson
=== modified file 'plugins.d/splashy.c'
--- plugins.d/splashy.c 2010-09-07 16:48:58 +0000
+++ plugins.d/splashy.c 2010-09-26 18:32:58 +0000
@@ -2,8 +2,8 @@
/*
* Splashy - Read a password from splashy and output it
*
- * Copyright © 2008,2009 Teddy Hogeborn
- * Copyright © 2008,2009 Björn Påhlsson
+ * Copyright © 2008-2010 Teddy Hogeborn
+ * Copyright © 2008-2010 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.c'
--- plugins.d/usplash.c 2010-09-15 17:21:04 +0000
+++ plugins.d/usplash.c 2010-09-26 18:32:58 +0000
@@ -2,8 +2,8 @@
/*
* Usplash - Read a password from usplash and output it
*
- * Copyright © 2008,2009 Teddy Hogeborn
- * Copyright © 2008,2009 Björn Påhlsson
+ * Copyright © 2008-2010 Teddy Hogeborn
+ * Copyright © 2008-2010 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