comparison svr-runopts.c @ 293:9d110777f345 contrib-blacklist

propagate from branch 'au.asn.ucc.matt.dropbear' (head 7ad1775ed65e75dbece27fe6b65bf1a234db386a) to branch 'au.asn.ucc.matt.dropbear.contrib.blacklist' (head 1d86a4f0a401cc68c2670d821a2f6366c37af143)
author Matt Johnston <matt@ucc.asn.au>
date Fri, 10 Mar 2006 06:31:29 +0000
parents be18c7dd486e
children 973fccb59ea4 3bfbe95f9a14 0aaaf68e97dc
comparison
equal deleted inserted replaced
247:c07de41b53d7 293:9d110777f345
61 "-w Disallow root logins\n" 61 "-w Disallow root logins\n"
62 #if defined(ENABLE_SVR_PASSWORD_AUTH) || defined(ENABLE_SVR_PAM_AUTH) 62 #if defined(ENABLE_SVR_PASSWORD_AUTH) || defined(ENABLE_SVR_PAM_AUTH)
63 "-s Disable password logins\n" 63 "-s Disable password logins\n"
64 "-g Disable password logins for root\n" 64 "-g Disable password logins for root\n"
65 #endif 65 #endif
66 #ifndef DISABLE_LOCALTCPFWD 66 #ifdef ENABLE_SVR_LOCALTCPFWD
67 "-j Disable local port forwarding\n" 67 "-j Disable local port forwarding\n"
68 #endif 68 #endif
69 #ifndef DISABLE_REMOTETCPFWD 69 #ifdef ENABLE_SVR_REMOTETCPFWD
70 "-k Disable remote port forwarding\n" 70 "-k Disable remote port forwarding\n"
71 #endif 71 "-a Allow connections to forwarded ports from any host\n"
72 "-p port Listen on specified tcp port, up to %d can be specified\n" 72 #endif
73 "-p port Listen on specified tcp port, up to %d can be specified\n"
73 " (default %s if none specified)\n" 74 " (default %s if none specified)\n"
74 #ifdef INETD_MODE 75 #ifdef INETD_MODE
75 "-i Start for inetd\n" 76 "-i Start for inetd\n"
76 #endif 77 #endif
77 #ifdef DEBUG_TRACE 78 #ifdef DEBUG_TRACE
102 svr_opts.noauthpass = 0; 103 svr_opts.noauthpass = 0;
103 svr_opts.norootpass = 0; 104 svr_opts.norootpass = 0;
104 svr_opts.inetdmode = 0; 105 svr_opts.inetdmode = 0;
105 svr_opts.portcount = 0; 106 svr_opts.portcount = 0;
106 svr_opts.hostkey = NULL; 107 svr_opts.hostkey = NULL;
107 opts.nolocaltcp = 0; 108 #ifdef ENABLE_SVR_LOCALTCPFWD
108 opts.noremotetcp = 0; 109 svr_opts.nolocaltcp = 0;
110 #endif
111 #ifdef ENABLE_SVR_REMOTETCPFWD
112 svr_opts.noremotetcp = 0;
113 #endif
109 /* not yet 114 /* not yet
110 opts.ipv4 = 1; 115 opts.ipv4 = 1;
111 opts.ipv6 = 1; 116 opts.ipv6 = 1;
112 */ 117 */
113 #ifdef DO_MOTD 118 #ifdef DO_MOTD
114 svr_opts.domotd = 1; 119 svr_opts.domotd = 1;
115 #endif 120 #endif
116 #ifndef DISABLE_SYSLOG 121 #ifndef DISABLE_SYSLOG
117 svr_opts.usingsyslog = 1; 122 svr_opts.usingsyslog = 1;
123 #endif
124 #ifdef ENABLE_SVR_REMOTETCPFWD
125 opts.listen_fwd_all = 0;
118 #endif 126 #endif
119 127
120 for (i = 1; i < (unsigned int)argc; i++) { 128 for (i = 1; i < (unsigned int)argc; i++) {
121 if (next) { 129 if (next) {
122 *next = argv[i]; 130 *next = argv[i];
148 #ifndef DISABLE_SYSLOG 156 #ifndef DISABLE_SYSLOG
149 case 'E': 157 case 'E':
150 svr_opts.usingsyslog = 0; 158 svr_opts.usingsyslog = 0;
151 break; 159 break;
152 #endif 160 #endif
153 #ifndef DISABLE_LOCALTCPFWD 161 #ifdef ENABLE_SVR_LOCALTCPFWD
154 case 'j': 162 case 'j':
155 opts.nolocaltcp = 1; 163 svr_opts.nolocaltcp = 1;
156 break; 164 break;
157 #endif 165 #endif
158 #ifndef DISABLE_REMOTETCPFWD 166 #ifdef ENABLE_SVR_REMOTETCPFWD
159 case 'k': 167 case 'k':
160 opts.noremotetcp = 1; 168 svr_opts.noremotetcp = 1;
169 break;
170 case 'a':
171 opts.listen_fwd_all = 1;
161 break; 172 break;
162 #endif 173 #endif
163 #ifdef INETD_MODE 174 #ifdef INETD_MODE
164 case 'i': 175 case 'i':
165 svr_opts.inetdmode = 1; 176 svr_opts.inetdmode = 1;