Repaired MSLANMAN so that it doesn't drop core: need to pass offset into

response array, not address of stack pointer.  (Broken in r1.34.)

diff --git a/pppd/Makefile.sol2 b/pppd/Makefile.sol2
index 62b23702be5e125df030ab84bdb683ea2bdd54c8..49e73c7f07920f32334992ccbd856d8c76df819c 100644 (file)
--- a/pppd/Makefile.sol2
+++ b/pppd/Makefile.sol2
@@ -1,6 +1,6 @@
 #
 # Makefile for pppd under Solaris 2.
-# $Id: Makefile.sol2,v 1.28 2007/06/19 02:08:35 carlsonj Exp $
+# $Id: Makefile.sol2,v 1.29 2007/12/01 20:10:51 carlsonj Exp $
 #
 
 include ../Makedefs.com
@@ -33,7 +33,7 @@ LIBS  += -ldl
 #OBJS  += ipv6cp.o eui64.o
 
 # Uncomment to enable MS-CHAP
-#CFLAGS += -DUSE_CRYPT -DCHAPMS -DHAVE_CRYPT_H
+#CFLAGS += -DUSE_CRYPT -DCHAPMS -DMSLANMAN -DHAVE_CRYPT_H
 #OBJS += chap_ms.o pppcrypt.o md4.o sha1.o
 
 # Uncomment for CBCP

diff --git a/pppd/chap_ms.c b/pppd/chap_ms.c
index b8feeb825cb61974636580dfeb13b7a58faba7e6..aec12262ed46375d304b12f9b397acb88be21ba4 100644 (file)
--- a/pppd/chap_ms.c
+++ b/pppd/chap_ms.c
@@ -74,7 +74,7 @@
  *
  */
 
-#define RCSID  "$Id: chap_ms.c,v 1.37 2006/12/19 08:38:14 paulus Exp $"
+#define RCSID  "$Id: chap_ms.c,v 1.38 2007/12/01 20:10:51 carlsonj Exp $"
 
 #ifdef CHAPMS
 
@@ -819,7 +819,8 @@ ChapMS(u_char *rchallenge, char *secret, int secret_len,
     ChapMS_NT(rchallenge, secret, secret_len, &response[MS_CHAP_NTRESP]);
 
 #ifdef MSLANMAN
-    ChapMS_LANMan(rchallenge, secret, secret_len, &response);
+    ChapMS_LANMan(rchallenge, secret, secret_len,
+                 &response[MS_CHAP_LANMANRESP]);
 
     /* preferred method is set by option  */
     response[MS_CHAP_USENT] = !ms_lanman;