X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;ds=sidebyside;f=pppd%2Feap.c;h=9773ae2add5ac114803487bc88c5d0dd3e9d4439;hb=e4b85dae99f201d2b9f3c1d3c4492154ef76a2e8;hp=4daada7bb56cd67dea305ba30cf46f5f1bc18370;hpb=566ef9ef0a7be9c4f099d07846000adb825e0b7a;p=ppp.git

diff --git a/pppd/eap.c b/pppd/eap.c
index 4daada7..9773ae2 100644
--- a/pppd/eap.c
+++ b/pppd/eap.c
@@ -48,6 +48,10 @@
  * Implemented EAP-TLS authentication
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -65,6 +69,9 @@
 #include "eap.h"
 
 #ifdef USE_SRP
+#ifdef HAVE_TIME_H
+#include <time.h>
+#endif
 #include <t_pwd.h>
 #include <t_server.h>
 #include <t_client.h>
@@ -82,6 +89,8 @@
 #ifdef CHAPMS
 #include "chap_ms.h"
 #include "chap-new.h"
+
+extern int chapms_strip_domain;
 #endif /* CHAPMS */
 
 eap_state eap_states[NUM_PPP];		/* EAP state; one for each unit */
@@ -550,7 +559,7 @@ eap_figure_next_state(eap_state *esp, int status)
 			tpw.pebuf.name = esp->es_server.ea_peer;
 			tpw.pebuf.password.len = t_fromb64((char *)tpw.pwbuf,
 			    cp);
-			tpw.pebuf.password.data = tpw.pwbuf;
+			tpw.pebuf.password.data = (char*) tpw.pwbuf;
 			tpw.pebuf.salt.len = t_fromb64((char *)tpw.saltbuf,
 			    cp2);
 			tpw.pebuf.salt.data = tpw.saltbuf;
@@ -2251,8 +2260,6 @@ eap_response(eap_state *esp, u_char *inp, int id, int len)
 	struct t_num A;
 	SHA1_CTX ctxt;
 	u_char dig[SHA_DIGESTSIZE];
-	SHA1_CTX ctxt;
-	u_char dig[SHA_DIGESTSIZE];
 #endif /* USE_SRP */
 
 #ifdef USE_EAPTLS
@@ -2545,6 +2552,14 @@ eap_response(eap_state *esp, u_char *inp, int id, int len)
 					(remote_name[0] != '\0' && vallen == len))
 				strlcpy(rhostname, remote_name, sizeof (rhostname));
 
+			/* strip the MS domain name */
+			if (chapms_strip_domain && strrchr(rhostname, '\\')) {
+				char tmp[MAXNAMELEN+1];
+
+				strcpy(tmp, strrchr(rhostname, '\\') + 1);
+				strcpy(rhostname, tmp);
+			}
+
 			if (chap_verify_hook)
 				chap_verifier = chap_verify_hook;
 			else
@@ -3011,6 +3026,7 @@ eap_printpkt(u_char *inp, int inlen,
 			break;
 #endif /* USE_EAPTLS */
 
+#ifdef USE_SRP
 		case EAPT_SRP:
 			if (len < 3)
 				goto truncated;
@@ -3098,6 +3114,7 @@ eap_printpkt(u_char *inp, int inlen,
 				break;
 			}
 			break;
+#endif  /* USE_SRP */
 		}
 		break;
 
@@ -3223,6 +3240,7 @@ eap_printpkt(u_char *inp, int inlen,
 			break;
 #endif /* CHAPMS */
 
+#ifdef USE_SRP
 		case EAPT_SRP:
 			if (len < 1)
 				goto truncated;
@@ -3267,6 +3285,7 @@ eap_printpkt(u_char *inp, int inlen,
 				break;
 			}
 			break;
+#endif  /* USE_SRP */
 		}
 		break;