Merge nss-myhostname

[elogind.git] / src / locale / localectl.c

diff --git a/src/locale/localectl.c b/src/locale/localectl.c
index 7d3ac0ad2fe52dd437b518d367ef1a0375b56a93..5d35f9cdae4dbda4bda1974df2e5406b0cc19087 100644 (file)
--- a/src/locale/localectl.c
+++ b/src/locale/localectl.c
@@ -19,6 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <locale.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <unistd.h>
@@ -536,7 +537,7 @@ static int set_x11_keymap(DBusConnection *bus, char **args, unsigned n) {
         layout = args[1];
         model = n > 2 ? args[2] : "";
         variant = n > 3 ? args[3] : "";
-        options = n > 3 ? args[4] : "";
+        options = n > 4 ? args[4] : "";
         b = arg_convert;
 
         return bus_method_call_with_reply(
@@ -614,7 +615,6 @@ static int parse_argv(int argc, char *argv[]) {
 
                 case ARG_VERSION:
                         puts(PACKAGE_STRING);
-                        puts(DISTRIBUTION);
                         puts(SYSTEMD_FEATURES);
                         return 0;
 
@@ -740,6 +740,7 @@ int main(int argc, char *argv[]) {
 
         dbus_error_init(&error);
 
+        setlocale(LC_ALL, "");
         log_parse_environment();
         log_open();