Merge branch 'master' of ssh://git.samba.org/data/git/samba into regsrv

Conflicts:
	source4/lib/registry/ldb.c
	source4/rpc_server/winreg/rpc_winreg.c

1 files changed, 14 insertions, 14 deletions

diff --git a/source4/torture/rpc/wkssvc.c b/source4/torture/rpc/wkssvc.c
index b212a44b33..015f20f6e2 100644
--- a/source4/torture/rpc/wkssvc.c
+++ b/source4/torture/rpc/wkssvc.c
@@ -25,7 +25,7 @@
 #include "torture/rpc/rpc.h"
 #include "lib/cmdline/popt_common.h"
 #include "param/param.h"
-#include "lib/crypto/crypto.h"
+#include "../lib/crypto/crypto.h"
 #include "libcli/auth/libcli_auth.h"
 
 #define SMBTORTURE_MACHINE_NAME "smbtrt_name"
@@ -1218,12 +1218,12 @@ static bool test_NetrJoinDomain2(struct torture_context *tctx,
 	}
 
 	switch (join_status) {
-		case NetSetupDomainName:
+		case NET_SETUP_DOMAIN_NAME:
 			expected_err = WERR_SETUP_ALREADY_JOINED;
 			break;
-		case NetSetupUnknownStatus:
-		case NetSetupUnjoined:
-		case NetSetupWorkgroupName:
+		case NET_SETUP_UNKNOWN_STATUS:
+		case NET_SETUP_UNJOINED:
+		case NET_SETUP_WORKGROUP_NAME:
 		default:
 			expected_err = WERR_OK;
 			break;
@@ -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);