diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2005-07-08 13:28:03 +0000 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2005-07-08 13:28:03 +0000 |
| commit | aaa0b1ec3c8e0fe9d827565f17a06e87abe8bfa3 (patch) | |
| tree | 4e71aec4c8f68f799c9dbdf1107923af9efc7a94 /cli-runopts.c | |
| parent | 03731c723bda295a6f6ee8346d622ea45d796563 (diff) | |
| parent | 215a369c2b0e49107f3a7e9d55175bd590145836 (diff) | |
merge of 9522146cb07d4576f161fc4567c2c2fbd6f61fbb
and b11630c15bc4d0649dba51c3572cac6f44e0ab0e
--HG--
extra : convert_revision : e0686662cdbee8c0b06e72e6105a390ea4f4c007
Diffstat (limited to 'cli-runopts.c')
| -rw-r--r-- | cli-runopts.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cli-runopts.c b/cli-runopts.c index 3ac5c2b..285c51d 100644 --- a/cli-runopts.c +++ b/cli-runopts.c @@ -53,7 +53,7 @@ static void printhelp() { "-i <identityfile> (multiple allowed)\n" #endif #ifdef ENABLE_CLI_LOCALTCPFWD - "-L <listenport:remotehsot:reportport> Local port forwarding\n" + "-L <listenport:remotehost:remoteport> Local port forwarding\n" #endif #ifdef ENABLE_CLI_REMOTETCPFWD "-R <listenport:remotehost:remoteport> Remote port forwarding\n" @@ -89,7 +89,7 @@ void cli_getopts(int argc, char ** argv) { cli_opts.cmd = NULL; cli_opts.wantpty = 9; /* 9 means "it hasn't been touched", gets set later */ #ifdef ENABLE_CLI_PUBKEY_AUTH - cli_opts.pubkeys = NULL; + cli_opts.privkeys = NULL; #endif #ifdef ENABLE_CLI_LOCALTCPFWD cli_opts.localfwds = NULL; @@ -271,7 +271,7 @@ void cli_getopts(int argc, char ** argv) { #ifdef ENABLE_CLI_PUBKEY_AUTH static void loadidentityfile(const char* filename) { - struct PubkeyList * nextkey; + struct SignKeyList * nextkey; sign_key *key; int keytype; @@ -284,11 +284,11 @@ static void loadidentityfile(const char* filename) { } else { - nextkey = (struct PubkeyList*)m_malloc(sizeof(struct PubkeyList)); + nextkey = (struct SignKeyList*)m_malloc(sizeof(struct SignKeyList)); nextkey->key = key; - nextkey->next = cli_opts.pubkeys; + nextkey->next = cli_opts.privkeys; nextkey->type = keytype; - cli_opts.pubkeys = nextkey; + cli_opts.privkeys = nextkey; } } #endif |