diff options
| author | Jim McDonough <jmcd@samba.org> | 2011-05-26 20:30:33 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2011-08-18 21:15:09 +0200 |
| commit | 39ec5c1a7c4074586b47a3abafaa331dfaab93df (patch) | |
| tree | 34cee1fb147afca2ff1f537766e5d419ebd120e5 | |
| parent | deb939d77acfcd03f07435d9268bedb6b9ddb8b6 (diff) | |
| download | samba-39ec5c1a7c4074586b47a3abafaa331dfaab93df.tar.gz | |
s3-libnet: fix bug #6364: Pull realm from supplied username on libnet join
(cherry picked from commit 9a172dcd2e7bf91d78885325bce7a19e937b48af)
| -rw-r--r-- | source3/libnet/libnet_join.c | 7 |
1 files changed, 7 insertions, 0 deletions
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) { |