2010-02-12 15:53:59 +00:00
|
|
|
diff -up ppp-2.4.5/pppd/pathnames.h.var_run_ppp ppp-2.4.5/pppd/pathnames.h
|
2010-12-01 14:04:58 +00:00
|
|
|
--- ppp-2.4.5/pppd/pathnames.h.var_run_ppp 2010-11-23 10:14:24.557427000 +0100
|
|
|
|
|
+++ ppp-2.4.5/pppd/pathnames.h 2010-11-23 10:24:07.432426793 +0100
|
|
|
|
|
@@ -6,8 +6,9 @@
|
|
|
|
|
|
2010-02-12 15:53:59 +00:00
|
|
|
#ifdef HAVE_PATHS_H
|
|
|
|
|
#include <paths.h>
|
2010-12-01 14:04:58 +00:00
|
|
|
-
|
|
|
|
|
+#define _PPP_SUBDIR "ppp/"
|
2010-02-12 15:53:59 +00:00
|
|
|
#else /* HAVE_PATHS_H */
|
2010-12-01 14:04:58 +00:00
|
|
|
+#define _PPP_SUBDIR
|
2010-02-12 15:53:59 +00:00
|
|
|
#ifndef _PATH_VARRUN
|
|
|
|
|
#define _PATH_VARRUN "/etc/ppp/"
|
|
|
|
|
#endif
|
2010-12-01 14:04:58 +00:00
|
|
|
@@ -46,13 +54,9 @@
|
2010-02-12 15:53:59 +00:00
|
|
|
#endif /* IPX_CHANGE */
|
|
|
|
|
|
|
|
|
|
#ifdef __STDC__
|
|
|
|
|
-#define _PATH_PPPDB _ROOT_PATH _PATH_VARRUN "pppd2.tdb"
|
2010-12-01 14:04:58 +00:00
|
|
|
+#define _PATH_PPPDB _ROOT_PATH _PATH_VARRUN _PPP_SUBDIR "pppd2.tdb"
|
2010-02-12 15:53:59 +00:00
|
|
|
#else /* __STDC__ */
|
2010-12-01 14:04:58 +00:00
|
|
|
-#ifdef HAVE_PATHS_H
|
2010-02-12 15:53:59 +00:00
|
|
|
-#define _PATH_PPPDB "/var/run/pppd2.tdb"
|
2010-12-01 14:04:58 +00:00
|
|
|
-#else
|
|
|
|
|
-#define _PATH_PPPDB "/etc/ppp/pppd2.tdb"
|
|
|
|
|
-#endif
|
|
|
|
|
+#define _PATH_PPPDB _PATH_VARRUN _PPP_SUBDIR "pppd2.tdb"
|
|
|
|
|
#endif /* __STDC__ */
|
|
|
|
|
|
|
|
|
|
#ifdef PLUGIN
|
