|
Lines 1-7
Link Here
|
| 1 |
--- servconf.c.orig 2013-05-12 21:26:30.642630751 -0500 |
1 |
--- servconf.c.orig 2014-02-04 01:12:57.000000000 +0100 |
| 2 |
+++ servconf.c 2013-05-12 21:52:43.069625377 -0500 |
2 |
+++ servconf.c 2014-11-12 21:29:56.941407643 +0100 |
| 3 |
@@ -162,7 +162,7 @@ |
3 |
@@ -54,6 +54,7 @@ |
|
|
4 |
#include "packet.h" |
| 5 |
#include "hostfile.h" |
| 6 |
#include "auth.h" |
| 7 |
+#include "version.h" |
| 4 |
|
8 |
|
|
|
9 |
static void add_listen_addr(ServerOptions *, char *, int); |
| 10 |
static void add_one_listen_addr(ServerOptions *, char *, int); |
| 11 |
@@ -160,7 +161,7 @@ |
| 12 |
{ |
| 5 |
/* Portable-specific options */ |
13 |
/* Portable-specific options */ |
| 6 |
if (options->use_pam == -1) |
14 |
if (options->use_pam == -1) |
| 7 |
- options->use_pam = 0; |
15 |
- options->use_pam = 0; |
|
Lines 9-15
Link Here
|
| 9 |
|
17 |
|
| 10 |
/* Standard Options */ |
18 |
/* Standard Options */ |
| 11 |
if (options->protocol == SSH_PROTO_UNKNOWN) |
19 |
if (options->protocol == SSH_PROTO_UNKNOWN) |
| 12 |
@@ -197,7 +197,7 @@ |
20 |
@@ -197,7 +198,7 @@ |
| 13 |
if (options->key_regeneration_time == -1) |
21 |
if (options->key_regeneration_time == -1) |
| 14 |
options->key_regeneration_time = 3600; |
22 |
options->key_regeneration_time = 3600; |
| 15 |
if (options->permit_root_login == PERMIT_NOT_SET) |
23 |
if (options->permit_root_login == PERMIT_NOT_SET) |
|
Lines 18-24
Link Here
|
| 18 |
if (options->ignore_rhosts == -1) |
26 |
if (options->ignore_rhosts == -1) |
| 19 |
options->ignore_rhosts = 1; |
27 |
options->ignore_rhosts = 1; |
| 20 |
if (options->ignore_user_known_hosts == -1) |
28 |
if (options->ignore_user_known_hosts == -1) |
| 21 |
@@ -207,7 +207,7 @@ |
29 |
@@ -207,7 +208,7 @@ |
| 22 |
if (options->print_lastlog == -1) |
30 |
if (options->print_lastlog == -1) |
| 23 |
options->print_lastlog = 1; |
31 |
options->print_lastlog = 1; |
| 24 |
if (options->x11_forwarding == -1) |
32 |
if (options->x11_forwarding == -1) |
|
Lines 27-33
Link Here
|
| 27 |
if (options->x11_display_offset == -1) |
35 |
if (options->x11_display_offset == -1) |
| 28 |
options->x11_display_offset = 10; |
36 |
options->x11_display_offset = 10; |
| 29 |
if (options->x11_use_localhost == -1) |
37 |
if (options->x11_use_localhost == -1) |
| 30 |
@@ -245,7 +245,11 @@ |
38 |
@@ -247,7 +248,11 @@ |
| 31 |
if (options->gss_cleanup_creds == -1) |
39 |
if (options->gss_cleanup_creds == -1) |
| 32 |
options->gss_cleanup_creds = 1; |
40 |
options->gss_cleanup_creds = 1; |
| 33 |
if (options->password_authentication == -1) |
41 |
if (options->password_authentication == -1) |
|
Lines 39-46
Link Here
|
| 39 |
if (options->kbd_interactive_authentication == -1) |
47 |
if (options->kbd_interactive_authentication == -1) |
| 40 |
options->kbd_interactive_authentication = 0; |
48 |
options->kbd_interactive_authentication = 0; |
| 41 |
if (options->challenge_response_authentication == -1) |
49 |
if (options->challenge_response_authentication == -1) |
| 42 |
@@ -335,7 +339,7 @@ |
50 |
@@ -299,10 +304,10 @@ |
| 43 |
options->version_addendum = xstrdup(""); |
51 |
if (options->ip_qos_bulk == -1) |
|
|
52 |
options->ip_qos_bulk = IPTOS_THROUGHPUT; |
| 53 |
if (options->version_addendum == NULL) |
| 54 |
- options->version_addendum = xstrdup(""); |
| 55 |
+ options->version_addendum = xstrdup(SSH_VERSION_FREEBSD_PORT); |
| 44 |
/* Turn privilege separation on by default */ |
56 |
/* Turn privilege separation on by default */ |
| 45 |
if (use_privsep == -1) |
57 |
if (use_privsep == -1) |
| 46 |
- use_privsep = PRIVSEP_NOSANDBOX; |
58 |
- use_privsep = PRIVSEP_NOSANDBOX; |