X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fipcp.c;h=abeae25b4d1cc5fde77b30228669406980ce8ada;hp=310f869067ef2b3484e4106d52ff1e1a63d7dbee;hb=257999f8445702fd2a9c4e843ed30e2dbcff528b;hpb=08b5e975f6d15eae1998b76d2aea04186e039cc9

diff --git a/pppd/ipcp.c b/pppd/ipcp.c
index 310f869..abeae25 100644
--- a/pppd/ipcp.c
+++ b/pppd/ipcp.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: ipcp.c,v 1.15 1995/04/24 05:58:38 paulus Exp $";
+static char rcsid[] = "$Id: ipcp.c,v 1.16 1995/04/26 06:46:50 paulus Exp $";
 #endif
 
 /*
@@ -778,6 +778,12 @@ ipcp_reqci(f, inp, len, reject_if_disagree)
 		    tl = ntohl(wo->hisaddr);
 		    PUTLONG(tl, p);
 		}
+	    } else if (ciaddr1 == 0 && wo->hisaddr == 0) {
+		/*
+		 * If neither we nor he knows his address, reject the option.
+		 */
+		orc = CONFREJ;
+		break;
 	    }
 
 	    /*
@@ -832,6 +838,12 @@ ipcp_reqci(f, inp, len, reject_if_disagree)
 		    tl = ntohl(wo->hisaddr);
 		    PUTLONG(tl, p);
 		}
+	    } else if (ciaddr1 == 0 && wo->hisaddr == 0) {
+		/*
+		 * Don't ACK an address of 0.0.0.0 - reject it instead.
+		 */
+		orc = CONFREJ;
+		break;
 	    }
 	
 	    ho->neg_addr = 1;