]>
Commit | Line | Data |
---|---|---|
a373e543 SS |
1 | From f2c855462ff56be4121409c7e048cd2503fe0ccf Mon Sep 17 00:00:00 2001 |
2 | From: Jiri Skala <jskala@fedoraproject.org> | |
3 | Date: Mon, 7 Apr 2014 14:26:20 +0200 | |
4 | Subject: [PATCH 15/25] pppd: move pppd database to /var/run/ppp | |
5 | ||
6 | Resolves: #560014 | |
7 | --- | |
8 | pppd/pathnames.h | 11 ++++------- | |
9 | 1 file changed, 4 insertions(+), 7 deletions(-) | |
10 | ||
11 | diff --git a/pppd/pathnames.h b/pppd/pathnames.h | |
12 | index bef3160..24e010c 100644 | |
13 | --- a/pppd/pathnames.h | |
14 | +++ b/pppd/pathnames.h | |
0bc5d371 MT |
15 | @@ -6,8 +6,9 @@ |
16 | ||
e759d93f MT |
17 | #ifdef HAVE_PATHS_H |
18 | #include <paths.h> | |
0bc5d371 MT |
19 | - |
20 | +#define _PPP_SUBDIR "ppp/" | |
e759d93f | 21 | #else /* HAVE_PATHS_H */ |
0bc5d371 | 22 | +#define _PPP_SUBDIR |
e759d93f MT |
23 | #ifndef _PATH_VARRUN |
24 | #define _PATH_VARRUN "/etc/ppp/" | |
e759d93f | 25 | #endif |
a373e543 | 26 | @@ -46,13 +47,9 @@ |
e759d93f MT |
27 | #endif /* IPX_CHANGE */ |
28 | ||
29 | #ifdef __STDC__ | |
30 | -#define _PATH_PPPDB _ROOT_PATH _PATH_VARRUN "pppd2.tdb" | |
0bc5d371 | 31 | +#define _PATH_PPPDB _ROOT_PATH _PATH_VARRUN _PPP_SUBDIR "pppd2.tdb" |
e759d93f | 32 | #else /* __STDC__ */ |
0bc5d371 | 33 | -#ifdef HAVE_PATHS_H |
e759d93f | 34 | -#define _PATH_PPPDB "/var/run/pppd2.tdb" |
0bc5d371 MT |
35 | -#else |
36 | -#define _PATH_PPPDB "/etc/ppp/pppd2.tdb" | |
37 | -#endif | |
38 | +#define _PATH_PPPDB _PATH_VARRUN _PPP_SUBDIR "pppd2.tdb" | |
39 | #endif /* __STDC__ */ | |
40 | ||
41 | #ifdef PLUGIN | |
a373e543 SS |
42 | -- |
43 | 1.8.3.1 | |
44 |