[systemd-commits] 3 commits - TODO configure.ac src/login src/shared

[Lennart Poettering]

 TODO                    |    2 ++
 configure.ac            |    4 +++-
 src/login/logind-dbus.c |    7 +++----
 src/shared/missing.h    |    4 ++++
 4 files changed, 12 insertions(+), 5 deletions(-)

New commits:
commit 889f25b2ccea77770e62220ecf65a6799794bfa2
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Apr 7 21:08:07 2015 +0200

    logind: drop "interactive" parameter from SetRebootToFirmwareSetup() bus call
    
    Newer dbus versions have an "allow interactive authentication" bit in
    the message header, hence it is not necessary to take a boolean for this
    explicitly.

diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 46185f4..9ba85d8 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -1879,21 +1879,20 @@ static int method_set_reboot_to_firmware_setup(
                 sd_bus_error *error) {
 
         int b, r;
-        int interactive;
         Manager *m = userdata;
 
         assert(bus);
         assert(message);
         assert(m);
 
-        r = sd_bus_message_read(message, "bb", &b, &interactive);
+        r = sd_bus_message_read(message, "b", &b);
         if (r < 0)
                 return r;
 
         r = bus_verify_polkit_async(message,
                                     CAP_SYS_ADMIN,
                                     "org.freedesktop.login1.set-reboot-to-firmware-setup",
-                                    interactive,
+                                    false,
                                     UID_INVALID,
                                     &m->polkit_registry,
                                     error);
@@ -2124,7 +2123,7 @@ const sd_bus_vtable manager_vtable[] = {
         SD_BUS_METHOD("CanHybridSleep", NULL, "s", method_can_hybrid_sleep, SD_BUS_VTABLE_UNPRIVILEGED),
         SD_BUS_METHOD("Inhibit", "ssss", "h", method_inhibit, SD_BUS_VTABLE_UNPRIVILEGED),
         SD_BUS_METHOD("CanRebootToFirmwareSetup", NULL, "s", method_can_reboot_to_firmware_setup, SD_BUS_VTABLE_UNPRIVILEGED),
-        SD_BUS_METHOD("SetRebootToFirmwareSetup", "bb", NULL, method_set_reboot_to_firmware_setup, SD_BUS_VTABLE_UNPRIVILEGED),
+        SD_BUS_METHOD("SetRebootToFirmwareSetup", "b", NULL, method_set_reboot_to_firmware_setup, SD_BUS_VTABLE_UNPRIVILEGED),
 
         SD_BUS_SIGNAL("SessionNew", "so", 0),
         SD_BUS_SIGNAL("SessionRemoved", "so", 0),

commit 66fa453fa176d2379d321afb1d20c549bbcb2715
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Apr 7 21:07:54 2015 +0200

    update TODO

diff --git a/TODO b/TODO
index 6755078..62b82c4 100644
--- a/TODO
+++ b/TODO
@@ -43,6 +43,8 @@ Before 220:
 
 Features:
 
+* logind should set EFI firmware flag via logind
+
 * mounting and unmounting mount points manually with different source
   devices will result in collected collected on all devices used.
   http://lists.freedesktop.org/archives/systemd-devel/2015-April/030225.html

commit 34f7b9f98facbf3431c6849622104cee992f2b7d
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Apr 7 21:07:19 2015 +0200

    missing.h: define IFA_FLAGS if it is missing

diff --git a/configure.ac b/configure.ac
index 29111f5..904ac15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -334,7 +334,8 @@ AC_CHECK_DECLS([IFLA_INET6_ADDR_GEN_MODE,
                 IFLA_IPTUN_6RD_RELAY_PREFIXLEN,
                 IFLA_BRIDGE_VLAN_INFO,
                 IFLA_BRPORT_UNICAST_FLOOD,
-                NDA_IFINDEX],
+                NDA_IFINDEX,
+                IFA_FLAGS],
 [], [], [[
 #include <inttypes.h>
 #include <netinet/in.h>
@@ -345,6 +346,7 @@ AC_CHECK_DECLS([IFLA_INET6_ADDR_GEN_MODE,
 #include <linux/if_tunnel.h>
 #include <linux/if_link.h>
 #include <linux/if_bridge.h>
+#include <linux/if_addr.h>
 #include <linux/neighbour.h>
 ]])
 
diff --git a/src/shared/missing.h b/src/shared/missing.h
index 21c6afc..ae84053 100644
--- a/src/shared/missing.h
+++ b/src/shared/missing.h
@@ -859,6 +859,10 @@ static inline int setns(int fd, int nstype) {
 #define LOOPBACK_IFINDEX 1
 #endif
 
+#if !HAVE_DECL_IFA_FLAGS
+#define IFA_FLAGS 8
+#endif
+
 #ifndef MAX_AUDIT_MESSAGE_LENGTH
 #define MAX_AUDIT_MESSAGE_LENGTH 8970
 #endif