Changeset 620 for trunk/server/source3/lib/smbldap.c

Timestamp:

Aug 6, 2011, 6:50:53 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.11

File:

• trunk/server/source3/lib/smbldap.c (modified) (10 diffs)

trunk/server/source3/lib/smbldap.c

@@ -1094 +1094 @@
  connect to the ldap server under system privilege.
 ******************************************************************/
-static int smbldap_connect_system(struct smbldap_state *ldap_state, LDAP * ldap_struct)
-{
+static int smbldap_connect_system(struct smbldap_state *ldap_state)
+{
+        LDAP *ldap_struct = ldap_state->ldap_struct;
         int rc;
         int version;
@@ -1106 +1107 @@
                 if (!fetch_ldap_pw(&bind_dn, &bind_secret)) {
                         DEBUG(0, ("ldap_connect_system: Failed to retrieve password from secrets.tdb\n"));
-                        return LDAP_INVALID_CREDENTIALS;
+                        rc = LDAP_INVALID_CREDENTIALS;
+                        goto done;
                 }
                 smbldap_set_creds(ldap_state, false, bind_dn, bind_secret);
@@ -1152 +1154 @@
                 SAFE_FREE(ld_error);
                 ldap_state->num_failures++;
-                return rc;
+                goto done;
         }
 
@@ -1167 +1169 @@
         DEBUGADD(10, ("ldap_connect_system: LDAP server %s support paged results\n", 
                 ldap_state->paged_results ? "does" : "does not"));
+done:
+        if (rc != 0) {
+                ldap_unbind(ldap_struct);
+                ldap_state->ldap_struct = NULL;
+        }
         return rc;
 }
@@ -1221 +1228 @@
         }
 
-        if ((rc = smbldap_connect_system(ldap_state, ldap_state->ldap_struct))) {
-                ldap_unbind(ldap_state->ldap_struct);
-                ldap_state->ldap_struct = NULL;
+        if ((rc = smbldap_connect_system(ldap_state))) {
                 return rc;
         }
@@ -1235 +1240 @@
         if (ldap_state->event_context != NULL) {
                 ldap_state->idle_event = event_add_timed(
-                        ldap_state->event_context, NULL,
+                        ldap_state->event_context, ldap_state,
                         timeval_current_ofs(SMBLDAP_IDLE_TIME, 0),
                         smbldap_idle_fn, ldap_state);
@@ -1259 +1264 @@
 
         smbldap_delete_state(ldap_state);
+
+        TALLOC_FREE(ldap_state->idle_event);
 
         DEBUG(5,("The connection to the LDAP server was closed\n"));
@@ -1746 +1753 @@
 
                 state->idle_event = event_add_timed(
-                        event_ctx, NULL,
+                        event_ctx, state,
                         timeval_add(&now, SMBLDAP_IDLE_TIME, 0),
                         smbldap_idle_fn,
@@ -1772 +1779 @@
         SAFE_FREE((*ldap_state)->bind_secret);
 
-        TALLOC_FREE((*ldap_state)->idle_event);
-
-        *ldap_state = NULL;
+        TALLOC_FREE(*ldap_state);
 
         /* No need to free any further, as it is talloc()ed */
+}
+
+static int smbldap_state_destructor(struct smbldap_state *state)
+{
+        smbldap_free_struct(&state);
+        return 0;
 }
 
@@ -1802 +1813 @@
         (*smbldap_state)->event_context = event_ctx;
 
+        talloc_set_destructor(*smbldap_state, smbldap_state_destructor);
         return NT_STATUS_OK;
 }