[SCM] Samba Shared Repository - branch v3-4-test updated
Karolin Seeger
kseeger at samba.org
Thu May 26 12:28:22 MDT 2011
The branch, v3-4-test has been updated
via 9a172dc s3-libnet: fix bug #6364: Pull realm from supplied username on libnet join
from a3635ed s3-printing: remove duplicate cups response processing code
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -----------------------------------------------------------------
commit 9a172dcd2e7bf91d78885325bce7a19e937b48af
Author: Jim McDonough <jmcd at samba.org>
Date: Thu May 26 20:30:33 2011 +0200
s3-libnet: fix bug #6364: Pull realm from supplied username on libnet join
-----------------------------------------------------------------------
Summary of changes:
source3/libnet/libnet_join.c | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
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) {
--
Samba Shared Repository
More information about the samba-cvs
mailing list