head	1.2;
access;
symbols;
locks; strict;
comment	@# @;


1.2
date	2007.09.08.01.18.31;	author mnag;	state dead;
branches;
next	1.1;

1.1
date	2007.08.30.15.40.39;	author mnag;	state Exp;
branches;
next	;


desc
@@


1.2
log
@- Update to 4.7p1
- Update HPN patch to 4.7p1-hpn12v18
- Mark as BROKEN WITH_KERB_GSSAPI while developer release a new patch
@
text
@#
# Backported from OpenBSD:
#
# Move C/R -> kbdint special case to after the defaults have been
# loaded, which makes ChallengeResponse default to yes again.  This
# was broken by the Match changes and not fixed properly subsequently.
# Found by okan at demirmen.com, ok djm@@ "please do it" deraadt@@
#
--- servconf.c.orig	2007-08-30 11:50:17.000000000 -0300
+++ servconf.c	2007-08-30 11:50:38.000000000 -0300
@@@@ -1387,8 +1387,4 @@@@
 	if (bad_options > 0)
 		fatal("%s: terminating, %d bad configuration options",
 		    filename, bad_options);
-
-	/* challenge-response is implemented via keyboard interactive */
-	if (options->challenge_response_authentication == 1)
-		options->kbd_interactive_authentication = 1;
 }
--- sshd.c.orig	2007-08-30 11:50:30.000000000 -0300
+++ sshd.c	2007-08-30 11:51:42.000000000 -0300
@@@@ -1421,6 +1421,10 @@@@
 	/* Fill in default values for those options not explicitly set. */
 	fill_default_server_options(&options);
 
+	/* challenge-response is implemented via keyboard interactive */
+	if (options.challenge_response_authentication)
+		options.kbd_interactive_authentication = 1;
+
 	/* set default channel AF */
 	channel_set_af(options.address_family);
 
@


1.1
log
@- Enable ssl-engine
- Update gsskex patch to 4.6p1-gsskex-20070312
- Update lpk patch to 4.6p1-0.3.9
- Update hpn patch to 4.6p1-hpn12v17
- Fix challenge-response issue
- Bump PORTREVISION

Reported by:	Stefan Lambrev [1], ale@@ [1]
@
text
@@

