comparison runopts.h @ 801:7dcb46da72d9 ecc

merge in HEAD
author Matt Johnston <matt@ucc.asn.au>
date Tue, 21 May 2013 12:09:35 +0800
parents 7f604f9b3756 7fc0aeada79c
children d4ce5269a439
comparison
equal deleted inserted replaced
799:c344607b7341 801:7dcb46da72d9
122 char *username; 122 char *username;
123 123
124 char *cmd; 124 char *cmd;
125 int wantpty; 125 int wantpty;
126 int always_accept_key; 126 int always_accept_key;
127 int no_hostkey_check;
127 int no_cmd; 128 int no_cmd;
128 int backgrounded; 129 int backgrounded;
129 int is_subsystem; 130 int is_subsystem;
130 #ifdef ENABLE_CLI_PUBKEY_AUTH 131 #ifdef ENABLE_CLI_PUBKEY_AUTH
131 m_list *privkeys; /* Keys to use for public-key auth */ 132 m_list *privkeys; /* Keys to use for public-key auth */