merge from main

--HG--
branch : fuzz

1 files changed, 6 insertions, 1 deletions

diff --git a/runopts.h b/runopts.h
index 3123383..6a4a94c 100644
--- a/runopts.h
+++ b/runopts.h
@@ -125,6 +125,11 @@ typedef struct svr_runopts {
 
 	char * forced_command;
 
+#if DROPBEAR_PLUGIN 
+        char *pubkey_plugin;
+        char *pubkey_plugin_options;
+#endif
+
 } svr_runopts;
 
 extern svr_runopts svr_opts;
@@ -136,7 +141,7 @@ typedef struct cli_runopts {
 
 	char *progname;
 	char *remotehost;
-	char *remoteport;
+	const char *remoteport;
 
 	char *own_user;
 	char *username;