summaryrefslogtreecommitdiff
path: root/nsswitch
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2009-10-06 17:45:24 +0200
committerGünther Deschner <gd@samba.org>2009-10-07 11:18:03 +0200
commit2df47b0a54ad0a973b81911ee507ab50555b24a6 (patch)
tree92b2da985d880b210cbd6c023d17b87a9acbf7f1 /nsswitch
parent3d3134a7d6a4d49b891a446f6cc7b38fd953739a (diff)
downloadsamba-2df47b0a54ad0a973b81911ee507ab50555b24a6.tar.gz
samba-2df47b0a54ad0a973b81911ee507ab50555b24a6.tar.bz2
samba-2df47b0a54ad0a973b81911ee507ab50555b24a6.zip
libwbclient: implement secure channel verification for specific domains in wbcCheckTrustCredentials().
Guenther
Diffstat (limited to 'nsswitch')
-rw-r--r--nsswitch/libwbclient/wbc_pam.c14
-rw-r--r--nsswitch/libwbclient/wbclient.h4
2 files changed, 6 insertions, 12 deletions
diff --git a/nsswitch/libwbclient/wbc_pam.c b/nsswitch/libwbclient/wbc_pam.c
index 33044b2df7..4cd212a34a 100644
--- a/nsswitch/libwbclient/wbc_pam.c
+++ b/nsswitch/libwbclient/wbc_pam.c
@@ -502,18 +502,14 @@ wbcErr wbcCheckTrustCredentials(const char *domain,
struct winbindd_response response;
wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
- if (domain) {
- /*
- * the current protocol doesn't support
- * specifying a domain
- */
- wbc_status = WBC_ERR_NOT_IMPLEMENTED;
- BAIL_ON_WBC_ERROR(wbc_status);
- }
-
ZERO_STRUCT(request);
ZERO_STRUCT(response);
+ if (domain) {
+ strncpy(request.domain_name, domain,
+ sizeof(request.domain_name)-1);
+ }
+
/* Send request */
wbc_status = wbcRequestResponse(WINBINDD_CHECK_MACHACC,
diff --git a/nsswitch/libwbclient/wbclient.h b/nsswitch/libwbclient/wbclient.h
index a87cad3b21..4dc6d23dfc 100644
--- a/nsswitch/libwbclient/wbclient.h
+++ b/nsswitch/libwbclient/wbclient.h
@@ -1183,9 +1183,7 @@ wbcErr wbcResolveWinsByIP(const char *ip, char **name);
/**
* @brief Trigger a verification of the trust credentials of a specific domain
*
- * @param *domain The name of the domain, only NULL for the default domain is
- * supported yet. Other values than NULL will result in
- * WBC_ERR_NOT_IMPLEMENTED.
+ * @param *domain The name of the domain.
* @param error Output details on WBC_ERR_AUTH_ERROR
*
* @return #wbcErr