From: Gerald (Jerry) Carter <jerry@samba.org>
Date: Fri, 21 Dec 2007 19:47:45 +0000 (-0600)
Subject: Compile fix: Correct use of wbcDomainInfo() after function signature change.
X-Git-Tag: samba-4.0.0alpha6~801^2~3990^2~19
X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=commitdiff_plain;h=387288e9501cd211500b1c5cf1bc0a339017a4a4

Compile fix: Correct use of wbcDomainInfo() after function signature change.

Also fixes a doxygen warngin about an undocumented parameter in the same
function.
(This used to be commit 290ab64e9e5fb2a28e14a5f344f22119d5304563)
---

diff --git a/source3/lib/winbind_util.c b/source3/lib/winbind_util.c
index 4983b9ced0d..f4e7ab19e89 100644
--- a/source3/lib/winbind_util.c
+++ b/source3/lib/winbind_util.c
@@ -166,13 +166,12 @@ bool winbind_gid_to_sid(DOM_SID *sid, gid_t gid)
 wbcErr wb_is_trusted_domain(const char *domain)
 {
 	wbcErr result;
-	struct wbcDomainInfo info;	
+	struct wbcDomainInfo *info = NULL;
 	
 	result = wbcDomainInfo(domain, &info);
 
-	if (result == WBC_ERR_SUCCESS) {
-		SAFE_FREE(info.short_name);
-		SAFE_FREE(info.dns_name);
+	if (WBC_ERROR_IS_OK(result)) {
+		wbcFreeMemory(info);
 	}
 
 	return result;	
diff --git a/source3/nsswitch/libwbclient/wbc_util.c b/source3/nsswitch/libwbclient/wbc_util.c
index 2d7cc7bcbdb..b0adaad3182 100644
--- a/source3/nsswitch/libwbclient/wbc_util.c
+++ b/source3/nsswitch/libwbclient/wbc_util.c
@@ -39,7 +39,7 @@ wbcErr wbcPing(void)
 /** @brief Lookup the current status of a trusted domain
  *
  * @param domain      Domain to query
- * @param *info       Pointer to returned domain_info struct
+ * @param *dinfo       Pointer to returned domain_info struct
  *
  * @return #wbcErr
  *