Merge pull request #169 from SimonTate/fix-pppoe-empty-password

pppd: Fix blank password usage

Signed-off-by: Paul Mackerras <paulus@ozlabs.org>

diff --git a/pppd/auth.c b/pppd/auth.c
index ec137109141fa6428eed257862326aaf6048afff..3641b6ea701f11af845331926d308c366103a4d5 100644 (file)
--- a/pppd/auth.c
+++ b/pppd/auth.c
@@ -1338,7 +1338,7 @@ auth_reset(unit)
     hadchap = -1;
     ao->neg_upap = !refuse_pap && (passwd[0] != 0 || get_pap_passwd(NULL));
     ao->neg_chap = (!refuse_chap || !refuse_mschap || !refuse_mschap_v2)
-       && (passwd[0] != 0 ||
+       && ((passwd[0] != 0 || explicit_passwd) ||
            (hadchap = have_chap_secret(user, (explicit_remote? remote_name:
                                               NULL), 0, NULL)));
     ao->neg_eap = !refuse_eap && (