s4-torture: use names for r.in.logon_level of netlogon samlogon requests.

Guenther

Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

6 files changed, 10 insertions, 10 deletions

diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index 9340dde791..25b3b743b8 100644
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -835,7 +835,7 @@ static bool test_netlogon_ops_args(struct dcerpc_pipe *p, struct torture_context
 	r.in.computer_name = cli_credentials_get_workstation(credentials);
 	r.in.credential = &auth;
 	r.in.return_authenticator = &auth2;
-	r.in.logon_level = 2;
+	r.in.logon_level = NetlogonNetworkInformation;
 	r.in.logon = &logon;
 	r.out.validation = &validation;
 	r.out.authoritative = &authoritative;
@@ -941,7 +941,7 @@ static bool test_netlogon_ops_args(struct dcerpc_pipe *p, struct torture_context
 					 "LogonSamLogon invalid  *r.out.authoritative");
 	}
 
-	r.in.logon_level = 2;
+	r.in.logon_level = NetlogonNetworkInformation;
 	r.in.credential = &auth;
 
 	for (i=2;i<=3;i++) {
diff --git a/source4/torture/rpc/remote_pac.c b/source4/torture/rpc/remote_pac.c
index 3f7afc37e6..6b0c044a01 100644
--- a/source4/torture/rpc/remote_pac.c
+++ b/source4/torture/rpc/remote_pac.c
@@ -663,7 +663,7 @@ static bool test_S2U4Self(struct torture_context *tctx,
 	r.in.computer_name = cli_credentials_get_workstation(credentials);
 	r.in.credential = &auth;
 	r.in.return_authenticator = &auth2;
-	r.in.logon_level = 2;
+	r.in.logon_level = NetlogonNetworkInformation;
 	r.in.logon = &logon;
 	r.out.validation = &validation;
 	r.out.authoritative = &authoritative;
diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c
index f7968b1c56..d8d90ce9f6 100644
--- a/source4/torture/rpc/samba3rpc.c
+++ b/source4/torture/rpc/samba3rpc.c
@@ -1163,7 +1163,7 @@ static bool schan(struct torture_context *tctx,
 			cli_credentials_get_workstation(wks_creds);
 		r.in.credential = &netr_auth;
 		r.in.return_authenticator = &netr_auth2;
-		r.in.logon_level = 2;
+		r.in.logon_level = NetlogonNetworkInformation;
 		r.in.validation_level = i;
 		r.in.logon = &logon;
 		r.out.validation = &validation;
@@ -1203,7 +1203,7 @@ static bool schan(struct torture_context *tctx,
 
 		logon.password = &pinfo;
 
-		r.in.logon_level = 1;
+		r.in.logon_level = NetlogonInteractiveInformation;
 		r.in.logon = &logon;
 		r.out.return_authenticator = &return_authenticator;
 
diff --git a/source4/torture/rpc/samlogon.c b/source4/torture/rpc/samlogon.c
index 640bd6a6e3..8d13a6350e 100644
--- a/source4/torture/rpc/samlogon.c
+++ b/source4/torture/rpc/samlogon.c
@@ -1344,7 +1344,7 @@ static bool test_SamLogon(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	int i, v, l, f;
 	bool ret = true;
 	int validation_levels[] = {2,3,6};
-	int logon_levels[] = { 2, 6 };
+	int logon_levels[] = { NetlogonNetworkInformation, NetlogonNetworkTransitiveInformation };
 	int function_levels[] = {
 		NDR_NETR_LOGONSAMLOGON,
 		NDR_NETR_LOGONSAMLOGONEX,
@@ -1484,7 +1484,7 @@ bool test_InteractiveLogon(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	r.in.computer_name = TEST_MACHINE_NAME;
 	r.in.credential = &a;
 	r.in.return_authenticator = &ra;
-	r.in.logon_level = 5;
+	r.in.logon_level = NetlogonInteractiveTransitiveInformation;
 	r.in.logon = &logon;
 	r.in.validation_level = 6;
 	r.in.flags = &flags;
diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c
index b92eb21985..7249705bf7 100644
--- a/source4/torture/rpc/samsync.c
+++ b/source4/torture/rpc/samsync.c
@@ -95,7 +95,7 @@ static NTSTATUS test_SamLogon(struct torture_context *tctx,
 	r.in.computer_name = workstation;
 	r.in.credential = &auth;
 	r.in.return_authenticator = &auth2;
-	r.in.logon_level = 2;
+	r.in.logon_level = NetlogonNetworkInformation;
 	r.in.logon = &logon;
 	r.out.validation = &validation;
 	r.out.authoritative = &authoritative;
diff --git a/source4/torture/rpc/schannel.c b/source4/torture/rpc/schannel.c
index 8a11a20762..7e3e6aad64 100644
--- a/source4/torture/rpc/schannel.c
+++ b/source4/torture/rpc/schannel.c
@@ -102,7 +102,7 @@ bool test_netlogon_ex_ops(struct dcerpc_pipe *p, struct torture_context *tctx,
 
 	r.in.server_name = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
 	r.in.computer_name = cli_credentials_get_workstation(credentials);
-	r.in.logon_level = 2;
+	r.in.logon_level = NetlogonNetworkInformation;
 	r.in.logon= &logon;
 	r.in.flags = &_flags;
 	r.out.validation = &validation;
@@ -656,7 +656,7 @@ static bool torture_schannel_bench_start(struct torture_schannel_bench_conn *con
 
 	conn->r.in.server_name = talloc_asprintf(conn->tmp, "\\\\%s", dcerpc_server_name(conn->pipe));
 	conn->r.in.computer_name = cli_credentials_get_workstation(conn->wks_creds);
-	conn->r.in.logon_level = 2;
+	conn->r.in.logon_level = NetlogonNetworkInformation;
 	conn->r.in.logon = talloc(conn->tmp, union netr_LogonLevel);
 	conn->r.in.logon->network = &conn->ninfo;
 	conn->r.in.flags = talloc(conn->tmp, uint32_t);