From: Ivan Shapovalov <intelfx100@gmail.com>
Date: Mon, 22 Jun 2015 16:04:38 +0000 (+0300)
Subject: systemctl: legacy tools shall never be interactive
X-Git-Tag: v227~143^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=16f017fa6e3417edb4bba5db13a623f7289a3abc;p=thirdparty%2Fsystemd.git

systemctl: legacy tools shall never be interactive

Fixes (the main concern of) issue #213.
---

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 74d7fc2b3bf..16a8eef3084 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -100,7 +100,7 @@ static bool arg_quiet = false;
 static bool arg_full = false;
 static bool arg_recursive = false;
 static int arg_force = 0;
-static bool arg_ask_password = true;
+static bool arg_ask_password = false;
 static bool arg_runtime = false;
 static UnitFilePresetMode arg_preset_mode = UNIT_FILE_PRESET_FULL;
 static char **arg_wall = NULL;
@@ -6340,6 +6340,9 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
         assert(argc >= 0);
         assert(argv);
 
+        /* we default to allowing interactive authorization only in systemctl (not in the legacy commands) */
+        arg_ask_password = true;
+
         while ((c = getopt_long(argc, argv, "ht:p:alqfs:H:M:n:o:ir", options, NULL)) >= 0)
 
                 switch (c) {