[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2068-g9d6b43e

[Stefan Metzmacher]

The branch, v3-2-test has been updated
       via  9d6b43ea106df188b51060a8055fe5168220c314 (commit)
      from  97a8069075d820c43c17e761b1186d4f0b3c785d (commit)

http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 9d6b43ea106df188b51060a8055fe5168220c314
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Feb 4 13:47:15 2008 +0100

    smbd: use make usage of wbcDomainInfo()
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 source/smbd/sesssetup.c |   24 +++++++++---------------
 1 files changed, 9 insertions(+), 15 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/smbd/sesssetup.c b/source/smbd/sesssetup.c
index aee8e49..1e4e208 100644
--- a/source/smbd/sesssetup.c
+++ b/source/smbd/sesssetup.c
@@ -410,30 +410,24 @@ static void reply_spnego_kerberos(struct smb_request *req,
 		   name. And even w2k3 does use ntlmssp if you for example
 		   connect to an ip address. */
 
-		struct winbindd_request wb_request;
-		struct winbindd_response wb_response;
-		NSS_STATUS wb_result;
-
-		ZERO_STRUCT(wb_request);
-		ZERO_STRUCT(wb_response);
+		wbcErr wbc_status;
+		struct wbcDomainInfo *info = NULL;
 
 		DEBUG(10, ("Mapping [%s] to short name\n", domain));
 
-		fstrcpy(wb_request.domain_name, domain);
-
-		wb_result = winbindd_request_response(WINBINDD_DOMAIN_INFO,
-					     &wb_request, &wb_response);
+		wbc_status = wbcDomainInfo(domain, &info);
 
-		if (wb_result == NSS_STATUS_SUCCESS) {
+		if (WBC_ERROR_IS_OK(wbc_status)) {
 
 			fstrcpy(netbios_domain_name,
-				wb_response.data.domain_info.name);
-			domain = netbios_domain_name;
+				info->short_name);
 
+			wbcFreeMemory(info);
+			domain = netbios_domain_name;
 			DEBUG(10, ("Mapped to [%s] (using Winbind)\n", domain));
 		} else {
-			DEBUG(3, ("Could not find short name -- winbind "
-				  "not running?\n"));
+			DEBUG(3, ("Could not find short name: %s\n",
+				wbcErrorString(wbc_status)));
 		}
 	}
 


-- 
Samba Shared Repository