X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Frunas.c;h=222047cb60422023031f5a531879d166edccb154;hb=ee5b998f96be26a66976fd8afbe712e1ff43f411;hp=9f30996e2ae77f6e2a8ad5a26ace9f00b0eda879;hpb=93bed9fe8f48c11b7bb1224db36d82404cea080d;p=lttng-tools.git

diff --git a/src/common/runas.c b/src/common/runas.c
index 9f30996e2..222047cb6 100644
--- a/src/common/runas.c
+++ b/src/common/runas.c
@@ -90,6 +90,7 @@ struct run_as_unlink_data {
 struct run_as_rmdir_data {
 	int dirfd;
 	char path[LTTNG_PATH_MAX];
+	int flags; /* enum lttng_directory_handle_rmdir_recursive_flags */
 } LTTNG_PACKED;
 
 struct run_as_extract_elf_symbol_offset_data {
@@ -471,7 +472,7 @@ int _rmdir_recursive(struct run_as_data *data, struct run_as_ret *ret_value)
 	data->u.rmdir.dirfd = -1;
 
 	ret_value->u.ret = lttng_directory_handle_remove_subdirectory_recursive(
-			&handle, data->u.rmdir.path);
+			&handle, data->u.rmdir.path, data->u.rmdir.flags);
 	ret_value->_errno = errno;
 	ret_value->_error = (ret_value->u.ret) ? true : false;
 	lttng_directory_handle_fini(&handle);
@@ -511,15 +512,17 @@ int _extract_elf_symbol_offset(struct run_as_data *data,
 		struct run_as_ret *ret_value)
 {
 	int ret = 0;
+	uint64_t offset;
 
 	ret_value->_error = false;
 	ret = lttng_elf_get_symbol_offset(data->u.extract_elf_symbol_offset.fd,
 			 data->u.extract_elf_symbol_offset.function,
-			 &ret_value->u.extract_elf_symbol_offset.offset);
+			 &offset);
 	if (ret) {
 		DBG("Failed to extract ELF function offset");
 		ret_value->_error = true;
 	}
+	ret_value->u.extract_elf_symbol_offset.offset = offset;
 
 	return ret;
 }
@@ -1537,13 +1540,13 @@ error:
 }
 
 LTTNG_HIDDEN
-int run_as_rmdir_recursive(const char *path, uid_t uid, gid_t gid)
+int run_as_rmdir_recursive(const char *path, uid_t uid, gid_t gid, int flags)
 {
-	return run_as_rmdirat_recursive(AT_FDCWD, path, uid, gid);
+	return run_as_rmdirat_recursive(AT_FDCWD, path, uid, gid, flags);
 }
 
 LTTNG_HIDDEN
-int run_as_rmdirat_recursive(int dirfd, const char *path, uid_t uid, gid_t gid)
+int run_as_rmdirat_recursive(int dirfd, const char *path, uid_t uid, gid_t gid, int flags)
 {
 	int ret;
 	struct run_as_data data = {};
@@ -1558,6 +1561,7 @@ int run_as_rmdirat_recursive(int dirfd, const char *path, uid_t uid, gid_t gid)
 		goto error;
 	}
 	data.u.rmdir.dirfd = dirfd;
+	data.u.rmdir.flags = flags;
 	run_as(dirfd == AT_FDCWD ? RUN_AS_RMDIR_RECURSIVE : RUN_AS_RMDIRAT_RECURSIVE,
 			&data, &run_as_ret, uid, gid);
 	errno = run_as_ret._errno;