-/* $OpenBSD: readconf.h,v 1.73 2008/06/11 21:01:35 grunk Exp $ */
+/* $OpenBSD: readconf.h,v 1.81 2010/01/09 23:04:13 dtucker Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
typedef struct {
char *listen_host; /* Host (address) to listen on. */
- u_short listen_port; /* Port to forward. */
+ int listen_port; /* Port to forward. */
char *connect_host; /* Host to connect. */
- u_short connect_port; /* Port to connect on connect_host. */
+ int connect_port; /* Port to connect on connect_host. */
} Forward;
/* Data structure for representing option data. */
* authentication. */
int kbd_interactive_authentication; /* Try keyboard-interactive auth. */
char *kbd_interactive_devices; /* Keyboard-interactive auth devices. */
+ int zero_knowledge_password_authentication; /* Try jpake */
int batch_mode; /* Batch mode: do not ask for passwords. */
int check_host_ip; /* Also keep track of keys for IP address */
int strict_host_key_checking; /* Strict host key checking. */
char *local_command;
int permit_local_command;
+ int visual_host_key;
-} Options;
+ int use_roaming;
-#define SSHCTL_CHECKHOSTIP_NO 0
-#define SSHCTL_CHECKHOSTIP_YES 1
-#define SSHCTL_CHECKHOSTIP_FPR 2
+} Options;
#define SSHCTL_MASTER_NO 0
#define SSHCTL_MASTER_YES 1
void initialize_options(Options *);
void fill_default_options(Options *);
int read_config_file(const char *, const char *, Options *, int);
-int parse_forward(Forward *, const char *);
+int parse_forward(Forward *, const char *, int, int);
int
process_config_line(Options *, const char *, char *, const char *, int, int *);