dropbear-2015.67: Build fails when "ENABLE_CLI_PUBKEY_AUTH" is undefined

[Juergen Borleis]

Hi everyone,

I tried to build the current dropbear-2015.67 without
the "ENABLE_CLI_PUBKEY_AUTH" (e.g. undefined) and the build fails due to
missing "privkeys" member in the "cli_runopts" structure.
I don't know if this is a valid usecase but due to the fact disabling this
feature is offered in the "option.h" file I tried it... :)

Maybe this patch is valid to honor this usecase, at least it makes dropbear
build again:

From: Juergen Borleis <jbe at pengutronix.de>
Date: Fri, 13 Mar 2015 10:53:46 +0100
Subject: [PATCH] dropbear: disabling ENABLE_CLI_PUBKEY_AUTH let the build fail

Function multihop_passthrough_args() fails due to missing 'privkeys' member
in structure 'cli_runopts'. So lets also disable ENABLE_CLI_MULTIHOP for
this case.
And even cli_getopts() fails due to missing loadidentityfile() function
in this case.

---
 options.h    |    4 +++-
 sysoptions.h |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/options.h b/options.h
index 6339b0a4738e..1360b5c6758f 100644
--- a/options.h
+++ b/options.h
@@ -218,7 +218,9 @@ much traffic. */
 
 /* A default argument for dbclient -i <privatekey>. 
    leading "~" is expanded */
-#define DROPBEAR_DEFAULT_CLI_AUTHKEY "~/.ssh/id_dropbear"
+#ifdef ENABLE_CLI_PUBKEY_AUTH
+# define DROPBEAR_DEFAULT_CLI_AUTHKEY "~/.ssh/id_dropbear"
+#endif
 
 /* This variable can be used to set a password for client
  * authentication on the commandline. Beware of platforms
diff --git a/sysoptions.h b/sysoptions.h
index bec72461d8e4..eeb78cb129a5 100644
--- a/sysoptions.h
+++ b/sysoptions.h
@@ -202,7 +202,7 @@
 #define USING_LISTENERS
 #endif
 
-#if defined(ENABLE_CLI_NETCAT) && defined(ENABLE_CLI_PROXYCMD)
+#if defined(ENABLE_CLI_NETCAT) && defined(ENABLE_CLI_PROXYCMD) && defined(ENABLE_CLI_PUBKEY_AUTH)
 #define ENABLE_CLI_MULTIHOP
 #endif
 
Regards,
Juergen

-- 
Pengutronix e.K.                              | Juergen Borleis             |
Industrial Linux Solutions                    | http://www.pengutronix.de/  |