[SCM] Samba Shared Repository - branch master updated

Björn Jacke bjacke at samba.org
Tue Aug 31 03:34:05 MDT 2010


The branch, master has been updated
       via  7c88ccd replace/waf: add rt to deps at this place
       via  f222387 s4: use GetTimeOfDay macro instead of gettimeofday
      from  7eff519 packaging: build fixes

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 7c88ccde30b824e14183f7fd07f0c307c7ff693d
Author: Björn Jacke <bj at sernet.de>
Date:   Tue Aug 31 11:31:19 2010 +0200

    replace/waf: add rt to deps at this place

commit f222387533645689b8529235d5e6c77418064f9e
Author: Björn Jacke <bj at sernet.de>
Date:   Tue Aug 31 11:30:17 2010 +0200

    s4: use GetTimeOfDay macro instead of gettimeofday

-----------------------------------------------------------------------

Summary of changes:
 lib/replace/wscript              |    2 +-
 source4/torture/libnet/userman.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/wscript b/lib/replace/wscript
index 8c1c57f..35e376a 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -364,7 +364,7 @@ def build(bld):
 					  # libraries are loaded, but this doesn't appear to work 
 					  # at the moment:
 					  # hide_symbols=bld.BUILTIN_LIBRARY('replace'),
-                      deps='crypt dl nsl socket')
+                      deps='crypt dl nsl socket rt')
 
     TEST_SOURCES = '''test/testsuite.c test/main.c test/strptime.c
                       test/os2_delete.c test/getifaddrs.c'''
diff --git a/source4/torture/libnet/userman.c b/source4/torture/libnet/userman.c
index 13fc98d..ad4fa92 100644
--- a/source4/torture/libnet/userman.c
+++ b/source4/torture/libnet/userman.c
@@ -115,7 +115,7 @@ static bool test_usermod(struct torture_context *tctx, struct dcerpc_pipe *p,
 
 		testfld = (random() % USER_FIELD_LAST) + 1;
 
-		gettimeofday(&now, NULL);
+		GetTimeOfDay(&now);
 
 		switch (testfld) {
 		case acct_name:


-- 
Samba Shared Repository


More information about the samba-cvs mailing list