From 39ec5c1a7c4074586b47a3abafaa331dfaab93df Mon Sep 17 00:00:00 2001 From: Jim McDonough Date: Thu, 26 May 2011 20:30:33 +0200 Subject: s3-libnet: fix bug #6364: Pull realm from supplied username on libnet join (cherry picked from commit 9a172dcd2e7bf91d78885325bce7a19e937b48af) --- source3/libnet/libnet_join.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c index 03832cffe5a..64891264045 100644 --- a/source3/libnet/libnet_join.c +++ b/source3/libnet/libnet_join.c @@ -100,6 +100,7 @@ static ADS_STATUS libnet_connect_ads(const char *dns_domain_name, { ADS_STATUS status; ADS_STRUCT *my_ads = NULL; + char *cp; my_ads = ads_init(dns_domain_name, netbios_domain_name, @@ -111,6 +112,12 @@ static ADS_STATUS libnet_connect_ads(const char *dns_domain_name, if (user_name) { SAFE_FREE(my_ads->auth.user_name); my_ads->auth.user_name = SMB_STRDUP(user_name); + if ((cp = strchr_m(my_ads->auth.user_name, '@'))!=0) { + *cp++ = '\0'; + SAFE_FREE(my_ads->auth.realm); + my_ads->auth.realm = smb_xstrdup(cp); + strupper_m(my_ads->auth.realm); + } } if (password) { -- cgit v1.2.1