96 lines
3.2 KiB
Diff
96 lines
3.2 KiB
Diff
|
diff -u -r ../dropbear-2015.68/options.h ./options.h
|
||
|
|
--- ../dropbear-2015.68/options.h 2015-08-08 08:35:34.000000000 -0400
|
||
|
|
+++ ./options.h 2015-11-08 00:49:34.079208221 -0500
|
||
|
|
@@ -10,8 +10,10 @@
|
||
|
|
|
||
|
|
/* IMPORTANT: Many options will require "make clean" after changes */
|
||
|
|
|
||
|
|
+
|
||
|
|
+
|
||
|
|
#ifndef DROPBEAR_DEFPORT
|
||
|
|
-#define DROPBEAR_DEFPORT "22"
|
||
|
|
+#define DROPBEAR_DEFPORT "8022"
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#ifndef DROPBEAR_DEFADDRESS
|
||
|
|
@@ -21,13 +23,13 @@
|
||
|
|
|
||
|
|
/* Default hostkey paths - these can be specified on the command line */
|
||
|
|
#ifndef DSS_PRIV_FILENAME
|
||
|
|
-#define DSS_PRIV_FILENAME "/etc/dropbear/dropbear_dss_host_key"
|
||
|
|
+#define DSS_PRIV_FILENAME "@TERMUX_PREFIX@/etc/dropbear/dropbear_dss_host_key"
|
||
|
|
#endif
|
||
|
|
#ifndef RSA_PRIV_FILENAME
|
||
|
|
-#define RSA_PRIV_FILENAME "/etc/dropbear/dropbear_rsa_host_key"
|
||
|
|
+#define RSA_PRIV_FILENAME "@TERMUX_PREFIX@/etc/dropbear/dropbear_rsa_host_key"
|
||
|
|
#endif
|
||
|
|
#ifndef ECDSA_PRIV_FILENAME
|
||
|
|
-#define ECDSA_PRIV_FILENAME "/etc/dropbear/dropbear_ecdsa_host_key"
|
||
|
|
+#define ECDSA_PRIV_FILENAME "@TERMUX_PREFIX@/etc/dropbear/dropbear_ecdsa_host_key"
|
||
|
|
#endif
|
||
|
|
|
||
|
|
/* Set NON_INETD_MODE if you require daemon functionality (ie Dropbear listens
|
||
|
|
@@ -41,7 +43,7 @@
|
||
|
|
* Both of these flags can be defined at once, don't compile without at least
|
||
|
|
* one of them. */
|
||
|
|
#define NON_INETD_MODE
|
||
|
|
-#define INETD_MODE
|
||
|
|
+#undef INETD_MODE
|
||
|
|
|
||
|
|
/* Setting this disables the fast exptmod bignum code. It saves ~5kB, but is
|
||
|
|
* perhaps 20% slower for pubkey operations (it is probably worth experimenting
|
||
|
|
@@ -55,7 +57,7 @@
|
||
|
|
#define DROPBEAR_SMALL_CODE
|
||
|
|
|
||
|
|
/* Enable X11 Forwarding - server only */
|
||
|
|
-#define ENABLE_X11FWD
|
||
|
|
+#undef ENABLE_X11FWD
|
||
|
|
|
||
|
|
/* Enable TCP Fowarding */
|
||
|
|
/* 'Local' is "-L" style (client listening port forwarded via server)
|
||
|
|
@@ -193,7 +195,7 @@
|
||
|
|
|
||
|
|
/* The MOTD file path */
|
||
|
|
#ifndef MOTD_FILENAME
|
||
|
|
-#define MOTD_FILENAME "/etc/motd"
|
||
|
|
+#define MOTD_FILENAME "@TERMUX_PREFIX@/etc/motd"
|
||
|
|
#endif
|
||
|
|
|
||
|
|
/* Authentication Types - at least one required.
|
||
|
|
@@ -206,7 +208,7 @@
|
||
|
|
* PAM challenge/response.
|
||
|
|
* You can't enable both PASSWORD and PAM. */
|
||
|
|
|
||
|
|
-#define ENABLE_SVR_PASSWORD_AUTH
|
||
|
|
+#undef ENABLE_SVR_PASSWORD_AUTH
|
||
|
|
/* PAM requires ./configure --enable-pam */
|
||
|
|
/*#define ENABLE_SVR_PAM_AUTH */
|
||
|
|
#define ENABLE_SVR_PUBKEY_AUTH
|
||
|
|
@@ -276,7 +278,7 @@
|
||
|
|
/* The default file to store the daemon's process ID, for shutdown
|
||
|
|
scripts etc. This can be overridden with the -P flag */
|
||
|
|
#ifndef DROPBEAR_PIDFILE
|
||
|
|
-#define DROPBEAR_PIDFILE "/var/run/dropbear.pid"
|
||
|
|
+#define DROPBEAR_PIDFILE "@TERMUX_PREFIX@/var/run/dropbear.pid"
|
||
|
|
#endif
|
||
|
|
|
||
|
|
/* The command to invoke for xauth when using X11 forwarding.
|
||
|
|
@@ -294,7 +296,7 @@
|
||
|
|
|
||
|
|
/* This is used by the scp binary when used as a client binary. If you're
|
||
|
|
* not using the Dropbear client, you'll need to change it */
|
||
|
|
-#define DROPBEAR_PATH_SSH_PROGRAM "/usr/bin/dbclient"
|
||
|
|
+#define DROPBEAR_PATH_SSH_PROGRAM "@TERMUX_PREFIX@/bin/dbclient"
|
||
|
|
|
||
|
|
/* Whether to log commands executed by a client. This only logs the
|
||
|
|
* (single) command sent to the server, not what a user did in a
|
||
|
|
@@ -336,7 +338,7 @@
|
||
|
|
#define DEFAULT_IDLE_TIMEOUT 0
|
||
|
|
|
||
|
|
/* The default path. This will often get replaced by the shell */
|
||
|
|
-#define DEFAULT_PATH "/usr/bin:/bin"
|
||
|
|
+#define DEFAULT_PATH "@TERMUX_PREFIX@/bin:/system/bin"
|
||
|
|
|
||
|
|
/* Some other defines (that mostly should be left alone) are defined
|
||
|
|
* in sysoptions.h */
|