[patch] fix default build when getpass() is unavailable
Matt Johnston
matt at ucc.asn.au
Wed Oct 21 23:10:08 AWST 2015
I’ve merged these 4 patches, thanks. Couple of changes HAVE_GETPASS not HAVE_FUNC_GETPASS, and I’m testing HAVE_CRYPT since OSX (and I guess other BSDs) don’t have crypt.h
Cheers,
Matt
> On Sat 10/10/2015, at 7:30 am, Mike Frysinger <vapier at gentoo.org> wrote:
>
> 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.
> -mike
>
> cli-auth.o:cli-auth.c:function getpass_or_cancel: error: undefined reference to 'getpass'
> collect2: error: ld returned 1 exit status
>
> --- a/configure.ac Tue Sep 29 22:19:11 2015 +0800
> +++ b/configure.ac Fri Oct 09 19:28:56 2015 -0400
> @@ -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))
>
> --- a/options.h Tue Sep 29 22:19:11 2015 +0800
> +++ b/options.h Fri Oct 09 19:28:56 2015 -0400
> @@ -217,9 +220,12 @@ If you test it please contact the Dropbe
> #define ENABLE_SVR_PUBKEY_OPTIONS
> #endif
>
> +/* This requires getpass. */
> +#ifdef HAVE_FUNC_GETPASS
> #define ENABLE_CLI_PASSWORD_AUTH
> +#define ENABLE_CLI_INTERACT_AUTH
> +#endif
> #define ENABLE_CLI_PUBKEY_AUTH
> -#define ENABLE_CLI_INTERACT_AUTH
>
> /* A default argument for dbclient -i <privatekey>.
> Homedir is prepended unless path begins with / */
More information about the Dropbear
mailing list