47 lines
1.8 KiB
Diff
47 lines
1.8 KiB
Diff
From 6cbec2d0aa29d6d25e9eed007ded4e79eb637519 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
|
|
Date: Fri, 5 Aug 2022 17:57:29 +0200
|
|
Subject: [PATCH] Address minor compiler warnings
|
|
|
|
copydir.c:666:44: warning: unsigned conversion from 'int' to '__mode_t' {aka 'unsigned int'} changes value from '-4096' to '4294963200' [-Wsign-conversion]
|
|
666 | if ( (mknod (dst, statp->st_mode & ~07777, statp->st_rdev) != 0)
|
|
| ^
|
|
|
|
copydir.c:116:1: warning: missing initializer for field 'quote' of 'struct error_context' [-Wmissing-field-initializers]
|
|
116 | };
|
|
| ^
|
|
In file included from copydir.c:27:
|
|
/usr/include/attr/error_context.h:30:23: note: 'quote' declared here
|
|
30 | const char *(*quote) (struct error_context *, const char *);
|
|
| ^~~~~
|
|
|
|
Conflict: NA
|
|
Reference: https://github.com/shadow-maint/shadow/commit/6cbec2d0aa29d6d25e9eed007ded4e79eb637519
|
|
|
|
---
|
|
libmisc/copydir.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/libmisc/copydir.c b/libmisc/copydir.c
|
|
index 95042187b..e753d7cf0 100644
|
|
--- a/libmisc/copydir.c
|
|
+++ b/libmisc/copydir.c
|
|
@@ -112,7 +112,7 @@ static void error_acl (unused struct error_context *ctx, const char *fmt, ...)
|
|
}
|
|
|
|
static struct error_context ctx = {
|
|
- error_acl
|
|
+ error_acl, NULL, NULL
|
|
};
|
|
#endif /* WITH_ACL || WITH_ATTR */
|
|
|
|
@@ -663,7 +663,7 @@ static int copy_special (const char *src, const char *dst,
|
|
}
|
|
#endif /* WITH_SELINUX */
|
|
|
|
- if ( (mknod (dst, statp->st_mode & ~07777, statp->st_rdev) != 0)
|
|
+ if ( (mknod (dst, statp->st_mode & ~07777U, statp->st_rdev) != 0)
|
|
|| (chown_if_needed (dst, statp,
|
|
old_uid, new_uid, old_gid, new_gid) != 0)
|
|
#ifdef WITH_ACL
|