summaryrefslogtreecommitdiff
path: root/dbutil.c
diff options
context:
space:
mode:
authorMichael Witten <mfwitten@gmail.com>2017-07-20 19:38:26 +0000
committerMichael Witten <mfwitten@gmail.com>2017-07-20 19:38:26 +0000
commit9530d2e5d42c7cfe319e071906dea93957882653 (patch)
treecd5326daf724a419368e0eb2fbdd8f14eb4b0f1f /dbutil.c
parentefb17566cd56ef96a7839c0e10cecdc6d7561793 (diff)
downloaddropbear-9530d2e5d42c7cfe319e071906dea93957882653.tar.gz
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 <matt@ucc.asn.au> 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.
Diffstat (limited to 'dbutil.c')
-rw-r--r--dbutil.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dbutil.c b/dbutil.c
index 1134dd6..18fe634 100644
--- a/dbutil.c
+++ b/dbutil.c
@@ -214,7 +214,7 @@ void dropbear_trace2(const char* format, ...) {
#endif /* DEBUG_TRACE */
/* Connect to a given unix socket. The socket is blocking */
-#ifdef ENABLE_CONNECT_UNIX
+#if ENABLE_CONNECT_UNIX
int connect_unix(const char* path) {
struct sockaddr_un addr;
int fd = -1;