diff options
| -rw-r--r-- | src/bindfs.c | 16 | ||||
| -rw-r--r-- | src/usermap.c | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/bindfs.c b/src/bindfs.c index b4a1f5a..43d769d 100644 --- a/src/bindfs.c +++ b/src/bindfs.c @@ -446,9 +446,9 @@ static int getattr_common(const char *procpath, struct stat *stbuf) } /* Report user-defined owner/group if specified */ - if (settings.new_uid != -1) + if (settings.new_uid != (uid_t)-1) stbuf->st_uid = settings.new_uid; - if (settings.new_gid != -1) + if (settings.new_gid != (gid_t)-1) stbuf->st_gid = settings.new_gid; /* Mirrored user? */ @@ -549,12 +549,12 @@ static int chown_new_file(const char *path, struct fuse_context *fc, int (*chown } } - if (settings.create_for_uid != -1) + if (settings.create_for_uid != (uid_t)-1) file_owner = settings.create_for_uid; - if (settings.create_for_gid != -1) + if (settings.create_for_gid != (gid_t)-1) file_group = settings.create_for_gid; - if ((file_owner != -1) || (file_group != -1)) { + if ((file_owner != (uid_t)-1) || (file_group != (gid_t)-1)) { if (chown_func(path, file_owner, file_group) == -1) { DPRINTF("Failed to chown new file or directory (%d)", errno); } @@ -1182,7 +1182,7 @@ static int bindfs_chown(const char *path, uid_t uid, gid_t gid) int res; char *real_path; - if (uid != -1) { + if (uid != (uid_t)-1) { switch (settings.chown_policy) { case CHOWN_NORMAL: uid = usermap_get_uid_or_default(settings.usermap_reverse, uid, uid); @@ -1198,7 +1198,7 @@ static int bindfs_chown(const char *path, uid_t uid, gid_t gid) } } - if (gid != -1) { + if (gid != (gid_t)-1) { switch (settings.chgrp_policy) { case CHGRP_NORMAL: gid = usermap_get_gid_or_default(settings.usermap_reverse, gid, gid); @@ -1214,7 +1214,7 @@ static int bindfs_chown(const char *path, uid_t uid, gid_t gid) } } - if (uid != -1 || gid != -1) { + if (uid != (uid_t)-1 || gid != (gid_t)-1) { real_path = process_path(path, true); if (real_path == NULL) return -errno; diff --git a/src/usermap.c b/src/usermap.c index f745e74..eb7b61c 100644 --- a/src/usermap.c +++ b/src/usermap.c @@ -52,7 +52,7 @@ UsermapStatus usermap_add_uid(UserMap *map, uid_t from, uid_t to) map->user_from = (uid_t*)realloc(map->user_from, map->user_capacity * sizeof(uid_t)); map->user_to = (uid_t*)realloc(map->user_to, map->user_capacity * sizeof(uid_t)); } - if (usermap_get_uid_or_default(map, from, -1) != -1) { + if (usermap_get_uid_or_default(map, from, -1) != (uid_t)-1) { return usermap_status_duplicate_key; } i = map->user_size; @@ -77,7 +77,7 @@ UsermapStatus usermap_add_gid(UserMap *map, gid_t from, gid_t to) map->group_from = (gid_t*)realloc(map->group_from, map->group_capacity * sizeof(gid_t)); map->group_to = (gid_t*)realloc(map->group_to, map->group_capacity * sizeof(gid_t)); } - if (usermap_get_gid_or_default(map, from, -1) != -1) { + if (usermap_get_gid_or_default(map, from, -1) != (gid_t)-1) { return usermap_status_duplicate_key; } i = map->group_size; |