Fetch the value of "askpass" from the sudo conf struct.

diff --git a/src/sudo.h b/src/sudo.h
index ec981132fd594be0de108f792599911058a784f7..91adbe5c5b82b0887ad0f3f9420e46e7c141a960 100644 (file)
--- a/src/sudo.h
+++ b/src/sudo.h
@@ -163,8 +163,6 @@ void cleanup(int);
 /* tgetpass.c */
 char *tgetpass(const char *, int, int);
 int tty_present(void);
-extern const char *askpass_path;
-extern const char *noexec_path;
 
 /* zero_bytes.c */
 void zero_bytes(volatile void *, size_t);

diff --git a/src/tgetpass.c b/src/tgetpass.c
index f8a9d3e323b284612629f77ad81a3cdb3f8ec87a..c19e83b9c8648260967936e43145d1d47969eb8b 100644 (file)
--- a/src/tgetpass.c
+++ b/src/tgetpass.c
@@ -61,12 +61,6 @@ static void handler(int);
 static char *getln(int, char *, size_t, int);
 static char *sudo_askpass(const char *, const char *);
 
-#ifdef _PATH_SUDO_ASKPASS
-const char *askpass_path = _PATH_SUDO_ASKPASS;
-#else
-const char *askpass_path;
-#endif
-
 /*
  * Like getpass(3) but with timeout and echo flags.
  */
@@ -86,7 +80,7 @@ tgetpass(const char *prompt, int timeout, int flags)
     if (askpass == NULL) {
        askpass = getenv("SUDO_ASKPASS");
        if (askpass == NULL || *askpass == '\0')
-           askpass = askpass_path;
+           askpass = sudo_conf_askpass_path();
     }
 
     /* If no tty present and we need to disable echo, try askpass. */