Round and round we go....

Jeremy.
(This used to be commit 2603ab3c6870f3697751b887e940910713f08985)

diff --git a/source3/lib/time.c b/source3/lib/time.c
index 975c58c7a596ac54b6069621ea2f2b26e44d0de9..c39753403d707dc9d1a7614bce35a24931323941 100644 (file)
--- 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. */
        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 608ba9f21ff43eb61c49849555e4b6138f3d1731..0f02266c0fe8acaae5bb1d4f4d53621c5c2d8ffc 100644 (file)
--- 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 */
 
        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 96f44c4b8b4229cc886f8b1fc1d73b0f58b998b1..adc954653058339b60857b75b10317243390a035 100644 (file)
--- 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(&param, value , type, data, real_len);
 
 
        convert_specific_param(&param, 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)) {
 
        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;
                }
        }
                        goto done;
                }
        }

+#endif

 
        unlink_specific_param_if_exist(printer->info_2, param);
        
 
        unlink_specific_param_if_exist(printer->info_2, param);