propagate from branch 'au.asn.ucc.matt.dropbear' (head 0501e6f661b5415eb76f3b312d183c3adfbfb712)

to branch 'au.asn.ucc.matt.dropbear.cli-agent' (head 01038174ec27245b51bd43a66c01ad930880f67b)

--HG--
branch : agent-client
extra : convert_revision : 12b2f59db65e7339d340e95ac67d6d9ddb193c2b
This commit is contained in:
Matt Johnston
2006-03-21 16:20:59 +00:00
543 changed files with 93492 additions and 614 deletions

View File

@@ -33,8 +33,9 @@
typedef struct runopts {
int nolocaltcp;
int noremotetcp;
#if defined(ENABLE_SVR_REMOTETCPFWD) || defined(ENABLE_CLI_LOCALTCPFWD)
int listen_fwd_all;
#endif
} runopts;
@@ -73,6 +74,13 @@ typedef struct svr_runopts {
int noauthpass;
int norootpass;
#ifdef ENABLE_SVR_REMOTETCPFWD
int noremotetcp;
#endif
#ifdef ENABLE_SVR_LOCALTCPFWD
int nolocaltcp;
#endif
sign_key *hostkey;
buffer * banner;
@@ -83,7 +91,6 @@ extern svr_runopts svr_opts;
void svr_getopts(int argc, char ** argv);
void loadhostkeys();
/* Uncompleted XXX matt */
typedef struct cli_runopts {
char *progname;
@@ -108,7 +115,6 @@ typedef struct cli_runopts {
int agent_keys_loaded; /* whether pubkeys has been populated with a
list of keys held by the agent */
#endif
/* XXX TODO */
} cli_runopts;