git.samba.org
/
metze
/
samba
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b6ea2ec
)
s3 wbinfo: Don't use global_myname()
author
Kai Blin
<kai@samba.org>
Wed, 12 Aug 2009 15:24:19 +0000
(17:24 +0200)
committer
Kai Blin
<kai@samba.org>
Tue, 18 Aug 2009 17:53:39 +0000
(19:53 +0200)
nsswitch/wbinfo.c
patch
|
blob
|
history
diff --git
a/nsswitch/wbinfo.c
b/nsswitch/wbinfo.c
index 3cd5a29e60adbbae36a81bd869e0214b10a992c5..2cad3977fbe63d7fd77d554f18a01421a9dd339d 100644
(file)
--- a/
nsswitch/wbinfo.c
+++ b/
nsswitch/wbinfo.c
@@
-87,6
+87,20
@@
static const char *get_winbind_domain(void)
return details->netbios_domain;
}
return details->netbios_domain;
}
+static const char *get_winbind_netbios_name(void)
+{
+ static struct wbcInterfaceDetails *details;
+
+ details = init_interface_details();
+
+ if (!details) {
+ d_fprintf(stderr, "could not obtain winbind netbios name!\n");
+ return 0;
+ }
+
+ return details->netbios_name;
+}
+
/* Copy of parse_domain_user from winbindd_util.c. Parse a string of the
form DOMAIN/user into a domain and a user */
/* Copy of parse_domain_user from winbindd_util.c. Parse a string of the
form DOMAIN/user into a domain and a user */
@@
-1389,8
+1403,9
@@
static bool wbinfo_auth_crap(char *username, bool use_ntlmv2, bool use_lanman)
server_chal = data_blob(params.password.response.challenge, 8);
/* Pretend this is a login to 'us', for blob purposes */
server_chal = data_blob(params.password.response.challenge, 8);
/* Pretend this is a login to 'us', for blob purposes */
- names_blob = NTLMv2_generate_names_blob(NULL, global_myname(),
- get_winbind_domain());
+ names_blob = NTLMv2_generate_names_blob(NULL,
+ get_winbind_netbios_name(),
+ get_winbind_domain());
if (!SMBNTLMv2encrypt(NULL, name_user, name_domain, pass,
&server_chal,
if (!SMBNTLMv2encrypt(NULL, name_user, name_domain, pass,
&server_chal,