idl: naming a structure 'VERSION' is not a good idea!

this renames it to ntlmssp_VERSION

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

diff --git a/libcli/auth/ntlmssp_server.c b/libcli/auth/ntlmssp_server.c
index f78698af1f97bf73835432efe8c6c6f6e0ea121e..264e8bc908475bedb263deb519bd5d95bd2bd55b 100644 (file)
--- a/libcli/auth/ntlmssp_server.c
+++ b/libcli/auth/ntlmssp_server.c
@@ -161,7 +161,7 @@ NTSTATUS ntlmssp_server_negotiate(struct ntlmssp_state *ntlmssp_state,
 
                if (chal_flags & NTLMSSP_NEGOTIATE_VERSION) {
                        enum ndr_err_code err;
-                       struct VERSION vers;
+                       struct ntlmssp_VERSION vers;
 
                        /* "What Windows returns" as a version number. */
                        ZERO_STRUCT(vers);
@@ -173,7 +173,7 @@ NTSTATUS ntlmssp_server_negotiate(struct ntlmssp_state *ntlmssp_state,
                        err = ndr_push_struct_blob(&version_blob,
                                                ntlmssp_state,
                                                &vers,
-                                               (ndr_push_flags_fn_t)ndr_push_VERSION);
+                                               (ndr_push_flags_fn_t)ndr_push_ntlmssp_VERSION);
 
                        if (!NDR_ERR_CODE_IS_SUCCESS(err)) {
                                data_blob_free(&struct_blob);

diff --git a/librpc/idl/ntlmssp.idl b/librpc/idl/ntlmssp.idl
index b9be7daea770142b0d72a21ee23f01045d78218a..7c3b8fe63bad186b1d8b1322b85dcbe5e5a13dd8 100644 (file)
--- a/librpc/idl/ntlmssp.idl
+++ b/librpc/idl/ntlmssp.idl
@@ -92,10 +92,10 @@ interface ntlmssp
                uint16 ProductBuild;
                uint8 Reserved[3];
                ntlmssp_NTLMRevisionCurrent NTLMRevisionCurrent;
-       } VERSION;
+       } ntlmssp_VERSION;
 
        typedef [noprint,nodiscriminant] union {
-               [case(NTLMSSP_NEGOTIATE_VERSION)] VERSION version;
+               [case(NTLMSSP_NEGOTIATE_VERSION)] ntlmssp_VERSION version;
                [default];
        } ntlmssp_Version;
 

diff --git a/librpc/ndr/ndr_ntlmssp.c b/librpc/ndr/ndr_ntlmssp.c
index 02fc3c2cc7e51e887ec3aed868e74901348e180f..d024da5ed8ebf4b793d0580c493b899da8fe6330 100644 (file)
--- a/librpc/ndr/ndr_ntlmssp.c
+++ b/librpc/ndr/ndr_ntlmssp.c
@@ -167,7 +167,7 @@ _PUBLIC_ void ndr_print_ntlmssp_Version(struct ndr_print *ndr, const char *name,
        level = ndr_print_get_switch_value(ndr, r);
        switch (level) {
                case NTLMSSP_NEGOTIATE_VERSION:
-                       ndr_print_VERSION(ndr, name, &r->version);
+                       ndr_print_ntlmssp_VERSION(ndr, name, &r->version);
                break;
 
                default: