Attachment 149339 Details for Bug 193127 – Patch for the servconf.c patch

[patch] Patch for the servconf.c patch

patch-files__patch-servconf.c (text/plain), 2.17 KB, created by Bernard Spil on 2014-11-12 20:39:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2014-11-12 20:39:46 UTC

Size: 2.17 KB

patch

obsolete

>--- files/patch-servconf.c.orig	2014-11-12 21:33:46.274393078 +0100
>+++ files/patch-servconf.c	2014-11-12 21:30:37.642407851 +0100
>@@ -1,7 +1,15 @@
>---- servconf.c.orig	2013-05-12 21:26:30.642630751 -0500
>-+++ servconf.c	2013-05-12 21:52:43.069625377 -0500
>-@@ -162,7 +162,7 @@
>+--- servconf.c.orig	2014-02-04 01:12:57.000000000 +0100
>++++ servconf.c	2014-11-12 21:29:56.941407643 +0100
>+@@ -54,6 +54,7 @@
>+ #include "packet.h"
>+ #include "hostfile.h"
>+ #include "auth.h"
>++#include "version.h"
>  
>+ static void add_listen_addr(ServerOptions *, char *, int);
>+ static void add_one_listen_addr(ServerOptions *, char *, int);
>+@@ -160,7 +161,7 @@
>+ {
>  	/* Portable-specific options */
>  	if (options->use_pam == -1)
> -		options->use_pam = 0;
>@@ -9,7 +17,7 @@
>  
>  	/* Standard Options */
>  	if (options->protocol == SSH_PROTO_UNKNOWN)
>-@@ -197,7 +197,7 @@
>+@@ -197,7 +198,7 @@
>  	if (options->key_regeneration_time == -1)
>  		options->key_regeneration_time = 3600;
>  	if (options->permit_root_login == PERMIT_NOT_SET)
>@@ -18,7 +26,7 @@
>  	if (options->ignore_rhosts == -1)
>  		options->ignore_rhosts = 1;
>  	if (options->ignore_user_known_hosts == -1)
>-@@ -207,7 +207,7 @@
>+@@ -207,7 +208,7 @@
>  	if (options->print_lastlog == -1)
>  		options->print_lastlog = 1;
>  	if (options->x11_forwarding == -1)
>@@ -27,7 +35,7 @@
>  	if (options->x11_display_offset == -1)
>  		options->x11_display_offset = 10;
>  	if (options->x11_use_localhost == -1)
>-@@ -245,7 +245,11 @@
>+@@ -247,7 +248,11 @@
>  	if (options->gss_cleanup_creds == -1)
>  		options->gss_cleanup_creds = 1;
>  	if (options->password_authentication == -1)
>@@ -39,8 +47,12 @@
>  	if (options->kbd_interactive_authentication == -1)
>  		options->kbd_interactive_authentication = 0;
>  	if (options->challenge_response_authentication == -1)
>-@@ -335,7 +339,7 @@
>- 		options->version_addendum = xstrdup("");
>+@@ -299,10 +304,10 @@
>+ 	if (options->ip_qos_bulk == -1)
>+ 		options->ip_qos_bulk = IPTOS_THROUGHPUT;
>+ 	if (options->version_addendum == NULL)
>+-		options->version_addendum = xstrdup("");
>++		options->version_addendum = xstrdup(SSH_VERSION_FREEBSD_PORT);
>  	/* Turn privilege separation on by default */
>  	if (use_privsep == -1)
> -		use_privsep = PRIVSEP_NOSANDBOX;

Actions: View | Diff

Attachments on bug 193127: 146494 | 146504 | 146507 | 146576 | 149338 | 149339 | 149340