auth/auth_sam_reply: add auth_convert_user_info_dc_saminfo2() helper function

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/auth/auth_sam_reply.c b/auth/auth_sam_reply.c
index 5602daf62de2fa39bfa9a61d907e3516f83d0bbd..b32558640472325bcc280a9f11abbdcc3289f739 100644 (file)
--- a/auth/auth_sam_reply.c
+++ b/auth/auth_sam_reply.c
@@ -202,6 +202,32 @@ NTSTATUS auth_convert_user_info_dc_saminfo6(TALLOC_CTX *mem_ctx,
        return NT_STATUS_OK;
 }
 
+/* Note that the validity of the _sam2 structure is only as long as
+ * the user_info_dc it was generated from */
+NTSTATUS auth_convert_user_info_dc_saminfo2(TALLOC_CTX *mem_ctx,
+                                          const struct auth_user_info_dc *user_info_dc,
+                                          struct netr_SamInfo2 **_sam2)
+{
+       NTSTATUS status;
+       struct netr_SamInfo6 *sam6 = NULL;
+       struct netr_SamInfo2 *sam2 = NULL;
+
+       sam2 = talloc_zero(mem_ctx, struct netr_SamInfo2);
+       if (sam2 == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       status = auth_convert_user_info_dc_saminfo6(sam2, user_info_dc, &sam6);
+       if (!NT_STATUS_IS_OK(status)) {
+               TALLOC_FREE(sam2);
+               return status;
+       }
+       sam2->base      = sam6->base;
+
+       *_sam2 = sam2;
+       return NT_STATUS_OK;
+}
+
 /* Note that the validity of the _sam3 structure is only as long as
  * the user_info_dc it was generated from */
 NTSTATUS auth_convert_user_info_dc_saminfo3(TALLOC_CTX *mem_ctx,

diff --git a/auth/auth_sam_reply.h b/auth/auth_sam_reply.h
index c163bcaa2881aabdf849252605287d59f0484b82..22e3c77e267c522b1191b8d84086cd7dab98cfec 100644 (file)
--- a/auth/auth_sam_reply.h
+++ b/auth/auth_sam_reply.h
@@ -44,6 +44,9 @@ NTSTATUS auth_convert_user_info_dc_sambaseinfo(TALLOC_CTX *mem_ctx,
 NTSTATUS auth_convert_user_info_dc_saminfo6(TALLOC_CTX *mem_ctx,
                                           const struct auth_user_info_dc *user_info_dc,
                                           struct netr_SamInfo6 **_sam6);
+NTSTATUS auth_convert_user_info_dc_saminfo2(TALLOC_CTX *mem_ctx,
+                                          const struct auth_user_info_dc *user_info_dc,
+                                          struct netr_SamInfo2 **_sam2);
 NTSTATUS auth_convert_user_info_dc_saminfo3(TALLOC_CTX *mem_ctx,
                                           const struct auth_user_info_dc *user_info_dc,
                                           struct netr_SamInfo3 **_sam3);