diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-02-15 17:50:22 +1100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2011-02-17 00:55:23 +0100 |
| commit | 5debcb1027aec5e711605d575b210675fce3169a (patch) | |
| tree | 35f7528ea02cd14d2f38911af3b5cdf79f401c6e | |
| parent | 0aed229710b8058878f25ce7b738ef807fb1faaa (diff) | |
| download | samba-5debcb1027aec5e711605d575b210675fce3169a.tar.gz samba-5debcb1027aec5e711605d575b210675fce3169a.tar.bz2 samba-5debcb1027aec5e711605d575b210675fce3169a.zip | |
idl: naming a structure 'VERSION' is not a good idea!
this renames it to ntlmssp_VERSION
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | libcli/auth/ntlmssp_server.c | 4 | ||||
| -rw-r--r-- | librpc/idl/ntlmssp.idl | 4 | ||||
| -rw-r--r-- | librpc/ndr/ndr_ntlmssp.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libcli/auth/ntlmssp_server.c b/libcli/auth/ntlmssp_server.c index f78698af1f..264e8bc908 100644 --- 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 b9be7daea7..7c3b8fe63b 100644 --- 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 02fc3c2cc7..d024da5ed8 100644 --- 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: |