4 files changed, 12 insertions, 2 deletions
diff --git a/source4/libnet/libnet.h b/source4/libnet/libnet.h
index 27472e0d0d..9f91778542 100644
--- a/source4/libnet/libnet.h
+++ b/source4/libnet/libnet.h
@@ -28,7 +28,8 @@ struct libnet_context {
 	/* samr connection parameters - opened handles and related properties */
 	struct {
 		struct dcerpc_pipe *pipe;
-		const char *name;
+		char *name;
+		struct dom_sid *sid;
 		uint32_t access_mask;
 		struct policy_handle handle;
 		struct policy_handle connect_handle;
@@ -38,7 +39,7 @@ struct libnet_context {
 	/* lsa connection parameters - opened handles and related properties */
 	struct {
 		struct dcerpc_pipe *pipe;
-		const char *name;
+		char *name;
 		uint32_t access_mask;
 		struct policy_handle handle;
 	} lsa;
diff --git a/source4/libnet/libnet_domain.c b/source4/libnet/libnet_domain.c
index 500d5f817d..3de281d625 100644
--- a/source4/libnet/libnet_domain.c
+++ b/source4/libnet/libnet_domain.c
@@ -361,6 +361,7 @@ NTSTATUS libnet_DomainOpenSamr_recv(struct composite_context *c, struct libnet_c
 		   libnet functions */
 		ctx->samr.connect_handle = s->connect_handle;
 		ctx->samr.handle      = s->domain_handle;
+		ctx->samr.sid         = talloc_steal(ctx, s->lookup.out.sid);
 		ctx->samr.name        = talloc_steal(ctx, s->domain_name.string);
 		ctx->samr.access_mask = s->access_mask;
 	}
@@ -844,7 +845,10 @@ NTSTATUS libnet_DomainCloseSamr_recv(struct composite_context *c, struct libnet_
 		/* domain policy handle closed successfully */
 
 		ZERO_STRUCT(ctx->samr.handle);
+		talloc_free(ctx->samr.name);
+		talloc_free(ctx->samr.sid);
 		ctx->samr.name = NULL;
+		ctx->samr.sid = NULL;
 
 		io->out.error_string = talloc_asprintf(mem_ctx, "Success");
 
diff --git a/source4/libnet/libnet_user.c b/source4/libnet/libnet_user.c
index 7cdd171d29..fe303620fe 100644
--- a/source4/libnet/libnet_user.c
+++ b/source4/libnet/libnet_user.c
@@ -773,6 +773,9 @@ NTSTATUS libnet_UserInfo_recv(struct composite_context *c, TALLOC_CTX *mem_ctx,
 		s = talloc_get_type(c->private_data, struct user_info_state);
 		info = &s->userinfo.out.info.info21;
 
+		r->out.user_sid = dom_sid_add_rid(mem_ctx, s->ctx->samr.sid, info->rid);
+		r->out.primary_group_sid = dom_sid_add_rid(mem_ctx, s->ctx->samr.sid, info->primary_gid);
+
 		/* string fields */
 		r->out.account_name   = talloc_steal(mem_ctx, info->account_name.string);
 		r->out.full_name      = talloc_steal(mem_ctx, info->full_name.string);
diff --git a/source4/libnet/libnet_user.h b/source4/libnet/libnet_user.h
index 2973915c00..3bbe1cc65e 100644
--- a/source4/libnet/libnet_user.h
+++ b/source4/libnet/libnet_user.h
@@ -92,6 +92,8 @@ struct libnet_UserInfo {
 		const char *domain_name;
 	} in;
 	struct {
+		struct dom_sid *user_sid;
+		struct dom_sid *primary_group_sid;
 		const char *account_name;
 		const char *full_name;
 		const char *description;