pppd: Replace IF_NAMESIZE by IFNAMSIZ for struct ifreq

[ppp.git] / pppd / pathnames.h

diff --git a/pppd/pathnames.h b/pppd/pathnames.h
index 555f40f33d41937e2b16eaf50384a819320d966b..e68d91a15f067385d215764feb233f34adab0b6f 100644 (file)
--- a/pppd/pathnames.h
+++ b/pppd/pathnames.h
@@ -1,18 +1,35 @@
 /*
  * define path names
- *
- * $Id: pathnames.h,v 1.16 2004/11/13 12:02:22 paulus Exp $
  */
+#include "pppdconf.h"
 
 #ifdef HAVE_PATHS_H
 #include <paths.h>
+#endif /* HAVE_PATHS_H */
 
-#else /* HAVE_PATHS_H */
-#ifndef _PATH_VARRUN
-#define _PATH_VARRUN   "/etc/ppp/"
-#endif
+#ifndef _PATH_DEVNULL
 #define _PATH_DEVNULL  "/dev/null"
-#endif /* HAVE_PATHS_H */
+#endif
+
+#ifdef PPPD_RUNTIME_DIR
+#undef  _PATH_VARRUN
+#define _PATH_VARRUN   PPPD_RUNTIME_DIR "/"
+#endif
+
+#ifdef PPPD_LOGFILE_DIR
+#undef  _PATH_VARLOG
+#define _PATH_VARLOG    PPPD_LOGFILE_DIR
+#endif
+
+#ifdef PPPD_PLUGIN_DIR
+#define _PATH_PLUGIN    PPPD_PLUGIN_DIR
+#else
+#ifdef __STDC__
+#define _PATH_PLUGIN   DESTDIR "/lib/pppd/" VERSION
+#else  /* __STDC__ */
+#define _PATH_PLUGIN   "/usr/lib/pppd"
+#endif /* __STDC__ */
+#endif /* PPPD_PLUGIN_DIR */
 
 #ifndef _ROOT_PATH
 #define _ROOT_PATH
@@ -21,13 +38,21 @@
 #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"
+
+#ifdef USE_EAPTLS
+#define _PATH_EAPTLSCLIFILE    _ROOT_PATH "/etc/ppp/eaptls-client"
+#define _PATH_EAPTLSSERVFILE   _ROOT_PATH "/etc/ppp/eaptls-server"
+#define _PATH_OPENSSLCONFFILE  _ROOT_PATH "/etc/ppp/openssl.cnf"
+#endif /* USE_EAPTLS */
+
 #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_AUTHUP    _ROOT_PATH "/etc/ppp/auth-up"
 #define _PATH_AUTHDOWN  _ROOT_PATH "/etc/ppp/auth-down"
 #define _PATH_TTYOPT    _ROOT_PATH "/etc/ppp/options."
-#define _PATH_CONNERRS  _ROOT_PATH "/etc/ppp/connect-errors"
+#define _PATH_CONNERRS  _ROOT_PATH _PATH_VARLOG "/connect-errors"
 #define _PATH_PEERFILES         _ROOT_PATH "/etc/ppp/peers/"
 #define _PATH_RESOLV    _ROOT_PATH "/etc/ppp/resolv.conf"
 
@@ -47,13 +72,6 @@
 #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
+#define _PATH_PPPDB    _PPP_VARRUN "pppd2.tdb"
 #endif /* __STDC__ */
 
-#ifdef PLUGIN
-#define _PATH_PLUGIN   "/usr/lib/pppd/" VERSION
-#endif /* PLUGIN */