Mercurial > dropbear

comparison svr-main.c @ 1499:2d450c1056e3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
options: Complete the transition to numeric toggles (`#if') For the sake of review, this commit alters only the code; the affiliated comments within the source files also need to be updated, but doing so now would obscure the operational changes that have been made here. * All on/off options have been switched to the numeric `#if' variant; that is the only way to make this `default_options.h.in' thing work in a reasonable manner. * There is now some very minor compile-time checking of the user's choice of options. * NO_FAST_EXPTMOD doesn't seem to be used, so it has been removed. * ENABLE_USER_ALGO_LIST was supposed to be renamed DROPBEAR_USER_ALGO_LIST, and this commit completes that work. * DROPBEAR_FUZZ seems to be a relatively new, as-yet undocumented option, which was added by the following commit: commit 6e0b539e9ca0b5628c6c5a3d118ad6a2e79e8039 Author: Matt Johnston <[email protected]> Date: Tue May 23 22:29:21 2017 +0800 split out checkpubkey_line() separately It has now been added to `sysoptions.h' and defined as `0' by default. * The configuration option `DROPBEAR_PASSWORD_ENV' is no longer listed in `default_options.h.in'; it is no longer meant to be set by the user, and is instead left to be defined in `sysoptions.h' (where it was already being defined) as merely the name of the environment variable in question: DROPBEAR_PASSWORD To enable or disable use of that environment variable, the user must now toggle `DROPBEAR_USE_DROPBEAR_PASSWORD'. * The sFTP support is now toggled by setting `DROPBEAR_SFTPSERVER', and the path of the sFTP server program is set independently through the usual SFTPSERVER_PATH.
author Michael Witten <mfwitten@gmail.com>
date Thu, 20 Jul 2017 19:38:26 +0000
parents 0c16b4ccbd54
children 1028b0111f89
comparison
equal deleted inserted replaced
1497:bf9c06b8dad9 1499:2d450c1056e3
33 33
34 static size_t listensockets(int *sock, size_t sockcount, int *maxfd); 34 static size_t listensockets(int *sock, size_t sockcount, int *maxfd);
35 static void sigchld_handler(int dummy); 35 static void sigchld_handler(int dummy);
36 static void sigsegv_handler(int); 36 static void sigsegv_handler(int);
37 static void sigintterm_handler(int fish); 37 static void sigintterm_handler(int fish);
38 #ifdef INETD_MODE 38 #if INETD_MODE
39 static void main_inetd(void); 39 static void main_inetd(void);
40 #endif 40 #endif
41 #ifdef NON_INETD_MODE 41 #if NON_INETD_MODE
42 static void main_noinetd(void); 42 static void main_noinetd(void);
43 #endif 43 #endif
44 static void commonsetup(void); 44 static void commonsetup(void);
45 45
46 #if defined(DBMULTI_dropbear) || !DROPBEAR_MULTI 46 #if defined(DBMULTI_dropbear) || !DROPBEAR_MULTI
56 disallow_core(); 56 disallow_core();
57 57
58 /* get commandline options */ 58 /* get commandline options */
59 svr_getopts(argc, argv); 59 svr_getopts(argc, argv);
60 60
61 #ifdef INETD_MODE 61 #if INETD_MODE
62 /* service program mode */ 62 /* service program mode */
63 if (svr_opts.inetdmode) { 63 if (svr_opts.inetdmode) {
64 main_inetd(); 64 main_inetd();
65 /* notreached */ 65 /* notreached */
66 } 66 }
67 #endif 67 #endif
68 68
69 #ifdef NON_INETD_MODE 69 #if NON_INETD_MODE
70 main_noinetd(); 70 main_noinetd();
71 /* notreached */ 71 /* notreached */
72 #endif 72 #endif
73 73
74 dropbear_exit("Compiled without normal mode, can't run without -i\n"); 74 dropbear_exit("Compiled without normal mode, can't run without -i\n");
75 return -1; 75 return -1;
76 } 76 }
77 #endif 77 #endif
78 78
79 #ifdef INETD_MODE 79 #if INETD_MODE
80 static void main_inetd() { 80 static void main_inetd() {
81 char *host, *port = NULL; 81 char *host, *port = NULL;
82 82
83 /* Set up handlers, syslog, seed random */ 83 /* Set up handlers, syslog, seed random */
84 commonsetup(); 84 commonsetup();
101 101
102 /* notreached */ 102 /* notreached */
103 } 103 }
104 #endif /* INETD_MODE */ 104 #endif /* INETD_MODE */
105 105
106 #ifdef NON_INETD_MODE 106 #if NON_INETD_MODE
107 static void main_noinetd() { 107 static void main_noinetd() {
108 fd_set fds; 108 fd_set fds;
109 unsigned int i, j; 109 unsigned int i, j;
110 int val; 110 int val;
111 int maxsock = -1; 111 int maxsock = -1;