diff options
| author | Volker Lendecke <vl@samba.org> | 2009-08-19 14:19:22 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2009-08-20 14:26:46 +0200 |
| commit | 68ea2876172a76761a678bcfbb17ab64a7db706d (patch) | |
| tree | bdae895c2fbd3407ed92a6c2286fed3b811722e6 /source3/libsmb/dsgetdcname.c | |
| parent | f3c94f4b40399aea12a3608e930d20eb93a77efa (diff) | |
| download | samba-68ea2876172a76761a678bcfbb17ab64a7db706d.tar.gz samba-68ea2876172a76761a678bcfbb17ab64a7db706d.tar.bz2 samba-68ea2876172a76761a678bcfbb17ab64a7db706d.zip | |
s3:dsgetdcname: Inline dsgetdcname_cache_refresh
Signed-off-by: Günther Deschner <gd@samba.org>
Diffstat (limited to 'source3/libsmb/dsgetdcname.c')
| -rw-r--r-- | source3/libsmb/dsgetdcname.c | 33 |
1 files changed, 7 insertions, 26 deletions
diff --git a/source3/libsmb/dsgetdcname.c b/source3/libsmb/dsgetdcname.c index de020d4791..c089fdf06a 100644 --- a/source3/libsmb/dsgetdcname.c +++ b/source3/libsmb/dsgetdcname.c @@ -225,28 +225,6 @@ static NTSTATUS store_cldap_reply(TALLOC_CTX *mem_ctx, /**************************************************************** ****************************************************************/ -static NTSTATUS dsgetdcname_cache_refresh(TALLOC_CTX *mem_ctx, - struct messaging_context *msg_ctx, - const char *domain_name, - struct GUID *domain_guid, - uint32_t flags, - const char *site_name, - struct netr_DsRGetDCNameInfo *info) -{ - struct netr_DsRGetDCNameInfo *dc_info; - - return dsgetdcname(mem_ctx, - msg_ctx, - domain_name, - domain_guid, - site_name, - flags | DS_FORCE_REDISCOVERY, - &dc_info); -} - -/**************************************************************** -****************************************************************/ - static uint32_t get_cldap_reply_server_flags(struct netlogon_samlogon_response *r, uint32_t nt_version) { @@ -424,10 +402,13 @@ static NTSTATUS dsgetdcname_cached(TALLOC_CTX *mem_ctx, } if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) { - status = dsgetdcname_cache_refresh(mem_ctx, msg_ctx, - domain_name, - domain_guid, flags, - site_name, *info); + struct netr_DsRGetDCNameInfo *dc_info; + + status = dsgetdcname(mem_ctx, msg_ctx, domain_name, + domain_guid, site_name, + flags | DS_FORCE_REDISCOVERY, + &dc_info); + if (!NT_STATUS_IS_OK(status)) { return status; } |