Mercurial > dropbear

comparison cli-runopts.c @ 215:aad4b3f58556

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rename PubkeyList to SignKeyList for clarity
author Matt Johnston <matt@ucc.asn.au>
date Fri, 08 Jul 2005 11:32:09 +0000
parents 1916df7df911
children ca7e76d981d9 306499676384
comparison
equal deleted inserted replaced
214:5a75f8a21503 215:aad4b3f58556
87 cli_opts.remoteport = NULL; 87 cli_opts.remoteport = NULL;
88 cli_opts.username = NULL; 88 cli_opts.username = NULL;
89 cli_opts.cmd = NULL; 89 cli_opts.cmd = NULL;
90 cli_opts.wantpty = 9; /* 9 means "it hasn't been touched", gets set later */ 90 cli_opts.wantpty = 9; /* 9 means "it hasn't been touched", gets set later */
91 #ifdef ENABLE_CLI_PUBKEY_AUTH 91 #ifdef ENABLE_CLI_PUBKEY_AUTH
92 cli_opts.pubkeys = NULL; 92 cli_opts.privkeys = NULL;
93 #endif 93 #endif
94 #ifdef ENABLE_CLI_LOCALTCPFWD 94 #ifdef ENABLE_CLI_LOCALTCPFWD
95 cli_opts.localfwds = NULL; 95 cli_opts.localfwds = NULL;
96 #endif 96 #endif
97 #ifdef ENABLE_CLI_REMOTETCPFWD 97 #ifdef ENABLE_CLI_REMOTETCPFWD
269 } 269 }
270 270
271 #ifdef ENABLE_CLI_PUBKEY_AUTH 271 #ifdef ENABLE_CLI_PUBKEY_AUTH
272 static void loadidentityfile(const char* filename) { 272 static void loadidentityfile(const char* filename) {
273 273
274 struct PubkeyList * nextkey; 274 struct SignKeyList * nextkey;
275 sign_key *key; 275 sign_key *key;
276 int keytype; 276 int keytype;
277 277
278 key = new_sign_key(); 278 key = new_sign_key();
279 keytype = DROPBEAR_SIGNKEY_ANY; 279 keytype = DROPBEAR_SIGNKEY_ANY;
282 fprintf(stderr, "Failed loading keyfile '%s'\n", filename); 282 fprintf(stderr, "Failed loading keyfile '%s'\n", filename);
283 sign_key_free(key); 283 sign_key_free(key);
284 284
285 } else { 285 } else {
286 286
287 nextkey = (struct PubkeyList*)m_malloc(sizeof(struct PubkeyList)); 287 nextkey = (struct SignKeyList*)m_malloc(sizeof(struct SignKeyList));
288 nextkey->key = key; 288 nextkey->key = key;
289 nextkey->next = cli_opts.pubkeys; 289 nextkey->next = cli_opts.privkeys;
290 nextkey->type = keytype; 290 nextkey->type = keytype;
291 cli_opts.pubkeys = nextkey; 291 cli_opts.privkeys = nextkey;
292 } 292 }
293 } 293 }
294 #endif 294 #endif
295 295
296 296