From 4e315f6a02a4edb259b33bcf0665eba259fee2f2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Tue, 30 Jul 2013 10:00:26 +0200 Subject: [PATCH] Do not rely on hardcoded path to systemd-ask-password. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Relying on hardcoded /bin/systemd-ask-password path breaks systemd that install systemd-ask-password in /usr/bin. Since both paths are supposed to be in ${PATH} and popen() passes the command to shell, just pass 'systemd-ask-password' and let the shell find it. Fixes: https://bugzilla.samba.org/show_bug.cgi?id=10054 Signed-off-by: Michał Górny --- mount.cifs.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mount.cifs.c b/mount.cifs.c index e76beee..7206dcb 100644 --- a/mount.cifs.c +++ b/mount.cifs.c @@ -1626,7 +1626,7 @@ drop_child_privs(void) } /* - * If systemd is running and /bin/systemd-ask-password -- + * If systemd is running and systemd-ask-password -- * is available, then use that else fallback on getpass(..) * * Returns: @input or NULL on error @@ -1649,7 +1649,7 @@ get_password(const char *prompt, char *input, int capacity) FILE *ask_pass_fp = NULL; cmd = ret = NULL; - if (asprintf(&cmd, "/bin/systemd-ask-password \"%s\"", prompt) >= 0) { + if (asprintf(&cmd, "systemd-ask-password \"%s\"", prompt) >= 0) { ask_pass_fp = popen (cmd, "re"); free (cmd); } -- 1.7.0.4