ppp/sme10/ppp-2.4.5-var_run_ppp.patch

diff -up ppp-2.4.5/pppd/pathnames.h.var_run_ppp ppp-2.4.5/pppd/pathnames.h
--- 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 @@
 
 #ifdef HAVE_PATHS_H
 #include <paths.h>
-
+#define _PPP_SUBDIR    "ppp/"
 #else /* HAVE_PATHS_H */
+#define _PPP_SUBDIR
 #ifndef _PATH_VARRUN
 #define _PATH_VARRUN   "/etc/ppp/"
 #endif
@@ -46,13 +54,9 @@
 #endif /* IPX_CHANGE */
 
 #ifdef __STDC__
-#define _PATH_PPPDB    _ROOT_PATH _PATH_VARRUN "pppd2.tdb"
+#define _PATH_PPPDB    _ROOT_PATH _PATH_VARRUN _PPP_SUBDIR "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    _PATH_VARRUN _PPP_SUBDIR "pppd2.tdb"
 #endif /* __STDC__ */
 
 #ifdef PLUGIN
1	diff -up ppp-2.4.5/pppd/pathnames.h.var_run_ppp ppp-2.4.5/pppd/pathnames.h
2	--- ppp-2.4.5/pppd/pathnames.h.var_run_ppp 2010-11-23 10:14:24.557427000 +0100
3	+++ ppp-2.4.5/pppd/pathnames.h 2010-11-23 10:24:07.432426793 +0100
4	@@ -6,8 +6,9 @@
5
6	#ifdef HAVE_PATHS_H
7	#include <paths.h>
8	-
9	+#define _PPP_SUBDIR "ppp/"
10	#else /* HAVE_PATHS_H */
11	+#define _PPP_SUBDIR
12	#ifndef _PATH_VARRUN
13	#define _PATH_VARRUN "/etc/ppp/"
14	#endif
15	@@ -46,13 +54,9 @@
16	#endif /* IPX_CHANGE */
17
18	#ifdef __STDC__
19	-#define _PATH_PPPDB _ROOT_PATH _PATH_VARRUN "pppd2.tdb"
20	+#define _PATH_PPPDB _ROOT_PATH _PATH_VARRUN _PPP_SUBDIR "pppd2.tdb"
21	#else /* __STDC__ */
22	-#ifdef HAVE_PATHS_H
23	-#define _PATH_PPPDB "/var/run/pppd2.tdb"
24	-#else
25	-#define _PATH_PPPDB "/etc/ppp/pppd2.tdb"
26	-#endif
27	+#define _PATH_PPPDB _PATH_VARRUN _PPP_SUBDIR "pppd2.tdb"
28	#endif /* __STDC__ */
29
30	#ifdef PLUGIN