summaryrefslogtreecommitdiff
path: root/source3/auth
diff options
context:
space:
mode:
authorJames Peach <jpeach@samba.org>2007-12-13 20:56:53 -0800
committerJames Peach <jpeach@samba.org>2007-12-13 20:56:53 -0800
commit7b457645fb40d7195d75f8e38883b140abcb1955 (patch)
tree90c3ca21cd40c98ed4c7c1580b75216f689fad97 /source3/auth
parent12ac4c3119b3b7712e670d95d61413d97ecafaef (diff)
parent138333ed1f571cd6bb76c3be655f70e35cd48a99 (diff)
downloadsamba-7b457645fb40d7195d75f8e38883b140abcb1955.tar.gz
samba-7b457645fb40d7195d75f8e38883b140abcb1955.tar.bz2
samba-7b457645fb40d7195d75f8e38883b140abcb1955.zip
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
(This used to be commit 0de2b3eb515f2da21ffd1ce54979bb1f8063024b)
Diffstat (limited to 'source3/auth')
-rw-r--r--source3/auth/auth_domain.c7
-rw-r--r--source3/auth/token_util.c2
2 files changed, 6 insertions, 3 deletions
diff --git a/source3/auth/auth_domain.c b/source3/auth/auth_domain.c
index 7cddabbbbd..b2c87174fd 100644
--- a/source3/auth/auth_domain.c
+++ b/source3/auth/auth_domain.c
@@ -127,8 +127,11 @@ machine %s. Error was : %s.\n", dc_name, nt_errstr(result)));
uint32 neg_flags = NETLOGON_NEG_AUTH2_FLAGS;
uint32 sec_chan_type = 0;
unsigned char machine_pwd[16];
+ const char *account_name;
- if (!get_trust_pw(domain, machine_pwd, &sec_chan_type)) {
+ if (!get_trust_pw_hash(domain, machine_pwd, &account_name,
+ &sec_chan_type))
+ {
DEBUG(0, ("connect_to_domain_password_server: could not fetch "
"trust account password for domain '%s'\n",
domain));
@@ -142,7 +145,7 @@ machine %s. Error was : %s.\n", dc_name, nt_errstr(result)));
dc_name, /* server name */
domain, /* domain */
global_myname(), /* client name */
- global_myname(), /* machine account name */
+ account_name, /* machine account name */
machine_pwd,
sec_chan_type,
&neg_flags);
diff --git a/source3/auth/token_util.c b/source3/auth/token_util.c
index 63672bcf74..330acde6e4 100644
--- a/source3/auth/token_util.c
+++ b/source3/auth/token_util.c
@@ -85,7 +85,7 @@ NT_USER_TOKEN *get_root_nt_token( void )
return token;
if ( !(pw = sys_getpwnam( "root" )) ) {
- DEBUG(0,("get_root_nt_token: getpwnam\"root\") failed!\n"));
+ DEBUG(0,("get_root_nt_token: getpwnam(\"root\") failed!\n"));
return NULL;
}