[systemd-devel] [PATCH 2/2] machinectl: remove unused --no-ask-password

[Lennart Poettering]

On Tue, 18.02.14 21:09, Thomas H.P. Andersen (phomes at gmail.com) wrote:

Applied both! Thanks!

> From: Thomas Hindoe Paaboel Andersen <phomes at gmail.com>
> 
> ---
>  man/machinectl.xml       | 8 --------
>  src/machine/machinectl.c | 8 --------
>  2 files changed, 16 deletions(-)
> 
> diff --git a/man/machinectl.xml b/man/machinectl.xml
> index 9eb45dc..89ab474 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 912cffd..de79996 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;


Lennart

-- 
Lennart Poettering, Red Hat