s3:libads: Fix creating machine account using LDAP

[bbaumbach/samba-autobuild/.git] / source3 / libads / ldap_utils.c

diff --git a/source3/libads/ldap_utils.c b/source3/libads/ldap_utils.c
index a4adbc09524bcf74c3ce0af40c6fdcacbad48ea1..c9039684bf00508903f4d41420841e7026bd9b45 100644 (file)
--- a/source3/libads/ldap_utils.c
+++ b/source3/libads/ldap_utils.c
@@ -49,7 +49,7 @@ static ADS_STATUS ads_do_search_retry_internal(ADS_STRUCT *ads, const char *bind
                                               const char **attrs, void *args,
                                               LDAPMessage **res)
 {
-       ADS_STATUS status = ADS_SUCCESS;
+       ADS_STATUS status;
        int count = 3;
        char *bp;
 
@@ -105,9 +105,18 @@ static ADS_STATUS ads_do_search_retry_internal(ADS_STRUCT *ads, const char *bind
                status = ads_connect(ads);
 
                if (!ADS_ERR_OK(status)) {
+                       bool orig_is_mine = ads->is_mine;
+
                        DEBUG(1,("ads_search_retry: failed to reconnect (%s)\n",
                                 ads_errstr(status)));
+                       /*
+                        * We need to keep the ads pointer
+                        * from being freed here as we don't own it and
+                        * callers depend on it being around.
+                        */
+                       ads->is_mine = false;
                        ads_destroy(&ads);
+                       ads->is_mine = orig_is_mine;
                        SAFE_FREE(bp);
                        return status;
                }