diff options
| author | Jeremy Allison <jra@samba.org> | 2002-01-11 23:33:12 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2002-01-11 23:33:12 +0000 |
| commit | 1d40138232a22b78f088847d0d72d6ddec17a65e (patch) | |
| tree | 2512a77f1e2a7e7c3f937552d08bf81e3d002861 /source3 | |
| parent | b741f6b04c2b0da7963cf0778f20a8ad1e8dbf9e (diff) | |
| download | samba-1d40138232a22b78f088847d0d72d6ddec17a65e.tar.gz samba-1d40138232a22b78f088847d0d72d6ddec17a65e.tar.bz2 samba-1d40138232a22b78f088847d0d72d6ddec17a65e.zip | |
Round and round we go....
Jeremy.
(This used to be commit 2603ab3c6870f3697751b887e940910713f08985)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/lib/time.c | 3 | ||||
| -rw-r--r-- | source3/printing/nt_printing.c | 2 | ||||
| -rw-r--r-- | source3/rpc_server/srv_spoolss_nt.c | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/source3/lib/time.c b/source3/lib/time.c index 975c58c7a5..c39753403d 100644 --- a/source3/lib/time.c +++ b/source3/lib/time.c @@ -136,7 +136,8 @@ void TimeInit(void) done_serverzone_init = False; get_serverzone(); /* Save the start time of this process. */ - GetTimeOfDay(&start_time_hires); + if (start_time_hires.tv_sec == 0 && start_time_hires.tv_usec == 0) + GetTimeOfDay(&start_time_hires); } /********************************************************************** diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index 608ba9f21f..0f02266c0f 100644 --- a/source3/printing/nt_printing.c +++ b/source3/printing/nt_printing.c @@ -2655,7 +2655,7 @@ static uint32 rev_changeid(void) get_process_uptime(&tv); /* This value is in ms * 100 */ - return (tv.tv_sec * 100000) + (tv.tv_usec / 10); + return (((tv.tv_sec * 1000000) + tv.tv_usec)/100); } /* diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index 96f44c4b8b..adc9546530 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -6177,7 +6177,7 @@ WERROR _spoolss_setprinterdata( pipes_struct *p, SPOOL_Q_SETPRINTERDATA *q_u, SP convert_specific_param(¶m, value , type, data, real_len); - +#if 0 if (get_specific_param(*printer, 2, param->value, &old_param.data, &old_param.type, (uint32 *)&old_param.data_len)) { @@ -6191,6 +6191,7 @@ WERROR _spoolss_setprinterdata( pipes_struct *p, SPOOL_Q_SETPRINTERDATA *q_u, SP goto done; } } +#endif unlink_specific_param_if_exist(printer->info_2, param); |