=== modified file 'DBUS-API' --- DBUS-API 2020-01-18 00:57:30 +0000 +++ DBUS-API 2020-07-04 11:58:52 +0000 @@ -131,8 +131,8 @@ * Copyright - Copyright © 2010-2019 Teddy Hogeborn - Copyright © 2010-2019 Björn Påhlsson + Copyright © 2010-2020 Teddy Hogeborn + Copyright © 2010-2020 Björn Påhlsson ** License: === modified file 'debian/copyright' --- debian/copyright 2019-02-10 04:20:26 +0000 +++ debian/copyright 2020-07-04 11:58:52 +0000 @@ -4,8 +4,8 @@ Source: Files: * -Copyright: Copyright © 2008-2019 Teddy Hogeborn - Copyright © 2008-2019 Björn Påhlsson +Copyright: Copyright © 2008-2020 Teddy Hogeborn + Copyright © 2008-2020 Björn Påhlsson License: GPL-3+ This file is part of Mandos. . === modified file 'dracut-module/ask-password-mandos.service' --- dracut-module/ask-password-mandos.service 2020-02-05 21:39:28 +0000 +++ dracut-module/ask-password-mandos.service 2020-07-04 11:58:52 +0000 @@ -1,7 +1,7 @@ # -*- systemd -*- # -# Copyright © 2019 Teddy Hogeborn -# Copyright © 2019 Björn Påhlsson +# Copyright © 2019-2020 Teddy Hogeborn +# Copyright © 2019-2020 Björn Påhlsson # # This file is part of Mandos. # === modified file 'dracut-module/password-agent.c' --- dracut-module/password-agent.c 2020-03-14 03:22:36 +0000 +++ dracut-module/password-agent.c 2020-07-04 11:58:52 +0000 @@ -2,8 +2,8 @@ /* * Mandos password agent - Simple password agent to run Mandos client * - * Copyright © 2019 Teddy Hogeborn - * Copyright © 2019 Björn Påhlsson + * Copyright © 2019-2020 Teddy Hogeborn + * Copyright © 2019-2020 Björn Påhlsson * * This file is part of Mandos. * === modified file 'initramfs-tools-script' --- initramfs-tools-script 2018-08-19 01:35:11 +0000 +++ initramfs-tools-script 2020-07-04 08:59:37 +0000 @@ -177,5 +177,10 @@ rm -f /conf/conf.d/cryptroot.mandos fi elif [ -x /usr/bin/cryptroot-unlock ]; then - setsid /lib/mandos/mandos-to-cryptroot-unlock & + # Use setsid if available + if command -v setsid >/dev/null 2>&1; then + setsid /lib/mandos/mandos-to-cryptroot-unlock & + else + /lib/mandos/mandos-to-cryptroot-unlock & + fi fi === modified file 'mandos' --- mandos 2020-04-08 18:40:10 +0000 +++ mandos 2020-07-04 11:58:52 +0000 @@ -11,8 +11,8 @@ # "AvahiService" class, and some lines in "main". # # Everything else is -# Copyright © 2008-2019 Teddy Hogeborn -# Copyright © 2008-2019 Björn Påhlsson +# Copyright © 2008-2020 Teddy Hogeborn +# Copyright © 2008-2020 Björn Påhlsson # # This file is part of Mandos. # === modified file 'mandos-ctl' --- mandos-ctl 2020-04-08 18:40:10 +0000 +++ mandos-ctl 2020-07-04 11:58:52 +0000 @@ -1,10 +1,10 @@ #!/usr/bin/python3 -bbI # -*- after-save-hook: (lambda () (let ((command (if (fboundp 'file-local-name) (file-local-name (buffer-file-name)) (or (file-remote-p (buffer-file-name) 'localname) (buffer-file-name))))) (if (= (progn (if (get-buffer "*Test*") (kill-buffer "*Test*")) (process-file-shell-command (format "%s --check" (shell-quote-argument command)) nil "*Test*")) 0) (let ((w (get-buffer-window "*Test*"))) (if w (delete-window w))) (progn (with-current-buffer "*Test*" (compilation-mode)) (display-buffer "*Test*" '(display-buffer-in-side-window)))))); coding: utf-8 -*- # -# Mandos Monitor - Control and monitor the Mandos server +# Mandos Control - Control or query the Mandos server # -# Copyright © 2008-2019 Teddy Hogeborn -# Copyright © 2008-2019 Björn Påhlsson +# Copyright © 2008-2020 Teddy Hogeborn +# Copyright © 2008-2020 Björn Påhlsson # # This file is part of Mandos. # @@ -726,7 +726,7 @@ with self.convert_exception(dbus.Error): value = method(*args) # DBussy returns values either as an empty list or as a - # tuple: (signature, value) + # list of one element with the return value if value: return self.type_filter(value[0]) @@ -738,6 +738,8 @@ def type_filter(self, value): """Convert the most bothersome types to Python types""" + # A D-Bus Variant value is represented as the Python type + # Tuple[dbussy.DBUS.Signature, Any] if isinstance(value, tuple): if (len(value) == 2 and isinstance(value[0], === modified file 'mandos-to-cryptroot-unlock' --- mandos-to-cryptroot-unlock 2019-07-24 11:02:24 +0000 +++ mandos-to-cryptroot-unlock 2020-07-04 11:58:52 +0000 @@ -2,8 +2,8 @@ # # Script to get password from plugin-runner to cryptroot-unlock # -# Copyright © 2018 Teddy Hogeborn -# Copyright © 2018 Björn Påhlsson +# Copyright © 2018-2019 Teddy Hogeborn +# Copyright © 2018-2019 Björn Påhlsson # # This file is part of Mandos. # === modified file 'plugin-runner.c' --- plugin-runner.c 2020-02-09 03:38:33 +0000 +++ plugin-runner.c 2020-07-04 11:58:52 +0000 @@ -2,8 +2,8 @@ /* * Mandos plugin runner - Run Mandos plugins * - * Copyright © 2008-2018 Teddy Hogeborn - * Copyright © 2008-2018 Björn Påhlsson + * Copyright © 2008-2020 Teddy Hogeborn + * Copyright © 2008-2020 Björn Påhlsson * * This file is part of Mandos. * === modified file 'plugins.d/mandos-client.c' --- plugins.d/mandos-client.c 2020-04-05 21:30:59 +0000 +++ plugins.d/mandos-client.c 2020-07-04 11:58:52 +0000 @@ -9,8 +9,8 @@ * "browse_callback", and parts of "main". * * Everything else is - * Copyright © 2008-2019 Teddy Hogeborn - * Copyright © 2008-2019 Björn Påhlsson + * Copyright © 2008-2020 Teddy Hogeborn + * Copyright © 2008-2020 Björn Påhlsson * * This file is part of Mandos. * @@ -396,9 +396,8 @@ fprintf_plus(stderr, "Setting system clock to key file mtime"); } - time_t keytime = keystat.st_mtim.tv_sec; - if(stime(&keytime) != 0){ - perror_plus("stime"); + if(clock_settime(CLOCK_REALTIME, &keystat.st_mtim) != 0){ + perror_plus("clock_settime"); } ret = lower_privileges(); if(ret != 0){ === modified file 'plugins.d/plymouth.c' --- plugins.d/plymouth.c 2020-02-09 03:38:33 +0000 +++ plugins.d/plymouth.c 2020-07-04 11:58:52 +0000 @@ -2,8 +2,8 @@ /* * Plymouth - Read a password from Plymouth and output it * - * Copyright © 2010-2019 Teddy Hogeborn - * Copyright © 2010-2019 Björn Påhlsson + * Copyright © 2010-2020 Teddy Hogeborn + * Copyright © 2010-2020 Björn Påhlsson * * This file is part of Mandos. *