From: David Tardon <dtardon@redhat.com>
Date: Tue, 9 Oct 2018 13:04:58 +0000 (+0200)
Subject: be consistent about sun_path length
X-Git-Tag: v240~563^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f369f47c264dd56f630e91697006efd647542feb;p=thirdparty%2Fsystemd.git

be consistent about sun_path length

Most places use the whole buffer for name, without leaving extra space
for the trailing NUL.
---

diff --git a/src/core/manager.c b/src/core/manager.c
index 2dea89dc01f..446648a265a 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -892,7 +892,7 @@ static int manager_setup_notify(Manager *m) {
                 (void) mkdir_parents_label(m->notify_socket, 0755);
                 (void) unlink(m->notify_socket);
 
-                strncpy(sa.un.sun_path, m->notify_socket, sizeof(sa.un.sun_path)-1);
+                strncpy(sa.un.sun_path, m->notify_socket, sizeof(sa.un.sun_path));
                 r = bind(fd, &sa.sa, SOCKADDR_UN_LEN(sa.un));
                 if (r < 0)
                         return log_error_errno(errno, "bind(%s) failed: %m", sa.un.sun_path);
diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c
index 8464df122c4..90ccbd7a830 100644
--- a/src/login/pam_systemd.c
+++ b/src/login/pam_systemd.c
@@ -160,7 +160,7 @@ static int get_seat_from_display(const char *display, const char **seat, uint32_
         r = socket_from_display(display, &p);
         if (r < 0)
                 return r;
-        strncpy(sa.un.sun_path, p, sizeof(sa.un.sun_path)-1);
+        strncpy(sa.un.sun_path, p, sizeof(sa.un.sun_path));
 
         fd = socket(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC, 0);
         if (fd < 0)
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 27547051c8b..134c4c3b5d7 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -2826,7 +2826,7 @@ static int setup_sd_notify_child(void) {
         (void) mkdir_parents(NSPAWN_NOTIFY_SOCKET_PATH, 0755);
         (void) unlink(NSPAWN_NOTIFY_SOCKET_PATH);
 
-        strncpy(sa.un.sun_path, NSPAWN_NOTIFY_SOCKET_PATH, sizeof(sa.un.sun_path)-1);
+        strncpy(sa.un.sun_path, NSPAWN_NOTIFY_SOCKET_PATH, sizeof(sa.un.sun_path));
         r = bind(fd, &sa.sa, SOCKADDR_UN_LEN(sa.un));
         if (r < 0) {
                 safe_close(fd);