[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1115-g50f362e

[Karolin Seeger]

The branch, v3-4-test has been updated
       via  50f362e294d5a507d03fd54d1d976f40a935288f (commit)
       via  2e14ccc5c6be9dd7e7b98dc60c89d54ba3772344 (commit)
      from  747068ff4688000287ace009f3dc58e12eefa615 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit 50f362e294d5a507d03fd54d1d976f40a935288f
Author: Björn Jacke <bj at sernet.de>
Date:   Wed Jun 3 17:39:50 2009 +0200

    s3:torture: fix password timestamp checks on NetBSD
    
    The Open Group says:
    
    "The useconds argument [of usleep] must be less than 1,000,000."
    
    NetBSD takes this seriously. usleep of more than 999999 are effectless.
    (cherry picked from commit b3491df2f9db2c550845243975ddbf0a2f9658e6)

commit 2e14ccc5c6be9dd7e7b98dc60c89d54ba3772344
Author: Björn Jacke <bj at sernet.de>
Date:   Wed Jun 3 18:03:36 2009 +0200

    s3: correct check for usleep value boundaries
    (cherry picked from commit 7cdad30b9640cc876e8ca59cd67455039107a5df)

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

Summary of changes:
 source3/lib/system.c       |    2 +-
 source4/torture/rpc/samr.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/system.c b/source3/lib/system.c
index 10b55f6..e815766 100644
--- a/source3/lib/system.c
+++ b/source3/lib/system.c
@@ -94,7 +94,7 @@ int sys_usleep(long usecs)
 	 * is not SPEC1170 complient... grumble... JRA.
 	 */
 
-	if(usecs < 0 || usecs > 1000000) {
+	if(usecs < 0 || usecs > 999999) {
 		errno = EINVAL;
 		return -1;
 	}
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index c8177d7..d7d6773 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -2910,7 +2910,7 @@ static bool test_SetPassword_pwdlastset(struct dcerpc_pipe *p,
 	struct dcerpc_pipe *np = NULL;
 
 	if (torture_setting_bool(tctx, "samba3", false)) {
-		delay = 1000000;
+		delay = 999999;
 		printf("Samba3 has second granularity, setting delay to: %d\n",
 			delay);
 	}


-- 
Samba Shared Repository