From: Jule Anger Date: Mon, 18 Jul 2022 09:33:12 +0000 (+0200) Subject: conn_tdb: change type of connections_data.start to NTTIME X-Git-Tag: samba-4.17.0rc1~31 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7585f8d201f347864514c73ecdf418dab7717310;p=thirdparty%2Fsamba.git conn_tdb: change type of connections_data.start to NTTIME connections_data.start previously had the type time_t, but time_t only had a precision for seconds. NTTIME has a higer precision, which is useful for debugging. Signed-off-by: Jule Anger Reviewed-by: Ralph Boehme --- diff --git a/source3/utils/conn_tdb.c b/source3/utils/conn_tdb.c index 1effc24665b..3724bd42493 100644 --- a/source3/utils/conn_tdb.c +++ b/source3/utils/conn_tdb.c @@ -128,7 +128,7 @@ static int traverse_tcon_fn(struct smbXsrv_tcon_global0 *global, data.gid = sess.gid; fstrcpy(data.addr, sess.addr); fstrcpy(data.machine, sess.machine); - data.start = nt_time_to_unix(global->creation_time); + data.start = global->creation_time; data.encryption_flags = global->encryption_flags; data.cipher = sess.cipher; data.dialect = sess.dialect; diff --git a/source3/utils/conn_tdb.h b/source3/utils/conn_tdb.h index 7af7fa622f4..cbcf11d960a 100644 --- a/source3/utils/conn_tdb.h +++ b/source3/utils/conn_tdb.h @@ -28,7 +28,7 @@ struct connections_data { fstring servicename; fstring addr; fstring machine; - time_t start; + NTTIME start; uint8_t encryption_flags; uint16_t cipher; uint16_t dialect; diff --git a/source3/utils/net_status.c b/source3/utils/net_status.c index cb3f746f64e..a22b45cc490 100644 --- a/source3/utils/net_status.c +++ b/source3/utils/net_status.c @@ -108,7 +108,7 @@ static int show_share(const struct connections_data *crec, d_printf("%-10.10s %s %-12s %s", crec->servicename, server_id_str_buf(crec->pid, &tmp), crec->machine, - time_to_asc(crec->start)); + time_to_asc(nt_time_to_unix(crec->start))); return 0; } @@ -166,7 +166,7 @@ static int show_share_parseable(const struct connections_data *crec, guest ? "" : gidtoname(ids->entries[i].gid), crec->machine, guest ? "" : ids->entries[i].hostname, - time_to_asc(crec->start)); + time_to_asc(nt_time_to_unix(crec->start))); return 0; } diff --git a/source3/utils/status.c b/source3/utils/status.c index 81b4a11ae5c..e428110fb12 100644 --- a/source3/utils/status.c +++ b/source3/utils/status.c @@ -475,7 +475,7 @@ static int traverse_connections(const struct connections_data *crec, return 0; } - timestr = timestring(tmp_ctx, crec->start); + timestr = timestring(tmp_ctx, nt_time_to_unix(crec->start)); if (timestr == NULL) { TALLOC_FREE(tmp_ctx); return -1;