librpc/ndr_drsuapi: Allow ndrdump to dump dsinfo52 blobs

Change-Id: I6968b25c67587296b928b2193a9d48093c69c01a
Signed-off-by: Matthieu Patou <mat@matws.net>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
(cherry picked from commit 1ac96a416d7d6db2476f56129166fd9e018e7306)

diff --git a/librpc/ndr/ndr_drsuapi.c b/librpc/ndr/ndr_drsuapi.c
index cef617ba163f6fb59fe7843dabc56d097e37933f..45d3ac095c3eb3734dacb89a97ac37c60014b219 100644 (file)
--- a/librpc/ndr/ndr_drsuapi.c
+++ b/librpc/ndr/ndr_drsuapi.c
@@ -410,6 +410,8 @@ _PUBLIC_ void ndr_print_drsuapi_DsAddEntry_AttrErrListItem_V1(struct ndr_print *
 
 enum ndr_err_code ndr_push_drsuapi_DsBindInfo(struct ndr_push *ndr, int ndr_flags, const union drsuapi_DsBindInfo *r)
 {
+       uint32_t _flags_save = ndr->flags;
+       ndr->flags = ndr->flags & ~LIBNDR_FLAG_NDR64;
        NDR_PUSH_CHECK_FLAGS(ndr, ndr_flags);
        if (ndr_flags & NDR_SCALARS) {
                uint32_t level = ndr_push_get_switch_value(ndr, r);
@@ -442,6 +444,15 @@ enum ndr_err_code ndr_push_drsuapi_DsBindInfo(struct ndr_push *ndr, int ndr_flag
                                }
                        break; }
 
+                       case 52: {
+                               {
+                                       struct ndr_push *_ndr_info52;
+                                       NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_info52, 0, 52));
+                                       NDR_CHECK(ndr_push_drsuapi_DsBindInfo52(_ndr_info52, NDR_SCALARS, &r->info52));
+                                       NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_info52, 0, 52));
+                               }
+                       break; }
+
                        default: {
                                {
                                        struct ndr_push *_ndr_Fallback;
@@ -465,17 +476,23 @@ enum ndr_err_code ndr_push_drsuapi_DsBindInfo(struct ndr_push *ndr, int ndr_flag
                        case 48:
                        break;
 
+                       case 52:
+                       break;
+
                        default:
                        break;
 
                }
        }
+       ndr->flags = _flags_save;
        return NDR_ERR_SUCCESS;
 }
 
 enum ndr_err_code ndr_pull_drsuapi_DsBindInfo(struct ndr_pull *ndr, int ndr_flags, union drsuapi_DsBindInfo *r)
 {
        uint32_t level;
+       uint32_t _flags_save = ndr->flags;
+       ndr->flags = ndr->flags & ~LIBNDR_FLAG_NDR64;
        level = ndr_pull_get_switch_value(ndr, r);
        NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
        if (ndr_flags & NDR_SCALARS) {
@@ -508,6 +525,15 @@ enum ndr_err_code ndr_pull_drsuapi_DsBindInfo(struct ndr_pull *ndr, int ndr_flag
                                }
                        break; }
 
+                       case 52: {
+                               {
+                                       struct ndr_pull *_ndr_info52;
+                                       NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_info52, 0, 52));
+                                       NDR_CHECK(ndr_pull_drsuapi_DsBindInfo52(_ndr_info52, NDR_SCALARS, &r->info52));
+                                       NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_info52, 0, 52));
+                               }
+                       break; }
+
                        default: {
                                {
                                        struct ndr_pull *_ndr_Fallback;
@@ -530,11 +556,15 @@ enum ndr_err_code ndr_pull_drsuapi_DsBindInfo(struct ndr_pull *ndr, int ndr_flag
                        case 48:
                        break;
 
+                       case 52:
+                       break;
+
                        default:
                        break;
 
                }
        }
+       ndr->flags = _flags_save;
        return NDR_ERR_SUCCESS;
 }
 
@@ -556,6 +586,10 @@ _PUBLIC_ void ndr_print_drsuapi_DsBindInfo(struct ndr_print *ndr, const char *na
                        ndr_print_drsuapi_DsBindInfo48(ndr, "info48", &r->info48);
                break;
 
+               case 52:
+                       ndr_print_drsuapi_DsBindInfo52(ndr, "info52", &r->info52);
+               break;
+
                default:
                        ndr_print_drsuapi_DsBindInfoFallBack(ndr, "Fallback", &r->Fallback);
                break;