sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

r3100: support 'bin/smbclient //w2k3-101/c$ -U \\administrator@w2k3.vmnet1.vm.base'

Browse Source 
we need to send an empty string as userdomain in this case.
fix bug #1317 in the client side

metze
(This used to be commit 958aa8de630b2a88f29ccdf80ac0fc44a8205401)
This commit is contained in:
Stefan Metzmacher 2004-10-21 00:26:43 +00:00 committed by Gerald (Jerry) Carter
parent 98c8cb195a
commit 95ddbe5ad2
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source4/lib/cmdline/popt_common.c
View File

@ -304,6 +304,7 @@ static void popt_common_credentials_callback(poptContext con,
if ((p = strchr_m(tmp,'\\'))) {
*p = 0;
pstrcpy(cmdline_auth_info.domain,tmp);
cmdline_auth_info.got_domain = True;
pstrcpy(cmdline_auth_info.username,p+1);
}
@ -317,6 +318,7 @@ static void popt_common_credentials_callback(poptContext con,
if (getenv("DOMAIN")) {
pstrcpy(cmdline_auth_info.domain,getenv("DOMAIN"));
cmdline_auth_info.got_domain = True;
}
if (getenv("PASSWD")) {
@ -344,6 +346,7 @@ static void popt_common_credentials_callback(poptContext con,
if ((p = strchr_m(tmp,'\\'))) {
*p = 0;
pstrcpy(cmdline_auth_info.domain,tmp);
cmdline_auth_info.got_domain = True;
pstrcpy(cmdline_auth_info.username,p+1);
}
@ -431,12 +434,13 @@ const char *cmdline_get_username(void)
void cmdline_set_userdomain(const char *domain)
{
cmdline_auth_info.got_domain = True;
pstrcpy(cmdline_auth_info.domain, domain);
}
const char *cmdline_get_userdomain(void)
{
if (cmdline_auth_info.domain[0]) {
if (cmdline_auth_info.got_domain) {
return cmdline_auth_info.domain;
}

3
source4/lib/cmdline/popt_common.h
View File

@ -40,8 +40,9 @@ extern struct poptOption popt_common_credentials[];
struct cmdline_auth_info {
pstring username;
pstring password;
pstring domain;
BOOL got_domain;
pstring password;
BOOL got_pass;
BOOL use_kerberos;
};