diff options
author | Jeremy Allison <jra@samba.org> | 2013-09-04 13:58:18 -0700 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2013-09-05 09:17:27 -0700 |
commit | 32037e0533f720ebbd3f49c5951c4ef30aac9985 (patch) | |
tree | f9db5cdac1da5bd09fb0e2a6e373a96a9847c08b /source3/libsmb/namequery_dc.c | |
parent | 6b915bfd0f4194453c1b01158f2c2772b2a2df2f (diff) | |
download | samba-32037e0533f720ebbd3f49c5951c4ef30aac9985.tar.gz samba-32037e0533f720ebbd3f49c5951c4ef30aac9985.tar.bz2 samba-32037e0533f720ebbd3f49c5951c4ef30aac9985.zip |
Add a talloc context to sitename_fetch().
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Diffstat (limited to 'source3/libsmb/namequery_dc.c')
-rw-r--r-- | source3/libsmb/namequery_dc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/libsmb/namequery_dc.c b/source3/libsmb/namequery_dc.c index df5eeb8d89..3cfae79257 100644 --- a/source3/libsmb/namequery_dc.c +++ b/source3/libsmb/namequery_dc.c @@ -64,13 +64,13 @@ static bool ads_dc_name(const char *domain, realm = lp_realm(); } - sitename = sitename_fetch(realm); + sitename = sitename_fetch(talloc_tos(), realm); /* Try this 3 times then give up. */ for( i =0 ; i < 3; i++) { ads = ads_init(realm, domain, NULL); if (!ads) { - SAFE_FREE(sitename); + TALLOC_FREE(sitename); return False; } @@ -83,7 +83,7 @@ static bool ads_dc_name(const char *domain, #endif if (!ads->config.realm) { - SAFE_FREE(sitename); + TALLOC_FREE(sitename); ads_destroy(&ads); return False; } @@ -93,8 +93,8 @@ static bool ads_dc_name(const char *domain, to ensure we only find servers in our site. */ if (stored_sitename_changed(realm, sitename)) { - SAFE_FREE(sitename); - sitename = sitename_fetch(realm); + TALLOC_FREE(sitename); + sitename = sitename_fetch(talloc_tos(), realm); ads_destroy(&ads); /* Ensure we don't cache the DC we just connected to. */ namecache_delete(realm, 0x1C); @@ -129,12 +129,12 @@ static bool ads_dc_name(const char *domain, if (i == 3) { DEBUG(1,("ads_dc_name: sitename (now \"%s\") keeps changing ???\n", sitename ? sitename : "")); - SAFE_FREE(sitename); + TALLOC_FREE(sitename); ads_destroy(&ads); return False; } - SAFE_FREE(sitename); + TALLOC_FREE(sitename); fstrcpy(srv_name, ads->config.ldap_server_name); if (!strupper_m(srv_name)) { |