summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2001-09-14 04:37:49 +0000
committerTim Potter <tpot@samba.org>2001-09-14 04:37:49 +0000
commitb03154420774033dbd82d0447282889e23c6b559 (patch)
tree4079092a7e27e12105e078b27e11457308195252
parent504eff41b3a357bd500c2faa2a3385584e4949d4 (diff)
downloadsamba-b03154420774033dbd82d0447282889e23c6b559.tar.gz
samba-b03154420774033dbd82d0447282889e23c6b559.tar.bz2
samba-b03154420774033dbd82d0447282889e23c6b559.zip
Produce correct lanman and nt hashes in samsync smbpasswd output. The
output from samsync -p produces the same output as running PWDUMP.EXE on the domain controller except it happens via the sam synchronisation protocol. (This used to be commit 5da98620021cda92d4752e7388f0e0cdfcd0e8cd)
-rw-r--r--source3/rpcclient/samsync.c29
1 files changed, 24 insertions, 5 deletions
diff --git a/source3/rpcclient/samsync.c b/source3/rpcclient/samsync.c
index d85fb7a308..50177ce552 100644
--- a/source3/rpcclient/samsync.c
+++ b/source3/rpcclient/samsync.c
@@ -69,19 +69,38 @@ static NTSTATUS sam_sync(struct cli_state *cli, unsigned char trust_passwd[16],
int i;
for (i = 0; i < num_deltas; i++) {
- fstring acct_name;
+ SAM_ACCOUNT_INFO *acct;
+ fstring acct_name, hex_nt_passwd, hex_lm_passwd;
+ uchar lm_passwd[16], nt_passwd[16];
/* Skip non-user accounts */
if (hdr_deltas[i].type != SAM_DELTA_ACCOUNT_INFO)
continue;
- unistr2_to_ascii(acct_name,
- &deltas[i].account_info.uni_acct_name,
+ acct = &deltas[i].account_info;
+
+ unistr2_to_ascii(acct_name, &acct->uni_acct_name,
sizeof(acct_name) - 1);
- printf("%s:-1:%s:%s:%s:LCT-0\n", acct_name,
- "nt", "lm",
+ /* Decode hashes from password hash */
+
+ sam_pwd_hash(acct->user_rid, acct->pass.buf_lm_pwd,
+ lm_passwd, 0);
+ sam_pwd_hash(acct->user_rid, acct->pass.buf_nt_pwd,
+ nt_passwd, 0);
+
+ /* Encode as strings */
+
+ smbpasswd_sethexpwd(hex_lm_passwd, lm_passwd,
+ acct->acb_info);
+ smbpasswd_sethexpwd(hex_nt_passwd, nt_passwd,
+ acct->acb_info);
+
+ /* Display user info */
+
+ printf("%s:%d:%s:%s:%s:LCT-0\n", acct_name,
+ acct->user_rid, hex_lm_passwd, hex_nt_passwd,
smbpasswd_encode_acb_info(
deltas[i].account_info.acb_info));
}