X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;ds=sidebyside;f=pppd%2Foptions.c;h=c7c4b4ea5783bef908fbe21ec4a9bd3a46aeda69;hb=a997ae3e882145f6e99b256eee81396615ea89a5;hp=d58c85022badc3e1c283a131caaf4409f03512b6;hpb=829ce3a1b544753fc086c75b57d779839adfa545;p=ppp.git

diff --git a/pppd/options.c b/pppd/options.c
index d58c850..c7c4b4e 100644
--- a/pppd/options.c
+++ b/pppd/options.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: options.c,v 1.11 1994/08/09 06:29:14 paulus Exp $";
+static char rcsid[] = "$Id: options.c,v 1.12 1994/08/22 00:36:38 paulus Exp $";
 #endif
 
 #include <stdio.h>
@@ -54,7 +54,7 @@ char *strdup __ARGS((char *));
 #endif
 
 #ifndef GIDSET_TYPE
-#define GIDSET_TYPE	int
+#define GIDSET_TYPE	gid_t
 #endif
 
 /*
@@ -141,7 +141,7 @@ extern int nodetach;
 extern char *connector;
 extern char *disconnector;
 extern int inspeed;
-extern char devname[];
+extern char devnam[];
 extern int default_device;
 extern u_long netmask;
 extern int detach;
@@ -430,9 +430,9 @@ options_for_tty()
     char *dev, *path;
     int ret;
 
-    dev = strrchr(devname, '/');
+    dev = strrchr(devnam, '/');
     if (dev == NULL)
-	dev = devname;
+	dev = devnam;
     else
 	++dev;
     if (strcmp(dev, "tty") == 0)
@@ -1069,8 +1069,8 @@ setdevname(cp)
 	return -1;
     }
   
-    (void) strncpy(devname, cp, MAXPATHLEN);
-    devname[MAXPATHLEN-1] = 0;
+    (void) strncpy(devnam, cp, MAXPATHLEN);
+    devnam[MAXPATHLEN-1] = 0;
     default_device = FALSE;
   
     return 1;