fixed compilation errors and warnings

[ppp.git] / pppd / auth.c

diff --git a/pppd/auth.c b/pppd/auth.c
index ea6bf7b10d4b8dad4d27f28de832c788c51e941c..950ef024e6b7d0d361f7d2750ecebfaa4a652cc5 100644 (file)
--- a/pppd/auth.c
+++ b/pppd/auth.c
@@ -33,7 +33,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: auth.c,v 1.3 1994/04/18 03:59:28 paulus Exp $";
+static char rcsid[] = "$Id: auth.c,v 1.6 1994/05/25 06:25:05 paulus Exp $";
 #endif
 
 #include <stdio.h>
@@ -59,10 +59,6 @@ static char rcsid[] = "$Id: auth.c,v 1.3 1994/04/18 03:59:28 paulus Exp $";
 
 #ifdef sparc
 #include <alloca.h>
-#ifndef __GNUC__
-/* why alloca.h doesn't define what alloca() returns is a mystery */
-/* char *alloca __ARGS((int)); */
-#endif /*__GNUC__*/
 #endif /*sparc*/
 
 /* Used for storing a sequence of words.  Usually malloced. */
@@ -280,6 +276,7 @@ auth_withpeer_success(unit, protocol)
     default:
        syslog(LOG_WARNING, "auth_peer_success: unknown protocol %x",
               protocol);
+       bit = 0;
     }
 
     /*
@@ -643,6 +640,7 @@ get_secret(unit, client, server, secret, secret_len, save_addrs)
     char *server;
     char *secret;
     int *secret_len;
+    int save_addrs;
 {
     FILE *f;
     int ret, len;
@@ -696,6 +694,10 @@ auth_ip_addr(unit, addr)
     struct hostent *hp;
     struct wordlist *addrs;
 
+    /* don't allow loopback or multicast address */
+    if (bad_ip_adrs(addr))
+       return 0;
+
     if ((addrs = addresses[unit]) == NULL)
        return 1;               /* no restriction */
 
@@ -717,6 +719,20 @@ auth_ip_addr(unit, addr)
     return 0;                  /* not in list => can't have it */
 }
 
+/*
+ * bad_ip_adrs - return 1 if the IP address is one we don't want
+ * to use, such as an address in the loopback net or a multicast address.
+ * addr is in network byte order.
+ */
+int
+bad_ip_adrs(addr)
+    u_long addr;
+{
+    addr = ntohl(addr);
+    return (addr >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET
+       || IN_MULTICAST(addr) || IN_BADCLASS(addr);
+}
+
 /*
  * check_access - complain if a secret file has too-liberal permissions.
  */
@@ -843,7 +859,7 @@ scan_authfile(f, client, server, secret, addrs, filename)
         */
        if (addr_list)
            free_wordlist(addr_list);
-       addr_list = NULL;
+       addr_list = addr_last = NULL;
        for (;;) {
            if (!getword(f, word, &newline, filename) || newline)
                break;