socket: add SocketUser= and SocketGroup= for chown()ing sockets in the file system

[elogind.git] / src / shared / util.c

diff --git a/src/shared/util.c b/src/shared/util.c
index 83a674aa8b16ba5e141f1d5aa97cdc145d497c6d..4a3e35f356508964f963075a09de8c909c207c4c 100644 (file)
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -1371,7 +1371,7 @@ bool ignore_file(const char *filename) {
         assert(filename);
 
         if (endswith(filename, "~"))
-                return false;
+                return true;
 
         return ignore_file_allow_backup(filename);
 }
@@ -3364,17 +3364,17 @@ int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gi
                         return -errno;
         }
 
-        if (uid != (uid_t)-1 || gid != (gid_t)-1) {
+        if (uid != (uid_t) -1 || gid != (gid_t) -1) {
                 r = fchown(fd, uid, gid);
                 if (r < 0)
                         return -errno;
         }
 
-        if (stamp != (usec_t)-1) {
+        if (stamp != (usec_t) -1) {
                 struct timespec ts[2];
 
                 timespec_store(&ts[0], stamp);
-                timespec_store(&ts[1], stamp);
+                ts[1] = ts[0];
                 r = futimens(fd, ts);
         } else
                 r = futimens(fd, NULL);
@@ -3385,7 +3385,7 @@ int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gi
 }
 
 int touch(const char *path) {
-        return touch_file(path, false, -1, -1, -1, 0);
+        return touch_file(path, false, (usec_t) -1, (uid_t) -1, (gid_t) -1, 0);
 }
 
 char *unquote(const char *s, const char* quotes) {
@@ -6480,8 +6480,7 @@ void hexdump(FILE *f, const void *p, size_t s) {
         }
 }
 
-int update_reboot_param_file(const char *param)
-{
+int update_reboot_param_file(const char *param) {
         int r = 0;
 
         if (param) {