[SCM] Samba Shared Repository - branch master updated - c4d5fe702d5ceed69168c7044d127b499814f0b7

[Günther Deschner]

The branch, master has been updated
       via  c4d5fe702d5ceed69168c7044d127b499814f0b7 (commit)
      from  65dc1eecebf664e26e87c70f9b5c8640d5535493 (commit)

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


- Log -----------------------------------------------------------------
commit c4d5fe702d5ceed69168c7044d127b499814f0b7
Author: Günther Deschner <gd at samba.org>
Date:   Wed Oct 15 17:32:58 2008 +0200

    s4: fix smbtorture build with merged wksvcs idl.
    
    Guenther

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

Summary of changes:
 source4/torture/rpc/wkssvc.c |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/torture/rpc/wkssvc.c b/source4/torture/rpc/wkssvc.c
index faab8b8..015f20f 100644
--- a/source4/torture/rpc/wkssvc.c
+++ b/source4/torture/rpc/wkssvc.c
@@ -1218,7 +1218,7 @@ static bool test_NetrJoinDomain2(struct torture_context *tctx,
 	}
 
 	switch (join_status) {
-		case NET_SETUP_DOMAIN_NAME::
+		case NET_SETUP_DOMAIN_NAME:
 			expected_err = WERR_SETUP_ALREADY_JOINED;
 			break;
 		case NET_SETUP_UNKNOWN_STATUS:
@@ -1271,7 +1271,7 @@ static bool test_NetrJoinDomain2(struct torture_context *tctx,
 		return false;
 	}
 
-	if (join_status != NetSetupDomainName) {
+	if (join_status != NET_SETUP_DOMAIN_NAME) {
 		torture_comment(tctx,
 				"Join verify failed: got %d\n", join_status);
 		return false;
@@ -1302,12 +1302,12 @@ static bool test_NetrUnjoinDomain2(struct torture_context *tctx,
 	}
 
 	switch (join_status) {
-		case NetSetupUnjoined:
+		case NET_SETUP_UNJOINED:
 			expected_err = WERR_SETUP_NOT_JOINED;
 			break;
-		case NetSetupDomainName:
-		case NetSetupUnknownStatus:
-		case NetSetupWorkgroupName:
+		case NET_SETUP_DOMAIN_NAME:
+		case NET_SETUP_UNKNOWN_STATUS:
+		case NET_SETUP_WORKGROUP_NAME:
 		default:
 			expected_err = WERR_OK;
 			break;
@@ -1350,11 +1350,11 @@ static bool test_NetrUnjoinDomain2(struct torture_context *tctx,
 	}
 
 	switch (join_status) {
-		case NetSetupUnjoined:
-		case NetSetupWorkgroupName:
+		case NET_SETUP_UNJOINED:
+		case NET_SETUP_WORKGROUP_NAME:
 			break;
-		case NetSetupUnknown:
-		case NetSetupDomainName:
+		case NET_SETUP_UNKNOWN_STATUS:
+		case NET_SETUP_DOMAIN_NAME:
 		default:
 			torture_comment(tctx,
 				"Unjoin verify failed: got %d\n", join_status);


-- 
Samba Shared Repository