summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2008-06-16 13:36:53 +0200
committerGünther Deschner <gd@samba.org>2008-06-23 23:38:52 +0200
commit33000d77e4b904cf9cdfd3e3d83a3c3cc84d7f2b (patch)
tree08fd168b523f2475db59e7e5020831abe572a3a9 /source3
parente5ac03b0ae22855f7131ba886ef829b7fe44e949 (diff)
downloadsamba-33000d77e4b904cf9cdfd3e3d83a3c3cc84d7f2b.tar.gz
samba-33000d77e4b904cf9cdfd3e3d83a3c3cc84d7f2b.tar.bz2
samba-33000d77e4b904cf9cdfd3e3d83a3c3cc84d7f2b.zip
time: move uint64s_nt_time_to_unix_abs() to lib/time.c
Guenther (This used to be commit 58f54f180f0a942776455ab6e813628422493dac)
Diffstat (limited to 'source3')
-rw-r--r--source3/include/proto.h1
-rw-r--r--source3/lib/time.c7
-rw-r--r--source3/utils/net_rpc_samsync.c7
3 files changed, 8 insertions, 7 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 1d30a9a186..68e3926342 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1234,6 +1234,7 @@ bool nt_time_equals(const NTTIME *nt1, const NTTIME *nt2);
void TimeInit(void);
void get_process_uptime(struct timeval *ret_time);
time_t nt_time_to_unix_abs(const NTTIME *nt);
+time_t uint64s_nt_time_to_unix_abs(const uint64_t *src);
void unix_timespec_to_nt_time(NTTIME *nt, struct timespec ts);
void unix_to_nt_time_abs(NTTIME *nt, time_t t);
bool null_mtime(time_t mtime);
diff --git a/source3/lib/time.c b/source3/lib/time.c
index 17990b9269..9db88b3fc8 100644
--- a/source3/lib/time.c
+++ b/source3/lib/time.c
@@ -1325,6 +1325,13 @@ time_t nt_time_to_unix_abs(const NTTIME *nt)
return (time_t)d;
}
+time_t uint64s_nt_time_to_unix_abs(const uint64_t *src)
+{
+ NTTIME nttime;
+ nttime = *src;
+ return nt_time_to_unix_abs(&nttime);
+}
+
/****************************************************************************
Put a 8 byte filetime from a struct timespec. Uses GMT.
****************************************************************************/
diff --git a/source3/utils/net_rpc_samsync.c b/source3/utils/net_rpc_samsync.c
index 5161bb3ef5..d945be76f1 100644
--- a/source3/utils/net_rpc_samsync.c
+++ b/source3/utils/net_rpc_samsync.c
@@ -84,13 +84,6 @@ static void display_account_info(uint32_t rid,
pdb_encode_acct_ctrl(r->acct_flags, NEW_PW_FORMAT_SPACE_PADDED_LEN));
}
-static time_t uint64s_nt_time_to_unix_abs(const uint64 *src)
-{
- NTTIME nttime;
- nttime = *src;
- return nt_time_to_unix_abs(&nttime);
-}
-
static NTSTATUS pull_netr_AcctLockStr(TALLOC_CTX *mem_ctx,
struct lsa_BinaryString *r,
struct netr_AcctLockStr **str_p)