Attachment 5902 Details for Bug 6364 – Patch for 3.4

[patch] Patch for 3.4

v3-4-patch (text/plain), 1010 bytes, created by Jim McDonough on 2010-08-12 19:03:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jim McDonough

Created: 2010-08-12 19:03:45 UTC

Size: 1010 bytes

patch

obsolete

>commit 87997132d134ecabeef186ea86674235250aa09c
>Author: Jim McDonough <jmcd@samba.org>
>Date:   Thu Aug 12 17:51:02 2010 -0400
>
>    s3-libnet: fix bug #6364: Pull realm from supplied username on libnet join
>
>diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
>index 03832cf..6489126 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) {

Flags:

gd: review+

Actions: View

Attachments on bug 6364: 4161 | 4209 | 5901 | 5902