From 4f804382997c41efa078e2e085bbc42aafdebb2b Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Wed, 21 Sep 2022 12:03:29 +0000 Subject: bugfix: s6-accessrules-fs-from-cdb's incorrectly terminated string Also overview typo fix. Signed-off-by: Laurent Bercot --- src/conn-tools/s6-accessrules-fs-from-cdb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/conn-tools/s6-accessrules-fs-from-cdb.c b/src/conn-tools/s6-accessrules-fs-from-cdb.c index d2cb4af..ce1ff9c 100644 --- a/src/conn-tools/s6-accessrules-fs-from-cdb.c +++ b/src/conn-tools/s6-accessrules-fs-from-cdb.c @@ -26,7 +26,7 @@ static void cleanup () static int domkdir (char const *s) { - return mkdir(s, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH | S_ISGID) < 0 ? (errno == EEXIST) : 1 ; + return mkdir(s, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH | S_ISGID) < 0 ? errno == EEXIST : 1 ; } static void mkdirp (char *s) @@ -105,9 +105,9 @@ static int doit (char const *key, uint32_t klen, char const *data, uint32_t dlen memcpy(name, basedir, basedirlen) ; name[basedirlen] = '/' ; memcpy(name + basedirlen + 1, key, klen) ; - name[basedirlen + klen + 1 + klen] = 0 ; + name[basedirlen + 1 + klen] = 0 ; mkdirp(name) ; - name[basedirlen + klen + 1] = '/' ; + name[basedirlen + 1 + klen] = '/' ; if (data[0] == 'A') { memcpy(name + basedirlen + klen + 2, "allow", 6) ; -- cgit v1.2.3