summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Hindoe Paaboel Andersen <phomes@gmail.com>2014-02-18 21:09:06 +0100
committerLennart Poettering <lennart@poettering.net>2014-02-18 21:14:40 +0100
commit6bebb0add4d7c32c503e688105c1607e5e20f979 (patch)
treedcfce00e075e5d03904ee77c1a7fe331dc9e5ae8
parente56056e93d33619a3acf13e483900b4f8938228f (diff)
machinectl: remove unused --no-ask-password
-rw-r--r--man/machinectl.xml8
-rw-r--r--src/machine/machinectl.c8
2 files changed, 0 insertions, 16 deletions
diff --git a/man/machinectl.xml b/man/machinectl.xml
index 9eb45dc77e..89ab47402c 100644
--- a/man/machinectl.xml
+++ b/man/machinectl.xml
@@ -103,14 +103,6 @@
</varlistentry>
<varlistentry>
- <term><option>--no-ask-password</option></term>
-
- <listitem><para>Do not query the user
- for authentication for privileged
- operations.</para></listitem>
- </varlistentry>
-
- <varlistentry>
<term><option>-H</option></term>
<term><option>--host=</option></term>
diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index 912cffda18..de79996141 100644
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -49,7 +49,6 @@ static bool arg_no_pager = false;
static bool arg_legend = true;
static const char *arg_kill_who = NULL;
static int arg_signal = SIGTERM;
-static bool arg_ask_password = true;
static BusTransport arg_transport = BUS_TRANSPORT_LOCAL;
static char *arg_host = NULL;
@@ -677,7 +676,6 @@ static int help(void) {
" --version Show package version\n"
" --no-pager Do not pipe output into a pager\n"
" --no-legend Do not show the headers and footers\n"
- " --no-ask-password Don't prompt for password\n"
" -H --host=[USER@]HOST Operate on remote host\n"
" -M --machine=CONTAINER Operate on local container\n"
" -p --property=NAME Show only properties by this name\n"
@@ -705,7 +703,6 @@ static int parse_argv(int argc, char *argv[]) {
ARG_NO_PAGER,
ARG_NO_LEGEND,
ARG_KILL_WHO,
- ARG_NO_ASK_PASSWORD,
};
static const struct option options[] = {
@@ -720,7 +717,6 @@ static int parse_argv(int argc, char *argv[]) {
{ "signal", required_argument, NULL, 's' },
{ "host", required_argument, NULL, 'H' },
{ "machine", required_argument, NULL, 'M' },
- { "no-ask-password", no_argument, NULL, ARG_NO_ASK_PASSWORD },
{}
};
@@ -768,10 +764,6 @@ static int parse_argv(int argc, char *argv[]) {
arg_legend = false;
break;
- case ARG_NO_ASK_PASSWORD:
- arg_ask_password = false;
- break;
-
case ARG_KILL_WHO:
arg_kill_who = optarg;
break;