[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  5338e42... s4/ildap: fine tune ildb_callback()
      from  e3c2e1a... s3: net_share.c: fix argc handling

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 5338e42182ee34f20fde104006a752662099af22
Author: Kamen Mazdrashki <kamen.mazdrashki at postpath.com>
Date:   Wed Mar 3 02:33:31 2010 +0200

    s4/ildap: fine tune ildb_callback()
    
    Actually ildb_context pointer is not supposed to be
    valid after calling ildb_request_done().
    This is due to the fact that when calling ildb_request_done()
    caller will (most probably) free any locally built
    ldap_request objects - thus rendering ildb_context invalid.
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 source4/lib/ldb/ldb_ildap/ldb_ildap.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/lib/ldb/ldb_ildap/ldb_ildap.c b/source4/lib/ldb/ldb_ildap/ldb_ildap.c
index 3110008..9f81c4e 100644
--- a/source4/lib/ldb/ldb_ildap/ldb_ildap.c
+++ b/source4/lib/ldb/ldb_ildap/ldb_ildap.c
@@ -383,13 +383,13 @@ static void ildb_callback(struct ldap_request *req)
 		}
 	}
 
+	/* mark the request as not being in progress */
+	ac->in_ildb_callback = false;
+
 	if (request_done) {
 		ildb_request_done(ac, controls, ret);
 	}
 
-	/* unmark the request as beign in progress */
-	ac->in_ildb_callback = false;
-
 	return;
 }
 


-- 
Samba Shared Repository