removed pathnames.h and pidfile support

src/netif/ppp/auth.c

@@ -120,10 +120,6 @@
 #include "cbcp.h"
 #endif
 
-#if 0 /* UNUSED */
-#include "pathnames.h"
-#endif /* UNUSED */
-
 #include "session.h"
 
 #if 0 /* UNUSED */

src/netif/ppp/eap.c

@@ -47,7 +47,6 @@
 #if PPP_SUPPORT && EAP_SUPPORT  /* don't build if not configured for use in lwipopts.h */
 
 #include "pppd.h"
-#include "pathnames.h"
 #include "polarssl/md5.h"
 #include "eap.h"
 

src/netif/ppp/ipcp.c

@@ -61,7 +61,6 @@
 #include "pppd.h"
 #include "fsm.h"
 #include "ipcp.h"
-#include "pathnames.h"
 
 static const char rcsid[] = RCSID;
 

src/netif/ppp/options.c

@@ -75,7 +75,6 @@
 #endif /* PPP_FILTER */
 
 #include "pppd.h"
-#include "pathnames.h"
 
 #if defined(ultrix) || defined(NeXT)
 char *strdup __P((char *));

src/netif/ppp/pathnames.h

@@ -1,63 +0,0 @@
-/*
- * define path names
- *
- * $Id: pathnames.h,v 1.18 2005/08/25 23:59:34 paulus Exp $
- */
-
-#ifdef HAVE_PATHS_H
-#include <paths.h>
-
-#else /* HAVE_PATHS_H */
-#ifndef _PATH_VARRUN
-#define _PATH_VARRUN 	"/etc/ppp/"
-#endif
-#define _PATH_DEVNULL	"/dev/null"
-#endif /* HAVE_PATHS_H */
-
-#ifndef _ROOT_PATH
-#define _ROOT_PATH
-#endif
-
-#define _PATH_UPAPFILE 	 _ROOT_PATH "/etc/ppp/pap-secrets"
-#define _PATH_CHAPFILE 	 _ROOT_PATH "/etc/ppp/chap-secrets"
-#define _PATH_SRPFILE 	 _ROOT_PATH "/etc/ppp/srp-secrets"
-#define _PATH_SYSOPTIONS _ROOT_PATH "/etc/ppp/options"
-#define _PATH_IPUP	 _ROOT_PATH "/etc/ppp/ip-up"
-#define _PATH_IPDOWN	 _ROOT_PATH "/etc/ppp/ip-down"
-#define _PATH_IPPREUP	 _ROOT_PATH "/etc/ppp/ip-pre-up"
-#define _PATH_TTYOPT	 _ROOT_PATH "/etc/ppp/options."
-#define _PATH_CONNERRS	 _ROOT_PATH "/etc/ppp/connect-errors"
-#define _PATH_PEERFILES	 _ROOT_PATH "/etc/ppp/peers/"
-#define _PATH_RESOLV	 _ROOT_PATH "/etc/ppp/resolv.conf"
-
-#define _PATH_USEROPT	 ".ppprc"
-#define	_PATH_PSEUDONYM	 ".ppp_pseudonym"
-
-#ifdef INET6
-#define _PATH_IPV6UP     _ROOT_PATH "/etc/ppp/ipv6-up"
-#define _PATH_IPV6DOWN   _ROOT_PATH "/etc/ppp/ipv6-down"
-#endif
-
-#ifdef IPX_CHANGE
-#define _PATH_IPXUP	 _ROOT_PATH "/etc/ppp/ipx-up"
-#define _PATH_IPXDOWN	 _ROOT_PATH "/etc/ppp/ipx-down"
-#endif /* IPX_CHANGE */
-
-#ifdef __STDC__
-#define _PATH_PPPDB	_ROOT_PATH _PATH_VARRUN "pppd2.tdb"
-#else /* __STDC__ */
-#ifdef HAVE_PATHS_H
-#define _PATH_PPPDB	"/var/run/pppd2.tdb"
-#else
-#define _PATH_PPPDB	"/etc/ppp/pppd2.tdb"
-#endif
-#endif /* __STDC__ */
-
-#ifdef PLUGIN
-#ifdef __STDC__
-#define _PATH_PLUGIN	DESTDIR "/lib/pppd/" VERSION
-#else /* __STDC__ */
-#define _PATH_PLUGIN	"/usr/lib/pppd"
-#endif /* __STDC__ */
-
-#endif /* PLUGIN */

src/netif/ppp/ppp.c

@@ -113,7 +113,6 @@
 #endif /* EAP_SUPPORT */
 #include "ccp.h"
 #include "ecp.h"
-#include "pathnames.h"
 
 #if CBCP_SUPPORT
 #include "cbcp.h"
@@ -133,8 +132,8 @@ struct channel *the_channel;
 
 char *progname;			/* Name of this program */
 char hostname[MAXNAMELEN];	/* Our hostname */
-static char pidfilename[MAXPATHLEN];	/* name of pid file */
+//static char pidfilename[MAXPATHLEN];	/* name of pid file */
-static char linkpidfile[MAXPATHLEN];	/* name of linkname pid file */
+//static char linkpidfile[MAXPATHLEN];	/* name of linkname pid file */
 char ppp_devnam[MAXPATHLEN];	/* name of PPP tty (maybe ttypx) */
 uid_t uid;			/* Our real user-id */
 struct notifier *pidchange = NULL;
@@ -229,8 +228,8 @@ static struct subprocess *children;
 /* Prototypes for procedures local to this file. */
 
 //static void setup_signals __P((void));
-static void create_pidfile __P((int pid));
+//static void create_pidfile __P((int pid));
-static void create_linkpidfile __P((int pid));
+//static void create_linkpidfile __P((int pid));
 //static void cleanup __P((void));
 static void get_input __P((void));
 static void calltimeout __P((void));
@@ -739,8 +738,8 @@ set_ifunit(iskey)
     slprintf(ifname, sizeof(ifname), "%s%d", PPP_DRV_NAME, ifunit);
     script_setenv("IFNAME", ifname, iskey);
     if (iskey) {
-	create_pidfile(getpid());	/* write pid to file */
+//	create_pidfile(getpid());	/* write pid to file */
-	create_linkpidfile(getpid());
+//	create_linkpidfile(getpid());
     }
 }
 
@@ -801,6 +800,7 @@ reopen_log()
     setlogmask(LOG_UPTO(LOG_INFO));
 }
 
+#if 0
 /*
  * Create a file containing our process ID.
  */
@@ -820,7 +820,9 @@ create_pidfile(pid)
 	pidfilename[0] = 0;
     }
 }
+#endif
 
+#if 0
 void
 create_linkpidfile(pid)
     int pid;
@@ -855,6 +857,7 @@ void remove_pidfiles()
 	warn("unable to delete pid file %s: %m", linkpidfile);
     linkpidfile[0] = 0;
 }
+#endif
 
 /*
  * holdoff_end - called via a timeout when the holdoff period ends.
@@ -1624,6 +1627,7 @@ safe_fork(int infd, int outfd, int errfd)
 }
 #endif
 
+#if 0
 /*
  * device_script - run a program to talk to the specified fds
  * (e.g. to run the connector or disconnector script).
@@ -1685,7 +1689,7 @@ device_script(program, in, out, dont_wait)
     exit(99);
     /* NOTREACHED */
 }
-
+#endif
 
 /*
  * record_child - add a child process to the list for reap_kids

src/netif/ppp/pppd.h

@@ -505,7 +505,7 @@ void record_child __P((int, char *, void (*) (void *), void *, int));
 pid_t safe_fork __P((int, int, int));	/* Fork & close stuff in child */
 #endif
 
-int  device_script __P((char *cmd, int in, int out, int dont_wait));
+//int  device_script __P((char *cmd, int in, int out, int dont_wait));
 				/* Run `cmd' with given stdin and stdout */
 void reopen_log __P((void));	/* (re)open the connection to syslog */
 void print_link_stats __P((void)); /* Print stats, if available */
@@ -520,7 +520,7 @@ void notify __P((struct notifier *, int));
 int  ppp_send_config __P((int, int, u_int32_t, int, int));
 int  ppp_recv_config __P((int, int, u_int32_t, int, int));
 const char *protocol_name __P((int));
-void remove_pidfiles __P((void));
+//void remove_pidfiles __P((void));
 void lock_db __P((void));
 void unlock_db __P((void));