ntlmssp: pretty print a VERSION structure.

Guenther

diff --git a/librpc/gen_ndr/ndr_ntlmssp.c b/librpc/gen_ndr/ndr_ntlmssp.c
index b593d9e7e3f18db877ddc830f7a6ac8e525643f9..2b4e70e36364e9b48b2c8265f1cb651f0b14b195 100644 (file)
--- a/librpc/gen_ndr/ndr_ntlmssp.c
+++ b/librpc/gen_ndr/ndr_ntlmssp.c
@@ -250,22 +250,6 @@ static enum ndr_err_code ndr_pull_ntlmssp_Version(struct ndr_pull *ndr, int ndr_
        return NDR_ERR_SUCCESS;
 }
 
-_PUBLIC_ void ndr_print_ntlmssp_Version(struct ndr_print *ndr, const char *name, const union ntlmssp_Version *r)
-{
-       int level;
-       level = ndr_print_get_switch_value(ndr, r);
-       ndr_print_union(ndr, name, level, "ntlmssp_Version");
-       switch (level) {
-               case NTLMSSP_NEGOTIATE_VERSION:
-                       ndr_print_VERSION(ndr, "version", &r->version);
-               break;
-
-               default:
-               break;
-
-       }
-}
-
 _PUBLIC_ enum ndr_err_code ndr_push_NEGOTIATE_MESSAGE(struct ndr_push *ndr, int ndr_flags, const struct NEGOTIATE_MESSAGE *r)
 {
        if (ndr_flags & NDR_SCALARS) {

diff --git a/librpc/gen_ndr/ndr_ntlmssp.h b/librpc/gen_ndr/ndr_ntlmssp.h
index ab095d1cc2e4e452a1b678e4e6a81a460cded12a..de31c6c83c2853ae9b8d31aab6e9b96b3258f849 100644 (file)
--- a/librpc/gen_ndr/ndr_ntlmssp.h
+++ b/librpc/gen_ndr/ndr_ntlmssp.h
@@ -50,7 +50,6 @@ void ndr_print_LM_RESPONSE(struct ndr_print *ndr, const char *name, const struct
 enum ndr_err_code ndr_push_LMv2_RESPONSE(struct ndr_push *ndr, int ndr_flags, const struct LMv2_RESPONSE *r);
 enum ndr_err_code ndr_pull_LMv2_RESPONSE(struct ndr_pull *ndr, int ndr_flags, struct LMv2_RESPONSE *r);
 void ndr_print_LMv2_RESPONSE(struct ndr_print *ndr, const char *name, const struct LMv2_RESPONSE *r);
-void ndr_print_ntlmssp_LM_RESPONSE(struct ndr_print *ndr, const char *name, const union ntlmssp_LM_RESPONSE *r);
 enum ndr_err_code ndr_push_NTLM_RESPONSE(struct ndr_push *ndr, int ndr_flags, const struct NTLM_RESPONSE *r);
 enum ndr_err_code ndr_pull_NTLM_RESPONSE(struct ndr_pull *ndr, int ndr_flags, struct NTLM_RESPONSE *r);
 void ndr_print_NTLM_RESPONSE(struct ndr_print *ndr, const char *name, const struct NTLM_RESPONSE *r);

diff --git a/librpc/gen_ndr/ntlmssp.h b/librpc/gen_ndr/ntlmssp.h
index 45099159749136684fa25c607c8dd68cef612719..5205dce57d3aea3f52b980f83a62e58ab6b26bda 100644 (file)
--- a/librpc/gen_ndr/ntlmssp.h
+++ b/librpc/gen_ndr/ntlmssp.h
@@ -104,7 +104,7 @@ struct VERSION {
 
 union ntlmssp_Version {
        struct VERSION version;/* [case(NTLMSSP_NEGOTIATE_VERSION)] */
-}/* [nodiscriminant] */;
+}/* [noprint,nodiscriminant] */;
 
 struct NEGOTIATE_MESSAGE {
        const char *Signature;/* [value("NTLMSSP"),charset(DOS)] */

diff --git a/librpc/idl/ntlmssp.idl b/librpc/idl/ntlmssp.idl
index a21e556fbee58993decdf2eb406a3d14263c5cf5..8cabec33daffacb98121a54dd21db9dff45eecc1 100644 (file)
--- a/librpc/idl/ntlmssp.idl
+++ b/librpc/idl/ntlmssp.idl
@@ -94,7 +94,7 @@ interface ntlmssp
                ntlmssp_NTLMRevisionCurrent NTLMRevisionCurrent;
        } VERSION;
 
-       typedef [nodiscriminant] union {
+       typedef [noprint,nodiscriminant] union {
                [case(NTLMSSP_NEGOTIATE_VERSION)] VERSION version;
                [default];
        } ntlmssp_Version;

diff --git a/librpc/ndr/ndr_ntlmssp.c b/librpc/ndr/ndr_ntlmssp.c
index 5c28726f55b3cb13ad37fa303ad77cc7a17a9b9f..4808aa5f5f677cb2e5cf21bd6d44ebe7f6dda08e 100644 (file)
--- a/librpc/ndr/ndr_ntlmssp.c
+++ b/librpc/ndr/ndr_ntlmssp.c
@@ -162,3 +162,20 @@ _PUBLIC_ void ndr_print_ntlmssp_lm_response(TALLOC_CTX *mem_ctx,
                }
        }
 }
+
+_PUBLIC_ void ndr_print_ntlmssp_Version(struct ndr_print *ndr, const char *name, const union ntlmssp_Version *r)
+{
+       int level;
+       level = ndr_print_get_switch_value(ndr, r);
+       switch (level) {
+               case NTLMSSP_NEGOTIATE_VERSION:
+                       ndr_print_VERSION(ndr, name, &r->version);
+               break;
+
+               default:
+               break;
+
+       }
+}
+
+

diff --git a/librpc/ndr/ndr_ntlmssp.h b/librpc/ndr/ndr_ntlmssp.h
index 6d76be20ca2fca41d2fd610c9cbfecb30258fe0e..b574f154956e650df68a602a5110775aa554df3a 100644 (file)
--- a/librpc/ndr/ndr_ntlmssp.h
+++ b/librpc/ndr/ndr_ntlmssp.h
@@ -31,3 +31,5 @@ _PUBLIC_ void ndr_print_ntlmssp_lm_response(TALLOC_CTX *mem_ctx,
                                            struct smb_iconv_convenience *ic,
                                            const DATA_BLOB *lm_response,
                                            bool ntlmv2);
+_PUBLIC_ void ndr_print_ntlmssp_Version(struct ndr_print *ndr, const char *name, const union ntlmssp_Version *r);
+