1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
diff --git a/src/os.c b/src/os.c
index 66c3ada..246c10f 100644
--- a/src/os.c
+++ b/src/os.c
@@ -33,7 +33,6 @@
#include "debug.h"
#include "ddns.h"
#include "cache.h"
-#include "libite/lite.h"
#define MAXSTRING 1024
@@ -421,6 +420,39 @@ static int mkparentdir(char *file)
return rc;
}
+static void pidexit(void)
+{
+ if (pidfile_path) {
+ unlink(pidfile_path);
+ free(pidfile_path);
+ pidfile_path = NULL;
+ }
+}
+
+/* Continue using old pidfile fn for Inadyn 1.x series,
+ * incompatible semantics with OpenBSD version. */
+static int old_pidfile(char *file)
+{
+ FILE *fp;
+
+ /* Ignore any errors, we may not be allowed to create the dir,
+ * but still be able to create/overwrite the pidfile. */
+ mkparentdir(file);
+
+ fp = fopen(file, "w");
+ if (!fp) {
+ logit(LOG_ERR, "Failed creating pidfile %s: %s", file, strerror(errno));
+ return RC_FILE_IO_ACCESS_ERROR;
+ }
+
+ fprintf(fp, "%u\n", getpid());
+ fclose(fp);
+
+ atexit(pidexit);
+
+ return 0;
+}
+
/* Create pid and cache file repository, make sure we can write to it. If
* we are restarted we cannot otherwise make sure we've not already updated
* the IP -- and the user will be locked-out of their DDNS server provider
@@ -440,8 +472,8 @@ int os_check_perms(void *UNUSED(arg))
return RC_FILE_IO_ACCESS_ERROR;
}
- /* Not creating a pidfile is OK, the cache file is the critical point. */
- pidfile(pidfile_path);
+ if (old_pidfile(pidfile_path))
+ logit(LOG_WARNING, "Failed creating pidfile %s: %m", pidfile_path);
return 0;
}
|