try to create rundir and lockdir before using them

PR #435 makes lockdir default go back to /var/lock, but runtime dir still changed from /run to /run/pppd in commit 66a8c74 ("Let ./configure control the paths for pppd") and is likely to not exist on some distros, in which case the pppdb will not be created. This is not a big problem but might as well just try to create the directory if it is missing. Return code of mkdir does not need to be checked as the following open will fail anyway if mkdir failed. See: #419 Signed-off-by: Dominique Martinet <[email protected]>
ppp-project · Aug 3, 2023 · b621730 · b621730
1 parent 091e69b
commit b621730
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/pppd/main.c b/pppd/main.c
@@ -494,6 +494,9 @@ main(int argc, char *argv[])
      */
     sys_init();
 
+    if (access(PPP_PATH_VARRUN, F_OK))
+	    mkdir(PPP_PATH_VARRUN, 0755);
+
 #ifdef PPP_WITH_TDB
     pppdb = tdb_open(PPP_PATH_PPPDB, 0, 0, O_RDWR|O_CREAT, 0644);
     if (pppdb != NULL) {

diff --git a/pppd/utils.c b/pppd/utils.c
@@ -843,6 +843,9 @@ lock(char *dev)
     slprintf(lock_file, sizeof(lock_file), "%s/LCK..%s", PPP_PATH_LOCKDIR, dev);
 #endif
 
+    if (access(PPP_PATH_LOCKDIR, F_OK))
+	    mkdir(PPP_PATH_LOCKDIR, 0755);
+
     while ((fd = open(lock_file, O_EXCL | O_CREAT | O_RDWR, 0644)) < 0) {
 	if (errno != EEXIST) {
 	    error("Can't create lock file %s: %m", lock_file);