summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-09-10 20:15:00 +1000
committerAndrew Tridgell <tridge@samba.org>2010-09-15 15:39:33 +1000
commitcbd8297b4dcf9446e30b752d977e15ba440dff70 (patch)
tree856d4d1db772c6655b5e6b27ae96a8d640438dbb
parent5a4a11cb98460dfab0517636a1434e0a96009c4e (diff)
downloadsamba-cbd8297b4dcf9446e30b752d977e15ba440dff70.tar.gz
samba-cbd8297b4dcf9446e30b752d977e15ba440dff70.tar.bz2
samba-cbd8297b4dcf9446e30b752d977e15ba440dff70.zip
s4-dsdb: defer ac->msg after check for NULL ac
-rw-r--r--source4/dsdb/samdb/ldb_modules/extended_dn_out.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/extended_dn_out.c b/source4/dsdb/samdb/ldb_modules/extended_dn_out.c
index ad197b8138..fc0401369c 100644
--- a/source4/dsdb/samdb/ldb_modules/extended_dn_out.c
+++ b/source4/dsdb/samdb/ldb_modules/extended_dn_out.c
@@ -309,7 +309,7 @@ static int extended_callback(struct ldb_request *req, struct ldb_reply *ares,
struct dsdb_openldap_dereference_result_control *dereference_control = NULL;
int ret;
unsigned int i, j;
- struct ldb_message *msg = ares->message;
+ struct ldb_message *msg;
struct extended_dn_out_private *p;
struct ldb_context *ldb;
bool have_reveal_control, checked_reveal_control=false;
@@ -326,6 +326,8 @@ static int extended_callback(struct ldb_request *req, struct ldb_reply *ares,
ares->response, ares->error);
}
+ msg = ares->message;
+
switch (ares->type) {
case LDB_REPLY_REFERRAL:
return ldb_module_send_referral(ac->req, ares->referral);