Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | The patch comes from OpenEmbedded |
| 2 | Rebased for ppp-2.4.5. Dongxiao Xu <dongxiao.xu@intel.com> |
| 3 | |
| 4 | Upstream-Status: Inappropriate [embedded specific] |
| 5 | |
| 6 | diff -ruN ppp-2.4.5-orig/pppd/ipcp.c ppp-2.4.5/pppd/ipcp.c |
| 7 | --- ppp-2.4.5-orig/pppd/ipcp.c 2010-06-30 15:51:12.050166398 +0800 |
| 8 | +++ ppp-2.4.5/pppd/ipcp.c 2010-06-30 17:02:33.930393283 +0800 |
| 9 | @@ -55,6 +55,8 @@ |
| 10 | #include <sys/socket.h> |
| 11 | #include <netinet/in.h> |
| 12 | #include <arpa/inet.h> |
| 13 | +#include <sys/stat.h> |
| 14 | +#include <unistd.h> |
| 15 | |
| 16 | #include "pppd.h" |
| 17 | #include "fsm.h" |
| 18 | @@ -2095,6 +2097,14 @@ |
| 19 | u_int32_t peerdns1, peerdns2; |
| 20 | { |
| 21 | FILE *f; |
| 22 | + struct stat dirinfo; |
| 23 | + |
| 24 | + if(stat(_PATH_OUTDIR, &dirinfo)) { |
| 25 | + if(mkdir(_PATH_OUTDIR, 0775)) { |
| 26 | + error("Failed to create directory %s: %m", _PATH_OUTDIR); |
| 27 | + return; |
| 28 | + } |
| 29 | + } |
| 30 | |
| 31 | f = fopen(_PATH_RESOLV, "w"); |
| 32 | if (f == NULL) { |
| 33 | diff -ruN ppp-2.4.5-orig/pppd/pathnames.h ppp-2.4.5/pppd/pathnames.h |
| 34 | --- ppp-2.4.5-orig/pppd/pathnames.h 2010-06-30 15:51:12.043682063 +0800 |
| 35 | +++ ppp-2.4.5/pppd/pathnames.h 2010-06-30 17:03:20.594371055 +0800 |
| 36 | @@ -30,7 +30,8 @@ |
| 37 | #define _PATH_TTYOPT _ROOT_PATH "/etc/ppp/options." |
| 38 | #define _PATH_CONNERRS _ROOT_PATH "/etc/ppp/connect-errors" |
| 39 | #define _PATH_PEERFILES _ROOT_PATH "/etc/ppp/peers/" |
| 40 | -#define _PATH_RESOLV _ROOT_PATH "/etc/ppp/resolv.conf" |
| 41 | +#define _PATH_OUTDIR _ROOT_PATH _PATH_VARRUN "/ppp" |
| 42 | +#define _PATH_RESOLV _PATH_OUTDIR "/resolv.conf" |
| 43 | |
| 44 | #define _PATH_USEROPT ".ppprc" |
| 45 | #define _PATH_PSEUDONYM ".ppp_pseudonym" |