~ubuntu-branches/debian/jessie/ppp/jessie

« back to all changes in this revision

Viewing changes to debian/patches/006_ipcp.c.diff

  • Committer: Bazaar Package Importer
  • Author(s): Michael Beattie
  • Date: 2001-12-11 00:24:05 UTC
  • Revision ID: james.westby@ubuntu.com-20011211002405-gcsjlgalwyjf99m2
Tags: 2.4.1.uus-4
Use MAKEDEV in postinst, not mknod. (Closes: #122574)

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
--- ppp-2.4.0b4.orig/pppd/ipcp.c
 
2
+++ ppp-2.4.0b4/pppd/ipcp.c
 
3
@@ -241,6 +241,13 @@
 
4
 #define CILEN_ADDR     6       /* new-style single address option */
 
5
 #define CILEN_ADDRS    10      /* old-style dual address option */
 
6
 
 
7
+/*
 
8
+ * Added to allow static and dynamic ips(s)
 
9
+ * Hold the static address from pap-secrets
 
10
+ */
 
11
+u_int32_t staticaddr;
 
12
+/******************************************/
 
13
+
 
14
 
 
15
 #define CODENAME(x)    ((x) == CONFACK ? "ACK" : \
 
16
                         (x) == CONFNAK ? "NAK" : "REJ")
 
17
@@ -1263,6 +1270,15 @@
 
18
                orc = CONFNAK;
 
19
                if (!reject_if_disagree) {
 
20
                    DECPTR(sizeof(u_int32_t), p);
 
21
+       
 
22
+           /*
 
23
+            * Added to allow static and dynamic ip(s) 
 
24
+            * Are they asking for their static ip from pap-secrets?
 
25
+            */
 
26
+           if(ciaddr1 !=0 && ciaddr1 == staticaddr)
 
27
+              wo->hisaddr = staticaddr;      /* Let them use the static ip */
 
28
+           /*******************************************/       
 
29
+       
 
30
                    tl = ntohl(wo->hisaddr);
 
31
                    PUTLONG(tl, p);
 
32
                }