X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fcompat%2Fdirectory-handle.c;h=e29d6540b56c648242afafc5c065e1ca0fe7ec9c;hp=9d2fed4637e453a67358049caaf6208505580c47;hb=2463b7879c00298daa79744cdaae82ac061a4ed8;hpb=0b1b49f99868a18f549dda323e07d5072bc771b5

diff --git a/src/common/compat/directory-handle.c b/src/common/compat/directory-handle.c
index 9d2fed463..e29d6540b 100644
--- a/src/common/compat/directory-handle.c
+++ b/src/common/compat/directory-handle.c
@@ -164,6 +164,8 @@ struct lttng_directory_handle *lttng_directory_handle_create_from_dirfd(
 		if (ret) {
 			PERROR("Failed to fstat directory file descriptor %i", dirfd);
 			lttng_directory_handle_release(&handle->ref);
+			handle = NULL;
+			goto end;
 		}
 	} else {
 		handle->directory_inode = RESERVED_AT_FDCWD_INO;
@@ -353,7 +355,12 @@ static
 int lttng_directory_handle_rmdir(
 		const struct lttng_directory_handle *handle, const char *name)
 {
-	return unlinkat(handle->dirfd, name, AT_REMOVEDIR);
+	int ret = unlinkat(handle->dirfd, name, AT_REMOVEDIR);
+	if (ret) {
+		PERROR("Failed to remove directory `%s`", name);
+	}
+
+	return ret;
 }
 
 static
@@ -1012,8 +1019,9 @@ int lttng_directory_handle_create_subdirectory_as_user(
 		ret = create_directory_check_exists(handle,
 				subdirectory, mode);
 	} else {
-		ret = _run_as_mkdir(handle, subdirectory,
-				mode, creds->uid, creds->gid);
+		ret = _run_as_mkdir(handle, subdirectory, mode,
+				lttng_credentials_get_uid(creds),
+				lttng_credentials_get_gid(creds));
 	}
 
 	return ret;
@@ -1033,7 +1041,7 @@ int lttng_directory_handle_create_subdirectory_recursive_as_user(
 				subdirectory_path, mode);
 	} else {
 		ret = _run_as_mkdir_recursive(handle, subdirectory_path,
-				mode, creds->uid, creds->gid);
+				mode, lttng_credentials_get_uid(creds), lttng_credentials_get_gid(creds));
 	}
 
 	return ret;
@@ -1074,7 +1082,7 @@ int lttng_directory_handle_open_file_as_user(
 				mode);
 	} else {
 		ret = _run_as_open(handle, filename, flags, mode,
-				creds->uid, creds->gid);
+				lttng_credentials_get_uid(creds), lttng_credentials_get_gid(creds));
 	}
 	return ret;
 }
@@ -1101,7 +1109,7 @@ int lttng_directory_handle_unlink_file_as_user(
 		/* Run as current user. */
 		ret = lttng_directory_handle_unlink(handle, filename);
 	} else {
-		ret = _run_as_unlink(handle, filename, creds->uid, creds->gid);
+		ret = _run_as_unlink(handle, filename, lttng_credentials_get_uid(creds), lttng_credentials_get_gid(creds));
 	}
 	return ret;
 }
@@ -1142,7 +1150,7 @@ int lttng_directory_handle_rename_as_user(
 				old_name, new_handle, new_name);
 	} else {
 		ret = _run_as_rename(old_handle, old_name, new_handle,
-				new_name, creds->uid, creds->gid);
+				new_name, lttng_credentials_get_uid(creds), lttng_credentials_get_gid(creds));
 	}
 	return ret;
 }
@@ -1168,7 +1176,7 @@ int lttng_directory_handle_remove_subdirectory_as_user(
 		/* Run as current user. */
 		ret = lttng_directory_handle_rmdir(handle, name);
 	} else {
-		ret = _run_as_rmdir(handle, name, creds->uid, creds->gid);
+		ret = _run_as_rmdir(handle, name, lttng_credentials_get_uid(creds), lttng_credentials_get_gid(creds));
 	}
 	return ret;
 }
@@ -1402,8 +1410,8 @@ int lttng_directory_handle_remove_subdirectory_recursive_as_user(
 		/* Run as current user. */
 		ret = remove_directory_recursive(handle, name, flags);
 	} else {
-		ret = _run_as_rmdir_recursive(handle, name, creds->uid,
-				creds->gid, flags);
+		ret = _run_as_rmdir_recursive(handle, name, lttng_credentials_get_uid(creds),
+				lttng_credentials_get_gid(creds), flags);
 	}
 	return ret;
 }