comparison runopts.h @ 910:89555751c489 asm

merge up to 2013.63, improve ASM makefile rules a bit
author Matt Johnston <matt@ucc.asn.au>
date Thu, 27 Feb 2014 21:35:58 +0800
parents f4bb964c8678
children a0819ecfee0b
comparison
equal deleted inserted replaced
909:e4b75744acab 910:89555751c489
54 54
55 } runopts; 55 } runopts;
56 56
57 extern runopts opts; 57 extern runopts opts;
58 58
59 int readhostkey(const char * filename, sign_key * hostkey, int *type); 59 int readhostkey(const char * filename, sign_key * hostkey,
60 enum signkey_type *type);
61 void load_all_hostkeys();
60 62
61 typedef struct svr_runopts { 63 typedef struct svr_runopts {
62 64
63 char * rsakeyfile;
64 char * dsskeyfile;
65 char * bannerfile; 65 char * bannerfile;
66 66
67 int forkbg; 67 int forkbg;
68 int usingsyslog; 68 int usingsyslog;
69 69
97 #ifdef ENABLE_SVR_LOCALTCPFWD 97 #ifdef ENABLE_SVR_LOCALTCPFWD
98 int nolocaltcp; 98 int nolocaltcp;
99 #endif 99 #endif
100 100
101 sign_key *hostkey; 101 sign_key *hostkey;
102
103 int delay_hostkey;
104
105 char *hostkey_files[MAX_HOSTKEYS];
106 int num_hostkey_files;
107
102 buffer * banner; 108 buffer * banner;
103 char * pidfile; 109 char * pidfile;
104 110
105 } svr_runopts; 111 } svr_runopts;
106 112