Changeset 734 for branches/samba-3.5.x/libcli

Timestamp:

Nov 12, 2012, 5:18:59 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: update branche to 3.5.14

Location:

branches/samba-3.5.x/libcli

Files:

• auth/schannel_state_tdb.c (modified) (4 diffs)
• cldap/cldap.c (modified) (2 diffs)

branches/samba-3.5.x/libcli/auth/schannel_state_tdb.c

@@ -170 +170 @@
                                               struct netlogon_creds_CredentialState **creds_out)
 {
-        struct netlogon_creds_CredentialState *creds;
+        struct netlogon_creds_CredentialState *creds = NULL;
         NTSTATUS status;
         int ret;
@@ -194 +194 @@
                 DEBUG(0,("schannel_creds_server_step_check_tdb: "
                         "client %s not using schannel for netlogon, despite negotiating it\n",
-                        creds->computer_name ));
+                        computer_name));
+                TALLOC_FREE(creds);
                 tdb_transaction_cancel(tdb);
                 return NT_STATUS_ACCESS_DENIED;
@@ -212 +213 @@
                 tdb_transaction_commit(tdb);
                 if (creds_out) {
-                        *creds_out = creds;
-                        talloc_steal(mem_ctx, creds);
+                        *creds_out = talloc_move(mem_ctx, &creds);
                 }
         } else {
@@ -219 +219 @@
         }
 
+        TALLOC_FREE(creds);
         return status;
 }

branches/samba-3.5.x/libcli/cldap/cldap.c

@@ -279 +279 @@
         status = map_nt_error_from_unix(in->recv_errno);
 nterror:
+        TALLOC_FREE(in);
         /* in connected mode the first pending search gets the error */
         if (!c->connected) {
@@ -289 +290 @@
         tevent_req_nterror(c->searches.list->req, status);
 done:
-        talloc_free(in);
+        TALLOC_FREE(in);
 }