Changeset 429 for trunk/server/source3/utils/ntlm_auth.c

Timestamp:

Apr 9, 2010, 3:51:41 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.5.x: trunk update to 3.5.2

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/utils/ntlm_auth.c (modified) (4 diffs)

trunk/server/source3/utils/ntlm_auth.c

@@ -1138 +1138 @@
         /* Server negTokenInit (mech offerings) */
         spnego.type = SPNEGO_NEG_TOKEN_INIT;
-        spnego.negTokenInit.mechTypes = SMB_XMALLOC_ARRAY(const char *, 2);
+        spnego.negTokenInit.mechTypes = talloc_array(ctx, const char *, 2);
 #ifdef HAVE_KRB5
-        spnego.negTokenInit.mechTypes[0] = smb_xstrdup(OID_KERBEROS5_OLD);
-        spnego.negTokenInit.mechTypes[1] = smb_xstrdup(OID_NTLMSSP);
+        spnego.negTokenInit.mechTypes[0] = talloc_strdup(ctx, OID_KERBEROS5_OLD);
+        spnego.negTokenInit.mechTypes[1] = talloc_strdup(ctx, OID_NTLMSSP);
         spnego.negTokenInit.mechTypes[2] = NULL;
 #else
-        spnego.negTokenInit.mechTypes[0] = smb_xstrdup(OID_NTLMSSP);
+        spnego.negTokenInit.mechTypes[0] = talloc_strdup(ctx, OID_NTLMSSP);
         spnego.negTokenInit.mechTypes[1] = NULL;
 #endif
 
 
-        spnego.negTokenInit.mechListMIC = data_blob(principal,
+        spnego.negTokenInit.mechListMIC = data_blob_talloc(ctx, principal,
                                                     strlen(principal));
 
@@ -1274 +1274 @@
 
                         response.type = SPNEGO_NEG_TOKEN_TARG;
-                        response.negTokenTarg.supportedMech = SMB_STRDUP(OID_NTLMSSP);
-                        response.negTokenTarg.mechListMIC = data_blob_null;
+                        response.negTokenTarg.supportedMech = talloc_strdup(ctx, OID_NTLMSSP);
+                        response.negTokenTarg.mechListMIC = data_blob_talloc(ctx, NULL, 0);
 
                         status = ntlmssp_update(ntlmssp_state,
@@ -1299 +1299 @@
 
                         response.type = SPNEGO_NEG_TOKEN_TARG;
-                        response.negTokenTarg.supportedMech = SMB_STRDUP(OID_KERBEROS5_OLD);
-                        response.negTokenTarg.mechListMIC = data_blob_null;
-                        response.negTokenTarg.responseToken = data_blob_null;
+                        response.negTokenTarg.supportedMech = talloc_strdup(ctx, OID_KERBEROS5_OLD);
+                        response.negTokenTarg.mechListMIC = data_blob_talloc(ctx, NULL, 0);
+                        response.negTokenTarg.responseToken = data_blob_talloc(ctx, NULL, 0);
 
                         status = ads_verify_ticket(mem_ctx, lp_realm(), 0,
@@ -1360 +1360 @@
 
                 response.type = SPNEGO_NEG_TOKEN_TARG;
-                response.negTokenTarg.supportedMech = SMB_STRDUP(OID_NTLMSSP);
-                response.negTokenTarg.mechListMIC = data_blob_null;
+                response.negTokenTarg.supportedMech = talloc_strdup(ctx, OID_NTLMSSP);
+                response.negTokenTarg.mechListMIC = data_blob_talloc(ctx, NULL, 0);
 
                 if (NT_STATUS_IS_OK(status)) {