Changeset 745 for trunk/server/librpc/ndr/ndr_ntlmssp.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• librpc/ndr/ndr_ntlmssp.c (modified) (7 diffs)

trunk/server/librpc/ndr/ndr_ntlmssp.c

@@ -109 +109 @@
 
 _PUBLIC_ void ndr_print_ntlmssp_nt_response(TALLOC_CTX *mem_ctx,
-                                            struct smb_iconv_convenience *ic,
                                             const DATA_BLOB *nt_response,
                                             bool ntlmv2)
@@ -118 +117 @@
                 struct NTLMv2_RESPONSE nt;
                 if (nt_response->length > 24) {
-                        ndr_err = ndr_pull_struct_blob(nt_response, mem_ctx, ic, &nt,
+                        ndr_err = ndr_pull_struct_blob(nt_response, mem_ctx, &nt,
                                         (ndr_pull_flags_fn_t)ndr_pull_NTLMv2_RESPONSE);
                         if (NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -127 +126 @@
                 struct NTLM_RESPONSE nt;
                 if (nt_response->length == 24) {
-                        ndr_err = ndr_pull_struct_blob(nt_response, mem_ctx, ic, &nt,
+                        ndr_err = ndr_pull_struct_blob(nt_response, mem_ctx, &nt,
                                         (ndr_pull_flags_fn_t)ndr_pull_NTLM_RESPONSE);
                         if (NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -137 +136 @@
 
 _PUBLIC_ void ndr_print_ntlmssp_lm_response(TALLOC_CTX *mem_ctx,
-                                            struct smb_iconv_convenience *ic,
                                             const DATA_BLOB *lm_response,
                                             bool ntlmv2)
@@ -146 +144 @@
                 struct LMv2_RESPONSE lm;
                 if (lm_response->length == 24) {
-                        ndr_err = ndr_pull_struct_blob(lm_response, mem_ctx, ic, &lm,
+                        ndr_err = ndr_pull_struct_blob(lm_response, mem_ctx, &lm,
                                         (ndr_pull_flags_fn_t)ndr_pull_LMv2_RESPONSE);
                         if (NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -155 +153 @@
                 struct LM_RESPONSE lm;
                 if (lm_response->length == 24) {
-                        ndr_err = ndr_pull_struct_blob(lm_response, mem_ctx, ic, &lm,
+                        ndr_err = ndr_pull_struct_blob(lm_response, mem_ctx, &lm,
                                         (ndr_pull_flags_fn_t)ndr_pull_LM_RESPONSE);
                         if (NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -170 +168 @@
         switch (level) {
                 case NTLMSSP_NEGOTIATE_VERSION:
-                        ndr_print_VERSION(ndr, name, &r->version);
+                        ndr_print_ntlmssp_VERSION(ndr, name, &r->version);
                 break;