[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  e40310a... testprogs: ignore GetJob level 3 and 4 against samba for now.
      from  76aa37f... librpc/ndr: don't overwrite the content in ndr_push_relative_ptr2_end()

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


- Log -----------------------------------------------------------------
commit e40310a64bb8fccefeca720948130b9d23490ec6
Author: Günther Deschner <gd at samba.org>
Date:   Fri Feb 19 10:11:19 2010 +0100

    testprogs: ignore GetJob level 3 and 4 against samba for now.
    
    Guenther

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

Summary of changes:
 testprogs/win32/spoolss/error.c   |    2 ++
 testprogs/win32/spoolss/spoolss.c |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/testprogs/win32/spoolss/error.c b/testprogs/win32/spoolss/error.c
index 8ccc542..2665856 100644
--- a/testprogs/win32/spoolss/error.c
+++ b/testprogs/win32/spoolss/error.c
@@ -113,6 +113,8 @@ const char *errstr(DWORD error)
 #endif
 	case ERROR_CANCELLED:
 		return "ERROR_CANCELLED";
+	case ERROR_NOACCESS:
+		return "ERROR_NOACCESS";
 	case RPC_S_PROCNUM_OUT_OF_RANGE:
 		return "RPC_S_PROCNUM_OUT_OF_RANGE";
 	case RPC_S_SERVER_UNAVAILABLE:
diff --git a/testprogs/win32/spoolss/spoolss.c b/testprogs/win32/spoolss/spoolss.c
index 1a8516b..c9a7bc0 100644
--- a/testprogs/win32/spoolss/spoolss.c
+++ b/testprogs/win32/spoolss/spoolss.c
@@ -877,7 +877,7 @@ static BOOL test_GetJob(struct torture_context *tctx,
 
 		torture_comment(tctx, "Testing GetJob(%d) level %d", job_id, levels[i]);
 
-		if (tctx->samba3 && levels[i] == 4) {
+		if (tctx->samba3 && (levels[i] == 4) || (levels[i] == 3)) {
 			torture_comment(tctx, "skipping level %d getjob against samba\n", levels[i]);
 			continue;
 		}


-- 
Samba Shared Repository