X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fauth.c;h=b9115b943757ea13250701a35bdd57fbff8c1c84;hp=40cb42738f008bca21d3e028efd2740aecd5a181;hb=f04768b39f0b81bef6f2b785ee7cbfc11b612f52;hpb=3d6b2e94e31ea1f49b81a4d1d4c2289d4058b26a

diff --git a/pppd/auth.c b/pppd/auth.c
index 40cb427..b9115b9 100644
--- a/pppd/auth.c
+++ b/pppd/auth.c
@@ -10,16 +10,11 @@
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The name(s) of the authors of this software must not be used to
+ * 2. The name(s) of the authors of this software must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission.
  *
- * 4. Redistributions of any form whatsoever must retain the following
+ * 3. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
  *    "This product includes software developed by Paul Mackerras
  *     <paulus@samba.org>".
@@ -73,7 +68,7 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#define RCSID	"$Id: auth.c,v 1.97 2004/10/28 00:33:47 paulus Exp $"
+#define RCSID	"$Id: auth.c,v 1.100 2004/11/06 05:39:23 paulus Exp $"
 
 #include <stdio.h>
 #include <stddef.h>
@@ -1109,12 +1104,14 @@ auth_check_options()
     if (auth_required) {
 	allow_any_ip = 0;
 	if (!wo->neg_chap && !wo->neg_upap && !wo->neg_eap) {
-	    wo->neg_chap = 1; wo->chap_mdtype = MDTYPE_ALL;
+	    wo->neg_chap = chap_mdtype_all != MDTYPE_NONE;
+	    wo->chap_mdtype = chap_mdtype_all;
 	    wo->neg_upap = 1;
 	    wo->neg_eap = 1;
 	}
     } else {
-	wo->neg_chap = 0; wo->chap_mdtype = MDTYPE_NONE;
+	wo->neg_chap = 0;
+	wo->chap_mdtype = MDTYPE_NONE;
 	wo->neg_upap = 0;
 	wo->neg_eap = 0;
     }