From 56b20b83971f94b0692f7e6685b352a76f14ef38 Mon Sep 17 00:00:00 2001 From: Derrell Lipman Date: Sun, 25 Dec 2005 02:00:21 +0000 Subject: r12466: r12028@cabra: derrell | 2005-12-24 20:25:38 -0500 parse dates correctly. w_time and m_time were reversed. (This used to be commit 481abfbab40209e087c82eadc15c3697eae0ae5b) --- source3/libsmb/clirap.c | 10 +++++----- source3/libsmb/libsmbclient.c | 6 ++++-- 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'source3/libsmb') diff --git a/source3/libsmb/clirap.c b/source3/libsmb/clirap.c index 172dea4090..6716971fe2 100644 --- a/source3/libsmb/clirap.c +++ b/source3/libsmb/clirap.c @@ -592,18 +592,18 @@ BOOL cli_qpathinfo2(struct cli_state *cli, const char *fname, if (!rdata || data_len < 22) { return False; } - + if (c_time) { *c_time = interpret_long_date(rdata+0); } if (a_time) { *a_time = interpret_long_date(rdata+8); } - if (m_time) { - *m_time = interpret_long_date(rdata+16); - } if (w_time) { - *w_time = interpret_long_date(rdata+24); + *w_time = interpret_long_date(rdata+16); + } + if (m_time) { + *m_time = interpret_long_date(rdata+24); } if (mode) { *mode = SVAL(rdata, 32); diff --git a/source3/libsmb/libsmbclient.c b/source3/libsmb/libsmbclient.c index 15210664b0..623977b39e 100644 --- a/source3/libsmb/libsmbclient.c +++ b/source3/libsmb/libsmbclient.c @@ -1380,8 +1380,10 @@ static BOOL smbc_getatr(SMBCCTX * context, SMBCSRV *srv, char *path, } if (!srv->no_pathinfo2 && - cli_qpathinfo2(targetcli, targetpath, c_time, a_time, m_time, NULL, - size, mode, ino)) return True; + cli_qpathinfo2(targetcli, targetpath, + c_time, a_time, m_time, NULL, size, mode, ino)) { + return True; + } /* if this is NT then don't bother with the getatr */ if (targetcli->capabilities & CAP_NT_SMBS) { -- cgit