~mdw / termux-packages / blame
| Commit | Line | Data |
|---|---|---|
| b79434aa FF |
1 | diff -u -r ../openssh-7.5p1/servconf.c ./servconf.c |
| 2 | --- ../openssh-7.5p1/servconf.c 2017-03-20 03:39:27.000000000 +0100 | |
| 3 | +++ ./servconf.c 2017-03-24 00:08:05.880913398 +0100 | |
| 4 | @@ -212,7 +212,7 @@ | |
| 59f0d218 FF |
5 | } |
| 6 | /* No certificates by default */ | |
| 7 | if (options->num_ports == 0) | |
| 8 | - options->ports[options->num_ports++] = SSH_DEFAULT_PORT; | |
| 9 | + options->ports[options->num_ports++] = 8022 /*SSH_DEFAULT_PORT*/; | |
| 84443dd2 FF |
10 | if (options->address_family == -1) |
| 11 | options->address_family = AF_UNSPEC; | |
| 59f0d218 | 12 | if (options->listen_addrs == NULL) |
| b79434aa FF |
13 | @@ -336,9 +336,13 @@ |
| 14 | ||
| 15 | assemble_algorithms(options); | |
| 16 | ||
| 17 | - /* Turn privilege separation and sandboxing on by default */ | |
| 18 | if (use_privsep == -1) | |
| 19 | +#ifdef __ANDROID__ | |
| 20 | + use_privsep = PRIVSEP_OFF; | |
| 21 | +#else | |
| 22 | + /* Turn privilege separation and sandboxing on by default */ | |
| 23 | use_privsep = PRIVSEP_ON; | |
| 24 | +#endif | |
| 25 | ||
| 26 | #define CLEAR_ON_NONE(v) \ | |
| 27 | do { \ | |
| 28 | @@ -675,7 +679,7 @@ | |
| 59f0d218 FF |
29 | u_int i; |
| 30 | ||
| 31 | if (options->num_ports == 0) | |
| 32 | - options->ports[options->num_ports++] = SSH_DEFAULT_PORT; | |
| 33 | + options->ports[options->num_ports++] = 8022 /*SSH_DEFAULT_PORT*/; | |
| 34 | if (options->address_family == -1) | |
| 35 | options->address_family = AF_UNSPEC; | |
| 84443dd2 | 36 |