1 files changed, 17 insertions, 22 deletions

diff --git a/lib9p/tests/test_server/fs_whoami.c b/lib9p/tests/test_server/fs_whoami.c
index 653ac4b..8d9752a 100644
--- a/lib9p/tests/test_server/fs_whoami.c
+++ b/lib9p/tests/test_server/fs_whoami.c
@@ -23,10 +23,10 @@ LO_IMPLEMENTATION_C(lib9p_srv_fio, struct whoami_fio, whoami_fio, static);
 
 size_t whoami_len(struct lib9p_srv_ctx *ctx) {
 	assert(ctx);
-	assert(ctx->authinfo);
+	assert(ctx->user);
 
 	size_t len = 0;
-	uint32_t uid = ctx->authinfo->uid;
+	uint32_t uid = ctx->user->num;
 	while (uid) {
 		len++;
 		uid /= 10;
@@ -34,7 +34,7 @@ size_t whoami_len(struct lib9p_srv_ctx *ctx) {
 	if (!len)
 		len++;
 	len += 2;
-	len += ctx->authinfo->uname.len;
+	len += ctx->user->name.len;
 	return len;
 }
 
@@ -52,29 +52,24 @@ static struct lib9p_qid whoami_file_qid(struct whoami_file *self) {
 	};
 }
 
-static struct lib9p_stat whoami_file_stat(struct whoami_file *self, struct lib9p_srv_ctx *ctx) {
+static struct lib9p_srv_stat whoami_file_stat(struct whoami_file *self, struct lib9p_srv_ctx *ctx) {
 	assert(self);
 	assert(ctx);
 
-	return (struct lib9p_stat){
-		.kern_type                = 0,
-		.kern_dev                 = 0,
-		.file_qid                 = whoami_file_qid(self),
-		.file_mode                = 0444,
-		.file_atime               = UTIL9P_ATIME,
-		.file_mtime               = UTIL9P_MTIME,
-		.file_size                = whoami_len(ctx),
-		.file_name                = lib9p_str(self->name),
-		.file_owner_uid           = lib9p_str("root"),
-		.file_owner_gid           = lib9p_str("root"),
-		.file_last_modified_uid   = lib9p_str("root"),
-		.file_extension           = lib9p_str(NULL),
-		.file_owner_n_uid         = 0,
-		.file_owner_n_gid         = 0,
-		.file_last_modified_n_uid = 0,
+	return (struct lib9p_srv_stat){
+		.qid                 = whoami_file_qid(self),
+		.mode                = 0444,
+		.atime_sec           = UTIL9P_ATIME,
+		.mtime_sec           = UTIL9P_MTIME,
+		.size                = whoami_len(ctx),
+		.name                = lib9p_str(self->name),
+		.owner_uid           = { .name=lib9p_str("root"), .num=0 },
+		.owner_gid           = { .name=lib9p_str("root"), .num=0 },
+		.last_modifier_uid   = { .name=lib9p_str("root"), .num=0 },
+		.extension           = lib9p_str(NULL),
 	};
 }
-static void whoami_file_wstat(struct whoami_file *self, struct lib9p_srv_ctx *ctx, struct lib9p_stat) {
+static void whoami_file_wstat(struct whoami_file *self, struct lib9p_srv_ctx *ctx, struct lib9p_srv_stat) {
 	assert(self);
 	assert(ctx);
 	lib9p_error(&ctx->basectx, LIB9P_ERRNO_L_EROFS, "cannot wstat API file");
@@ -138,7 +133,7 @@ static void whoami_fio_pread(struct whoami_fio *self, struct lib9p_srv_ctx *ctx,
 		self->buf_len = data_size+1;
 	}
 	snprintf(self->buf, self->buf_len, "%"PRIu32" %.*s\n",
-	         ctx->authinfo->uid, ctx->authinfo->uname.len, ctx->authinfo->uname.utf8);
+	         ctx->user->num, ctx->user->name.len, ctx->user->name.utf8);
 
 	if (byte_offset > (uint64_t)data_size) {
 		lib9p_error(&ctx->basectx,