Commit | Line | Data |
---|---|---|
85410959 FF |
1 | diff -u -r ../dropbear-2017.75/options.h ./options.h |
2 | --- ../dropbear-2017.75/options.h 2017-05-18 16:47:02.000000000 +0200 | |
3 | +++ ./options.h 2018-01-24 11:01:37.013064455 +0100 | |
651173d6 | 4 | @@ -11,7 +11,7 @@ |
8bf3f3f0 FF |
5 | /* IMPORTANT: Many options will require "make clean" after changes */ |
6 | ||
8bf3f3f0 FF |
7 | #ifndef DROPBEAR_DEFPORT |
8 | -#define DROPBEAR_DEFPORT "22" | |
9 | +#define DROPBEAR_DEFPORT "8022" | |
10 | #endif | |
11 | ||
12 | #ifndef DROPBEAR_DEFADDRESS | |
651173d6 | 13 | @@ -21,13 +21,13 @@ |
8bf3f3f0 FF |
14 | |
15 | /* Default hostkey paths - these can be specified on the command line */ | |
16 | #ifndef DSS_PRIV_FILENAME | |
17 | -#define DSS_PRIV_FILENAME "/etc/dropbear/dropbear_dss_host_key" | |
18 | +#define DSS_PRIV_FILENAME "@TERMUX_PREFIX@/etc/dropbear/dropbear_dss_host_key" | |
19 | #endif | |
20 | #ifndef RSA_PRIV_FILENAME | |
21 | -#define RSA_PRIV_FILENAME "/etc/dropbear/dropbear_rsa_host_key" | |
22 | +#define RSA_PRIV_FILENAME "@TERMUX_PREFIX@/etc/dropbear/dropbear_rsa_host_key" | |
23 | #endif | |
24 | #ifndef ECDSA_PRIV_FILENAME | |
25 | -#define ECDSA_PRIV_FILENAME "/etc/dropbear/dropbear_ecdsa_host_key" | |
26 | +#define ECDSA_PRIV_FILENAME "@TERMUX_PREFIX@/etc/dropbear/dropbear_ecdsa_host_key" | |
27 | #endif | |
28 | ||
29 | /* Set NON_INETD_MODE if you require daemon functionality (ie Dropbear listens | |
651173d6 FF |
30 | @@ -52,7 +52,7 @@ |
31 | several kB in binary size however will make the symmetrical ciphers and hashes | |
32 | slower, perhaps by 50%. Recommended for small systems that aren't doing | |
33 | much traffic. */ | |
34 | -#define DROPBEAR_SMALL_CODE | |
35 | +#undef DROPBEAR_SMALL_CODE | |
8bf3f3f0 FF |
36 | |
37 | /* Enable X11 Forwarding - server only */ | |
651173d6 | 38 | #define ENABLE_X11FWD |
85410959 | 39 | @@ -198,7 +198,7 @@ |
8bf3f3f0 FF |
40 | |
41 | /* The MOTD file path */ | |
42 | #ifndef MOTD_FILENAME | |
43 | -#define MOTD_FILENAME "/etc/motd" | |
44 | +#define MOTD_FILENAME "@TERMUX_PREFIX@/etc/motd" | |
45 | #endif | |
46 | ||
47 | /* Authentication Types - at least one required. | |
85410959 | 48 | @@ -213,7 +213,7 @@ |
8bf3f3f0 | 49 | |
651173d6 FF |
50 | /* This requires crypt() */ |
51 | #ifdef HAVE_CRYPT | |
8bf3f3f0 FF |
52 | -#define ENABLE_SVR_PASSWORD_AUTH |
53 | +#undef ENABLE_SVR_PASSWORD_AUTH | |
651173d6 | 54 | #endif |
8bf3f3f0 FF |
55 | /* PAM requires ./configure --enable-pam */ |
56 | /*#define ENABLE_SVR_PAM_AUTH */ | |
85410959 | 57 | @@ -287,25 +287,25 @@ |
8bf3f3f0 FF |
58 | /* The default file to store the daemon's process ID, for shutdown |
59 | scripts etc. This can be overridden with the -P flag */ | |
60 | #ifndef DROPBEAR_PIDFILE | |
61 | -#define DROPBEAR_PIDFILE "/var/run/dropbear.pid" | |
62 | +#define DROPBEAR_PIDFILE "@TERMUX_PREFIX@/var/run/dropbear.pid" | |
63 | #endif | |
64 | ||
65 | /* The command to invoke for xauth when using X11 forwarding. | |
85410959 FF |
66 | * "-q" for quiet */ |
67 | #ifndef XAUTH_COMMAND | |
68 | -#define XAUTH_COMMAND "/usr/bin/xauth -q" | |
69 | +#define XAUTH_COMMAND "@TERMUX_PREFIX@/bin/xauth -q" | |
70 | #endif | |
71 | ||
72 | /* if you want to enable running an sftp server (such as the one included with | |
73 | * OpenSSH), set the path below. If the path isn't defined, sftp will not | |
74 | * be enabled */ | |
75 | #ifndef SFTPSERVER_PATH | |
76 | -#define SFTPSERVER_PATH "/usr/libexec/sftp-server" | |
77 | +#define SFTPSERVER_PATH "@TERMUX_PREFIX@/libexec/sftp-server" | |
78 | #endif | |
79 | ||
80 | /* This is used by the scp binary when used as a client binary. If you're | |
81 | * not using the Dropbear client, you'll need to change it */ | |
82 | -#define DROPBEAR_PATH_SSH_PROGRAM "/usr/bin/dbclient" | |
83 | +#define DROPBEAR_PATH_SSH_PROGRAM "@TERMUX_PREFIX@/bin/dbclient" | |
84 | ||
85 | /* Whether to log commands executed by a client. This only logs the | |
86 | * (single) command sent to the server, not what a user did in a | |
87 | @@ -347,7 +347,7 @@ | |
8bf3f3f0 FF |
88 | #define DEFAULT_IDLE_TIMEOUT 0 |
89 | ||
90 | /* The default path. This will often get replaced by the shell */ | |
91 | -#define DEFAULT_PATH "/usr/bin:/bin" | |
85410959 | 92 | +#define DEFAULT_PATH "@TERMUX_PREFIX@/bin" |
8bf3f3f0 FF |
93 | |
94 | /* Some other defines (that mostly should be left alone) are defined | |
95 | * in sysoptions.h */ |