build-sys: bump release

[elogind.git] / src / localed.c

diff --git a/src/localed.c b/src/localed.c
index 5efee0b2ac99b747c786906c34b9f19dadedd6c1..d7dcc9e95bbb465761ff368e5c490f2c314ec61e 100644 (file)
--- a/src/localed.c
+++ b/src/localed.c
@@ -59,6 +59,7 @@ enum {
          * using LANG instead. */
 
         PROP_LANG,
+        PROP_LANGUAGE,
         PROP_LC_CTYPE,
         PROP_LC_NUMERIC,
         PROP_LC_TIME,
@@ -76,6 +77,7 @@ enum {
 
 static const char * const names[_PROP_MAX] = {
         [PROP_LANG] = "LANG",
+        [PROP_LANGUAGE] = "LANGUAGE",
         [PROP_LC_CTYPE] = "LC_CTYPE",
         [PROP_LC_NUMERIC] = "LC_NUMERIC",
         [PROP_LC_TIME] = "LC_TIME",
@@ -132,6 +134,7 @@ static int read_data(void) {
 
         r = parse_env_file("/etc/locale.conf", NEWLINE,
                            "LANG",              &data[PROP_LANG],
+                           "LANGUAGE",          &data[PROP_LANGUAGE],
                            "LC_CTYPE",          &data[PROP_LC_CTYPE],
                            "LC_NUMERIC",        &data[PROP_LC_NUMERIC],
                            "LC_TIME",           &data[PROP_LC_TIME],
@@ -540,8 +543,15 @@ static int connect_bus(DBusConnection **_bus) {
                 goto fail;
         }
 
-        if (dbus_bus_request_name(bus, "org.freedesktop.locale1", DBUS_NAME_FLAG_DO_NOT_QUEUE, &error) < 0) {
-                log_error("Failed to register name on bus: %s", error.message);
+        r = dbus_bus_request_name(bus, "org.freedesktop.locale1", DBUS_NAME_FLAG_DO_NOT_QUEUE, &error);
+        if (dbus_error_is_set(&error)) {
+                log_error("Failed to register name on bus: %s", bus_error_message(&error));
+                r = -EEXIST;
+                goto fail;
+        }
+
+        if (r != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
+                log_error("Failed to acquire name.");
                 r = -EEXIST;
                 goto fail;
         }
@@ -568,6 +578,8 @@ int main(int argc, char *argv[]) {
         log_parse_environment();
         log_open();
 
+        umask(0022);
+
         if (argc == 2 && streq(argv[1], "--introspect")) {
                 fputs(DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE
                       "<node>\n", stdout);
@@ -582,8 +594,6 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
-        umask(0022);
-
         r = read_data();
         if (r < 0) {
                 log_error("Failed to read locale data: %s", strerror(-r));