summaryrefslogtreecommitdiff
path: root/source3/smbd/sesssetup.c
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-02-04 13:47:15 +0100
committerStefan Metzmacher <metze@samba.org>2008-02-11 18:14:15 +0100
commitde48cd925a11414063cae7ead89fa060c280352a (patch)
tree645c5b021b436e3f7e18e8bb79358b9aa1333ff1 /source3/smbd/sesssetup.c
parentf47b518940f67ba6be40cae7eb8e8ba556b5f404 (diff)
downloadsamba-de48cd925a11414063cae7ead89fa060c280352a.tar.gz
samba-de48cd925a11414063cae7ead89fa060c280352a.tar.bz2
samba-de48cd925a11414063cae7ead89fa060c280352a.zip
smbd: use make usage of wbcDomainInfo()
metze (This used to be commit 9d6b43ea106df188b51060a8055fe5168220c314)
Diffstat (limited to 'source3/smbd/sesssetup.c')
-rw-r--r--source3/smbd/sesssetup.c24
1 files changed, 9 insertions, 15 deletions
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index aee8e498e9..1e4e208951 100644
--- a/source3/smbd/sesssetup.c
+++ b/source3/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)));
}
}