Merge pull request #101 from vyos/if-renaming-clean

[ppp.git] / pppd / pathnames.h

diff --git a/pppd/pathnames.h b/pppd/pathnames.h
index dccf0fda35720e13136be034038cc441001437e8..524d608ce12c5cefed20ceafff035738434e2d31 100644 (file)
--- a/pppd/pathnames.h
+++ b/pppd/pathnames.h
@@ -1,7 +1,5 @@
 /*
  * define path names
- *
- * $Id: pathnames.h,v 1.15 2002/11/02 19:48:13 carlsonj Exp $
  */
 
 #ifdef HAVE_PATHS_H
@@ -21,9 +19,17 @@
 #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."
@@ -45,15 +51,20 @@
 #endif /* IPX_CHANGE */
 
 #ifdef __STDC__
-#define _PATH_PPPDB    _ROOT_PATH _PATH_VARRUN "pppd.tdb"
+#define _PATH_PPPDB    _ROOT_PATH _PATH_VARRUN "pppd2.tdb"
 #else /* __STDC__ */
 #ifdef HAVE_PATHS_H
-#define _PATH_PPPDB    "/var/run/pppd.tdb"
+#define _PATH_PPPDB    "/var/run/pppd2.tdb"
 #else
-#define _PATH_PPPDB    "/etc/ppp/pppd.tdb"
+#define _PATH_PPPDB    "/etc/ppp/pppd2.tdb"
 #endif
 #endif /* __STDC__ */
 
 #ifdef PLUGIN
-#define _PATH_PLUGIN   "/usr/lib/pppd/" VERSION
+#ifdef __STDC__
+#define _PATH_PLUGIN   DESTDIR "/lib/pppd/" VERSION
+#else /* __STDC__ */
+#define _PATH_PLUGIN   "/usr/lib/pppd"
+#endif /* __STDC__ */
+
 #endif /* PLUGIN */