diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2015-10-21 22:48:15 +0800 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-10-21 22:48:15 +0800 |
| commit | e84cb3c3c28e8120484197b817631ded4141cc74 (patch) | |
| tree | c94546c5a050a29bfa79e5207f22bb1973c4ff2c | |
| parent | 78b9cecb525d2e1449d269671b2c584fe904f738 (diff) | |
fix default build when getpass() is unavailable
if the system doesn't support getpass, we still default on the options
that require it which causes a build failure. instead, only default
enable these when getpass is available.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | options.h | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 6ae8c32..e08af5a 100644 --- a/configure.ac +++ b/configure.ac @@ -632,7 +632,7 @@ fi AC_PROG_GCC_TRADITIONAL AC_FUNC_MEMCMP AC_FUNC_SELECT_ARGTYPES -AC_CHECK_FUNCS([dup2 getspnam getusershell memset putenv select socket strdup clearenv strlcpy strlcat daemon basename _getpty getaddrinfo freeaddrinfo getnameinfo fork writev]) +AC_CHECK_FUNCS([dup2 getpass getspnam getusershell memset putenv select socket strdup clearenv strlcpy strlcat daemon basename _getpty getaddrinfo freeaddrinfo getnameinfo fork writev]) AC_SEARCH_LIBS(basename, gen, AC_DEFINE(HAVE_BASENAME)) @@ -220,9 +220,12 @@ If you test it please contact the Dropbear author */ #define ENABLE_SVR_PUBKEY_OPTIONS #endif +/* This requires getpass. */ +#ifdef HAVE_GETPASS #define ENABLE_CLI_PASSWORD_AUTH -#define ENABLE_CLI_PUBKEY_AUTH #define ENABLE_CLI_INTERACT_AUTH +#endif +#define ENABLE_CLI_PUBKEY_AUTH /* A default argument for dbclient -i <privatekey>. Homedir is prepended unless path begins with / */ |