Fix: directory handle credentials parameter is not const

There is no reason for the "as user" operations on a directory
handle not to take the credentials as a const parameter. Not
passing credentials as const makes their ownership ambiguous
and makes it harder to write const-correct code.

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/src/common/compat/directory-handle.c b/src/common/compat/directory-handle.c
index 7077378e0a3e8aa40911eee665c6b972c4ef9168..781f2574b0ea652cadd2d8b8bb0e9e487d891d91 100644 (file)
--- a/src/common/compat/directory-handle.c
+++ b/src/common/compat/directory-handle.c
@@ -418,7 +418,7 @@ LTTNG_HIDDEN
 int lttng_directory_handle_create_subdirectory_as_user(
                const struct lttng_directory_handle *handle,
                const char *subdirectory,
-               mode_t mode, struct lttng_credentials *creds)
+               mode_t mode, const struct lttng_credentials *creds)
 {
        int ret;
 
@@ -438,7 +438,7 @@ LTTNG_HIDDEN
 int lttng_directory_handle_create_subdirectory_recursive_as_user(
                const struct lttng_directory_handle *handle,
                const char *subdirectory_path,
-               mode_t mode, struct lttng_credentials *creds)
+               mode_t mode, const struct lttng_credentials *creds)
 {
        int ret;
 

diff --git a/src/common/compat/directory-handle.h b/src/common/compat/directory-handle.h
index a24bbd8db9ffaff76eba111a81b9fd2cc5be2098..7d2cab339fc28ad15752d6a2652679e3a7df359e 100644 (file)
--- a/src/common/compat/directory-handle.h
+++ b/src/common/compat/directory-handle.h
@@ -78,7 +78,7 @@ LTTNG_HIDDEN
 int lttng_directory_handle_create_subdirectory_as_user(
                const struct lttng_directory_handle *handle,
                const char *subdirectory,
-               mode_t mode, struct lttng_credentials *creds);
+               mode_t mode, const struct lttng_credentials *creds);
 
 /*
  * Recursively create a directory relative to a directory handle.
@@ -97,6 +97,6 @@ LTTNG_HIDDEN
 int lttng_directory_handle_create_subdirectory_recursive_as_user(
                const struct lttng_directory_handle *handle,
                const char *subdirectory_path,
-               mode_t mode, struct lttng_credentials *creds);
+               mode_t mode, const struct lttng_credentials *creds);
 
 #endif /* _COMPAT_PATH_HANDLE_H */

diff --git a/src/common/utils.c b/src/common/utils.c
index aada37fe707d156bc0a22425e2c0ad04a291b81e..f058e2003a440f6e1dffbf2076752abf0908c786 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -679,7 +679,7 @@ int utils_mkdir(const char *path, mode_t mode, int uid, int gid)
 {
        int ret;
        struct lttng_directory_handle handle;
-       struct lttng_credentials creds = {
+       const struct lttng_credentials creds = {
                .uid = (uid_t) uid,
                .gid = (gid_t) gid,
        };
@@ -703,7 +703,7 @@ int utils_mkdir_recursive(const char *path, mode_t mode, int uid, int gid)
 {
        int ret;
        struct lttng_directory_handle handle;
-       struct lttng_credentials creds = {
+       const struct lttng_credentials creds = {
                .uid = (uid_t) uid,
                .gid = (gid_t) gid,
        };