Commit | Line | Data |
---|---|---|
8bf3f3f0 FF |
1 | diff -u -r ../dropbear-2015.68/options.h ./options.h |
2 | --- ../dropbear-2015.68/options.h 2015-08-08 08:35:34.000000000 -0400 | |
3 | +++ ./options.h 2015-11-08 00:49:34.079208221 -0500 | |
4 | @@ -10,8 +10,10 @@ | |
5 | ||
6 | /* IMPORTANT: Many options will require "make clean" after changes */ | |
7 | ||
8 | + | |
9 | + | |
10 | #ifndef DROPBEAR_DEFPORT | |
11 | -#define DROPBEAR_DEFPORT "22" | |
12 | +#define DROPBEAR_DEFPORT "8022" | |
13 | #endif | |
14 | ||
15 | #ifndef DROPBEAR_DEFADDRESS | |
16 | @@ -21,13 +23,13 @@ | |
17 | ||
18 | /* Default hostkey paths - these can be specified on the command line */ | |
19 | #ifndef DSS_PRIV_FILENAME | |
20 | -#define DSS_PRIV_FILENAME "/etc/dropbear/dropbear_dss_host_key" | |
21 | +#define DSS_PRIV_FILENAME "@TERMUX_PREFIX@/etc/dropbear/dropbear_dss_host_key" | |
22 | #endif | |
23 | #ifndef RSA_PRIV_FILENAME | |
24 | -#define RSA_PRIV_FILENAME "/etc/dropbear/dropbear_rsa_host_key" | |
25 | +#define RSA_PRIV_FILENAME "@TERMUX_PREFIX@/etc/dropbear/dropbear_rsa_host_key" | |
26 | #endif | |
27 | #ifndef ECDSA_PRIV_FILENAME | |
28 | -#define ECDSA_PRIV_FILENAME "/etc/dropbear/dropbear_ecdsa_host_key" | |
29 | +#define ECDSA_PRIV_FILENAME "@TERMUX_PREFIX@/etc/dropbear/dropbear_ecdsa_host_key" | |
30 | #endif | |
31 | ||
32 | /* Set NON_INETD_MODE if you require daemon functionality (ie Dropbear listens | |
33 | @@ -41,7 +43,7 @@ | |
34 | * Both of these flags can be defined at once, don't compile without at least | |
35 | * one of them. */ | |
36 | #define NON_INETD_MODE | |
37 | -#define INETD_MODE | |
38 | +#undef INETD_MODE | |
39 | ||
40 | /* Setting this disables the fast exptmod bignum code. It saves ~5kB, but is | |
41 | * perhaps 20% slower for pubkey operations (it is probably worth experimenting | |
42 | @@ -55,7 +57,7 @@ | |
43 | #define DROPBEAR_SMALL_CODE | |
44 | ||
45 | /* Enable X11 Forwarding - server only */ | |
46 | -#define ENABLE_X11FWD | |
47 | +#undef ENABLE_X11FWD | |
48 | ||
49 | /* Enable TCP Fowarding */ | |
50 | /* 'Local' is "-L" style (client listening port forwarded via server) | |
51 | @@ -193,7 +195,7 @@ | |
52 | ||
53 | /* The MOTD file path */ | |
54 | #ifndef MOTD_FILENAME | |
55 | -#define MOTD_FILENAME "/etc/motd" | |
56 | +#define MOTD_FILENAME "@TERMUX_PREFIX@/etc/motd" | |
57 | #endif | |
58 | ||
59 | /* Authentication Types - at least one required. | |
60 | @@ -206,7 +208,7 @@ | |
61 | * PAM challenge/response. | |
62 | * You can't enable both PASSWORD and PAM. */ | |
63 | ||
64 | -#define ENABLE_SVR_PASSWORD_AUTH | |
65 | +#undef ENABLE_SVR_PASSWORD_AUTH | |
66 | /* PAM requires ./configure --enable-pam */ | |
67 | /*#define ENABLE_SVR_PAM_AUTH */ | |
68 | #define ENABLE_SVR_PUBKEY_AUTH | |
69 | @@ -276,7 +278,7 @@ | |
70 | /* The default file to store the daemon's process ID, for shutdown | |
71 | scripts etc. This can be overridden with the -P flag */ | |
72 | #ifndef DROPBEAR_PIDFILE | |
73 | -#define DROPBEAR_PIDFILE "/var/run/dropbear.pid" | |
74 | +#define DROPBEAR_PIDFILE "@TERMUX_PREFIX@/var/run/dropbear.pid" | |
75 | #endif | |
76 | ||
77 | /* The command to invoke for xauth when using X11 forwarding. | |
78 | @@ -294,7 +296,7 @@ | |
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 | @@ -336,7 +338,7 @@ | |
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" | |
92 | +#define DEFAULT_PATH "@TERMUX_PREFIX@/bin:/system/bin" | |
93 | ||
94 | /* Some other defines (that mostly should be left alone) are defined | |
95 | * in sysoptions.h */ |