[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

On Wed, Jun 01, 2011 at 11:48:02AM +0200, Rusty Russell wrote:
> The branch, master has been updated
>        via  e340cd8 lib/tevent/tevent.h: minor documentation fix.
>        via  c29069e libcli/cldap/cldap.c: don't hand huge values to tevent_timeval_add usecs
>        via  0204ae6 lib/util/time.c: timeval_current_ofs_usec
>        via  56e7233 lib/util/time.c: timeval_current_ofs_msec
>       from  9bd695c samba-tool: update tests for new 'user enable' syntax
> 
> http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
> 
> 
> - Log -----------------------------------------------------------------
> commit e340cd83f87a9ea02cacd9af520d154652c5afb1
> Author: Rusty Russell <rusty at rustcorp.com.au>
> Date:   Wed Jun 1 12:20:11 2011 +0930
> 
>     lib/tevent/tevent.h: minor documentation fix.
>     
>     The usecs arguments are (of course) microseconds, not milliseconds.
>     This was added by Andreas Schneider in 6c1bcdc2 (tevent: Document the
>     tevent helper functions.).
>     
>     Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
>     
>     Autobuild-User: Rusty Russell <rusty at rustcorp.com.au>
>     Autobuild-Date: Wed Jun  1 11:47:38 CEST 2011 on sn-devel-104
> 
> commit c29069e079018853867d643b8de604edd95c94d9
> Author: Rusty Russell <rusty at rustcorp.com.au>
> Date:   Wed Jun 1 12:20:08 2011 +0930
> 
>     libcli/cldap/cldap.c: don't hand huge values to tevent_timeval_add usecs
>     
>     state->request.delay is two million here, resulting in an invalid timeval.
>     Since tevent doesn't have a convenient wrapper to add arbitrary usecs,
>     do the arithmetic here (it's the sole caller of this function).
>     
>     Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
> 
> commit 0204ae6229bae3573b3194c3f657c8f385c0b940
> Author: Rusty Russell <rusty at rustcorp.com.au>
> Date:   Wed Jun 1 11:24:51 2011 +0930
> 
>     lib/util/time.c: timeval_current_ofs_usec
>     
>     Several places want "microseconds from current time", and several were
>     simply handing "usecs" values which could be over a million.
>     
>     Using a helper to do this is safer and more readable.
>     
>     I didn't replace any obviously correct callers (ie. constants).
>     
>     I also renamed wait_nsec in source3/lib/util_sock.c; it's actually
>     microseconds not nanoseconds (introduced with this code in Volker's
>     19b783cc Async wrapper for open_socket_out_send/recv).
>     
>     Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
> 
> commit 56e72337b01216dc7cba418f040a5cc928e5fc6f
> Author: Rusty Russell <rusty at rustcorp.com.au>
> Date:   Wed Jun 1 11:21:15 2011 +0930
> 
>     lib/util/time.c: timeval_current_ofs_msec
>     
>     Several places want "milliseconds from current time", and several were
>     simply doing "msec * 1000" which can (and does in one place) result in
>     a usec value over 1 a million.
>     
>     Using a helper to do this is safer and more readable.

Rusty, can you let me know if any of these are needed for correctness
fixes for 3.6.0 please ? This is getting urgent, as I'd like to get
any bugfixes in before rc2 (due June 7th).

Jeremy.