From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 14 Apr 2011 00:30:43 +0000 (+0200)
Subject: ask-password: use default timeout
X-Git-Tag: v25~43
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=7f434cf4c9a72c3291a8603a3e91dd66dde4d640

ask-password: use default timeout
---

diff --git a/man/systemd-ask-password.xml b/man/systemd-ask-password.xml
index 7a6498d25..50aec3403 100644
--- a/man/systemd-ask-password.xml
+++ b/man/systemd-ask-password.xml
@@ -128,7 +128,8 @@
                                 <term><option>--timeout=</option></term>
 
                                 <listitem><para>Specify the query
-                                timeout in seconds.</para></listitem>
+                                timeout in seconds. Defaults to
+                                3min.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
diff --git a/src/ask-password.c b/src/ask-password.c
index 6330369b4..5162f62ee 100644
--- a/src/ask-password.c
+++ b/src/ask-password.c
@@ -40,11 +40,12 @@
 #include "util.h"
 #include "strv.h"
 #include "ask-password-api.h"
+#include "def.h"
 
 static const char *arg_icon = NULL;
 static const char *arg_message = NULL;
 static bool arg_use_tty = true;
-static usec_t arg_timeout = 60 * USEC_PER_SEC;
+static usec_t arg_timeout = DEFAULT_TIMEOUT_USEC;
 static bool arg_accept_cached = false;
 static bool arg_multiple = false;