Fix samlogon rpc client & server.

Guenther

diff --git a/source/rpc_client/cli_netlogon.c b/source/rpc_client/cli_netlogon.c
index 4cd55dc5aac80325799c568b165a16f62f38877c..ec16186462b862873fae497d0151a662148d94df 100644 (file)
--- a/source/rpc_client/cli_netlogon.c
+++ b/source/rpc_client/cli_netlogon.c
@@ -226,7 +226,7 @@ NTSTATUS rpccli_netlogon_sam_logon(struct rpc_pipe_client *cli,
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
        struct netr_Authenticator clnt_creds;
        struct netr_Authenticator ret_creds;
-       union netr_LogonLevel *logon;
+       union netr_LogonInfo *logon;
        union netr_Validation validation;
        uint8_t authoritative;
        int validation_level = 3;
@@ -236,7 +236,7 @@ NTSTATUS rpccli_netlogon_sam_logon(struct rpc_pipe_client *cli,
        ZERO_STRUCT(ret_creds);
        ZERO_STRUCT(zeros);
 
-       logon = TALLOC_ZERO_P(mem_ctx, union netr_LogonLevel);
+       logon = TALLOC_ZERO_P(mem_ctx, union netr_LogonInfo);
        if (!logon) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -407,7 +407,7 @@ NTSTATUS rpccli_netlogon_sam_network_logon(struct rpc_pipe_client *cli,
        uint8 zeros[16];
        struct netr_Authenticator clnt_creds;
        struct netr_Authenticator ret_creds;
-       union netr_LogonLevel *logon = NULL;
+       union netr_LogonInfo *logon = NULL;
        struct netr_NetworkInfo *network_info;
        uint8_t authoritative;
        union netr_Validation validation;
@@ -424,7 +424,7 @@ NTSTATUS rpccli_netlogon_sam_network_logon(struct rpc_pipe_client *cli,
        ZERO_STRUCT(lm);
        ZERO_STRUCT(nt);
 
-       logon = TALLOC_ZERO_P(mem_ctx, union netr_LogonLevel);
+       logon = TALLOC_ZERO_P(mem_ctx, union netr_LogonInfo);
        if (!logon) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -530,7 +530,7 @@ NTSTATUS rpccli_netlogon_sam_network_logon_ex(struct rpc_pipe_client *cli,
        const char *workstation_name_slash;
        const char *server_name_slash;
        uint8 zeros[16];
-       union netr_LogonLevel *logon = NULL;
+       union netr_LogonInfo *logon = NULL;
        struct netr_NetworkInfo *network_info;
        uint8_t authoritative;
        union netr_Validation validation;
@@ -547,7 +547,7 @@ NTSTATUS rpccli_netlogon_sam_network_logon_ex(struct rpc_pipe_client *cli,
        ZERO_STRUCT(lm);
        ZERO_STRUCT(nt);
 
-       logon = TALLOC_ZERO_P(mem_ctx, union netr_LogonLevel);
+       logon = TALLOC_ZERO_P(mem_ctx, union netr_LogonInfo);
        if (!logon) {
                return NT_STATUS_NO_MEMORY;
        }

diff --git a/source/rpc_server/srv_netlog_nt.c b/source/rpc_server/srv_netlog_nt.c
index f4967dc548a3b243daf002dcadb1d9f002ca5b68..4664e8d1ba3bd51b98c998d8580c27db58b389fe 100644 (file)
--- a/source/rpc_server/srv_netlog_nt.c
+++ b/source/rpc_server/srv_netlog_nt.c
@@ -786,7 +786,7 @@ NTSTATUS _netr_LogonSamLogon(pipes_struct *p,
 {
        NTSTATUS status = NT_STATUS_OK;
        struct netr_SamInfo3 *sam3 = NULL;
-       union netr_LogonLevel *logon = r->in.logon;
+       union netr_LogonInfo *logon = r->in.logon;
        fstring nt_username, nt_domain, nt_workstation;
        auth_usersupplied_info *user_info = NULL;
        auth_serversupplied_info *server_info = NULL;