Changeset 587 for vendor/current/libcli

Timestamp:

Jun 29, 2011, 7:36:41 AM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update vendor to version 3.5.6

Location:

vendor/current/libcli/auth

Files:

• credentials.c (modified) (3 diffs)
• proto.h (modified) (1 diff)

vendor/current/libcli/auth/credentials.c

@@ -25 +25 @@
 #include "../lib/crypto/crypto.h"
 #include "libcli/auth/libcli_auth.h"
+#include "../libcli/security/dom_sid.h"
 
 static void netlogon_creds_step_crypt(struct netlogon_creds_CredentialState *creds,
@@ -203 +204 @@
                                                                   uint32_t negotiate_flags)
 {
-        struct netlogon_creds_CredentialState *creds = talloc(mem_ctx, struct netlogon_creds_CredentialState);
+        struct netlogon_creds_CredentialState *creds = talloc_zero(mem_ctx, struct netlogon_creds_CredentialState);
         
         if (!creds) {
@@ -454 +455 @@
 }       
 
+/*
+  copy a netlogon_creds_CredentialState struct
+*/
+
+struct netlogon_creds_CredentialState *netlogon_creds_copy(TALLOC_CTX *mem_ctx,
+                                                           struct netlogon_creds_CredentialState *creds_in)
+{
+        struct netlogon_creds_CredentialState *creds = talloc_zero(mem_ctx, struct netlogon_creds_CredentialState);
+
+        if (!creds) {
+                return NULL;
+        }
+
+        creds->sequence                 = creds_in->sequence;
+        creds->negotiate_flags          = creds_in->negotiate_flags;
+        creds->secure_channel_type      = creds_in->secure_channel_type;
+
+        creds->computer_name = talloc_strdup(creds, creds_in->computer_name);
+        if (!creds->computer_name) {
+                talloc_free(creds);
+                return NULL;
+        }
+        creds->account_name = talloc_strdup(creds, creds_in->account_name);
+        if (!creds->account_name) {
+                talloc_free(creds);
+                return NULL;
+        }
+
+        if (creds_in->sid) {
+                creds->sid = dom_sid_dup(creds, creds_in->sid);
+                if (!creds->sid) {
+                        talloc_free(creds);
+                        return NULL;
+                }
+        }
+
+        memcpy(creds->session_key, creds_in->session_key, sizeof(creds->session_key));
+        memcpy(creds->seed.data, creds_in->seed.data, sizeof(creds->seed.data));
+        memcpy(creds->client.data, creds_in->client.data, sizeof(creds->client.data));
+        memcpy(creds->server.data, creds_in->server.data, sizeof(creds->server.data));
+
+        return creds;
+}

vendor/current/libcli/auth/proto.h

@@ -36 +36 @@
 bool netlogon_creds_client_check(struct netlogon_creds_CredentialState *creds,
                         const struct netr_Credential *received_credentials);
+struct netlogon_creds_CredentialState *netlogon_creds_copy(TALLOC_CTX *mem_ctx,
+                                                           struct netlogon_creds_CredentialState *creds_in);
 
 /*****************************************************************