diff options
| author | Günther Deschner <gd@samba.org> | 2008-09-27 03:11:59 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2008-10-09 12:37:18 +0200 |
| commit | bf5c80c8eb3051ff2d04629b2b4a74b0c86d726d (patch) | |
| tree | 2d25e7c8696f472c34e5d5ff51c27decc5e581ef | |
| parent | 4e04c5ae1bb7ade41c0b28bbf9ec7cdb4930d9ae (diff) | |
| download | samba-bf5c80c8eb3051ff2d04629b2b4a74b0c86d726d.tar.gz samba-bf5c80c8eb3051ff2d04629b2b4a74b0c86d726d.tar.bz2 samba-bf5c80c8eb3051ff2d04629b2b4a74b0c86d726d.zip | |
krb5-locator: fix dsgetdcname caller.
Guenther
| -rw-r--r-- | source3/nsswitch/winbind_krb5_locator.c | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/source3/nsswitch/winbind_krb5_locator.c b/source3/nsswitch/winbind_krb5_locator.c index 990c2cae50..7eecd13b70 100644 --- a/source3/nsswitch/winbind_krb5_locator.c +++ b/source3/nsswitch/winbind_krb5_locator.c @@ -1,7 +1,7 @@ /* Unix SMB/CIFS implementation. kerberos locator plugin - Copyright (C) Guenther Deschner 2007 + Copyright (C) Guenther Deschner 2007-2008 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -247,18 +247,19 @@ static bool ask_winbind(const char *realm, char **dcname) NSS_STATUS status; struct winbindd_request request; struct winbindd_response response; + const char *dc = NULL; ZERO_STRUCT(request); ZERO_STRUCT(response); - request.flags = 0x40020600; + request.data.dsgetdcname.flags = 0x40020600; /* DS_KDC_REQUIRED | DS_IS_DNS_NAME | DS_RETURN_DNS_NAME | DS_IP_REQUIRED */ - strncpy(request.domain_name, realm, - sizeof(request.domain_name)-1); + strncpy(request.data.dsgetdcname.domain_name, realm, + sizeof(request.data.dsgetdcname.domain_name)-1); status = winbindd_request_response(WINBINDD_DSGETDCNAME, &request, &response); @@ -270,7 +271,23 @@ static bool ask_winbind(const char *realm, char **dcname) return false; } - *dcname = strdup(response.data.dc_name); + if (response.data.dsgetdcname.dc_address[0] != '\0') { + dc = response.data.dsgetdcname.dc_address; + if (dc[0] == '\\') dc++; + if (dc[0] == '\\') dc++; + } + + if (!dc && response.data.dsgetdcname.dc_unc[0] != '\0') { + dc = response.data.dsgetdcname.dc_unc; + if (dc[0] == '\\') dc++; + if (dc[0] == '\\') dc++; + } + + if (!dc) { + return false; + } + + *dcname = strdup(dc); if (!*dcname) { return false; } |