-diff -u -r ../openssh-6.6p1/servconf.c ./servconf.c
---- ../openssh-6.6p1/servconf.c 2014-02-04 01:12:57.000000000 +0100
-+++ ./servconf.c 2014-06-04 13:18:34.672668616 +0200
-@@ -185,7 +185,7 @@
+diff -u -r ../openssh-7.5p1/servconf.c ./servconf.c
+--- ../openssh-7.5p1/servconf.c 2017-03-20 03:39:27.000000000 +0100
++++ ./servconf.c 2017-03-24 00:08:05.880913398 +0100
+@@ -212,7 +212,7 @@
}
/* No certificates by default */
if (options->num_ports == 0)
- options->ports[options->num_ports++] = SSH_DEFAULT_PORT;
+ options->ports[options->num_ports++] = 8022 /*SSH_DEFAULT_PORT*/;
+ if (options->address_family == -1)
+ options->address_family = AF_UNSPEC;
if (options->listen_addrs == NULL)
- add_listen_addr(options, NULL, 0);
- if (options->pid_file == NULL)
-@@ -530,7 +530,7 @@
+@@ -336,9 +336,13 @@
+
+ assemble_algorithms(options);
+
+- /* Turn privilege separation and sandboxing on by default */
+ if (use_privsep == -1)
++#ifdef __ANDROID__
++ use_privsep = PRIVSEP_OFF;
++#else
++ /* Turn privilege separation and sandboxing on by default */
+ use_privsep = PRIVSEP_ON;
++#endif
+
+ #define CLEAR_ON_NONE(v) \
+ do { \
+@@ -675,7 +679,7 @@
u_int i;
if (options->num_ports == 0)
+ options->ports[options->num_ports++] = 8022 /*SSH_DEFAULT_PORT*/;
if (options->address_family == -1)
options->address_family = AF_UNSPEC;
- if (port == 0)
+