[systemd-commits] 3 commits - TODO configure.ac man/sd_bus_request_name.xml src/libsystemd-bus

[Lennart Poettering]

 TODO                             |    2 +-
 configure.ac                     |    2 +-
 man/sd_bus_request_name.xml      |   22 +++++++++++++++++++---
 src/libsystemd-bus/bus-control.c |    4 ++--
 4 files changed, 23 insertions(+), 7 deletions(-)

New commits:
commit a56b63f41dc779a86573ae77814c14c1db156398
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Dec 13 16:01:54 2013 +0100

    man: document more error codes for sd_bus_request_name()

diff --git a/TODO b/TODO
index 7986497..a694780 100644
--- a/TODO
+++ b/TODO
@@ -425,7 +425,6 @@ Features:
   - nspawn: investigate whether we can support the same as LXC's
     lxc.network.type=phys mode, and pass through entire network
     interfaces to the container
-  - nspawn: maybe add a way to drop additional caps, in addition to add additional caps
   - nspawn: maybe explicitly reset loginuid?
   - nspawn: make it work for dwalsh and shared /usr containers -- tmpfs mounts as command line parameters, selinux exec context
   - refuses to boot containers without /etc/machine-id (OK?), and with empty /etc/machine-id (not OK).
@@ -433,6 +432,7 @@ Features:
     SOCK_RAW, NETLINK_AUDIT) fail the the appropriate error code that
     makes the audit userspace to think auditing is not available in the
     kernel.
+  - support taking a btrfs snapshot at startup and dropping it afterwards
 
 * cryptsetup:
   - cryptsetup-generator: allow specification of passwords in crypttab itself
diff --git a/man/sd_bus_request_name.xml b/man/sd_bus_request_name.xml
index 039b962..23d49fb 100644
--- a/man/sd_bus_request_name.xml
+++ b/man/sd_bus_request_name.xml
@@ -56,7 +56,7 @@
                                 <funcdef>int <function>sd_bus_request_name</function></funcdef>
                                 <paramdef>sd_bus* <parameter>bus</parameter></paramdef>
                                 <paramdef>const char *<parameter>name</parameter></paramdef>
-                                <paramdef>unsigned <parameter>flags</parameter></paramdef>
+                                <paramdef>uint64_t <parameter>flags</parameter></paramdef>
                         </funcprototype>
 
                         <funcprototype>
@@ -64,8 +64,6 @@
                                 <paramdef>sd_bus* <parameter>bus</parameter></paramdef>
                                 <paramdef>const char *<parameter>name</parameter></paramdef>
                         </funcprototype>
-
-
                 </funcsynopsis>
         </refsynopsisdiv>
 
@@ -165,6 +163,24 @@
                         </varlistentry>
 
                         <varlistentry>
+                                <term><varname>-ESRCH</varname></term>
+
+                                <listitem><para>It was attemted to
+                                release a name that is currently not
+                                registered on the
+                                bus.</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><varname>-EADDRINUSE</varname></term>
+
+                                <listitem><para>It was attemted to
+                                release a name that is owned by a
+                                different peer on the
+                                bus.</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
                                 <term><varname>-EINVAL</varname></term>
 
                                 <listitem><para>A specified parameter

commit 043ccd8383a36a9d4f7b37c04670c9e6a57f391d
Author: Lukasz Skalski <l.skalski at partner.samsung.com>
Date:   Fri Dec 13 12:12:24 2013 +0100

    libsystemd-bus: the same error codes for sd_bus_release_name() (for kdbus and dbus1)
    
    Due to this patch, sd_bus_release_name() function
    returns the same code errors for kdbus and dbus1
    if we try release non-existing name or foreign
    name.

diff --git a/src/libsystemd-bus/bus-control.c b/src/libsystemd-bus/bus-control.c
index 5125fd9..0072c37 100644
--- a/src/libsystemd-bus/bus-control.c
+++ b/src/libsystemd-bus/bus-control.c
@@ -184,9 +184,9 @@ static int bus_release_name_dbus1(sd_bus *bus, const char *name) {
         if (r < 0)
                 return r;
         if (ret == BUS_NAME_NON_EXISTENT)
-                return -ENOENT;
+                return -ESRCH;
         if (ret == BUS_NAME_NOT_OWNER)
-                return -EADDRNOTAVAIL;
+                return -EADDRINUSE;
         if (ret == BUS_NAME_RELEASED)
                 return 0;
 

commit c97a6dbcf10990bcc2455e842a41bf14b01f358d
Author: Lukasz Skalski <l.skalski at partner.samsung.com>
Date:   Fri Dec 13 10:26:55 2013 +0100

    build-sys: fix help text for --enable-kdbus

diff --git a/configure.ac b/configure.ac
index 6ada38a..f85e86e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -801,7 +801,7 @@ AM_CONDITIONAL(ENABLE_MULTI_SEAT_X, [test "$have_multi_seat_x" = "yes"])
 
 # ------------------------------------------------------------------------------
 have_kdbus=no
-AC_ARG_ENABLE(kdbus, AS_HELP_STRING([--enable-kdbus], [do not connect to kdbus by default]))
+AC_ARG_ENABLE(kdbus, AS_HELP_STRING([--enable-kdbus], [do connect to kdbus by default]))
 if test "x$enable_kdbus" == "xyes"; then
         AC_DEFINE(ENABLE_KDBUS, 1, [Define if kdbus support is to be enabled])
         have_kdbus=yes