Removed nt_error field from cli_state as it was not used anywhere.

(This used to be commit 589aaa5fb1ac55d8b0d5ae95921f071eb6ddacf6)

diff --git a/source3/include/client.h b/source3/include/client.h
index ecd97c143300e8a4d5f325fc3eab1d037378036f..61a5633b981390923d5cd01bcd169e85af03df8b 100644 (file)
--- a/source3/include/client.h
+++ b/source3/include/client.h
@@ -114,7 +114,6 @@ struct cli_state {
         * Only used in NT domain calls.
         */
 
-       uint32 nt_error;                   /* NT RPC error code. */
        uint16 nt_pipe_fnum;               /* Pipe handle. */
        unsigned char sess_key[16];        /* Current session key. */
        unsigned char ntlmssp_hash[258];   /* ntlmssp data. */

diff --git a/source3/rpc_client/cli_netlogon.c b/source3/rpc_client/cli_netlogon.c
index 5b96c8300f66fced2f33573f428b125b466724a6..0568c04ed84ba7129c9b9345d52b51d186c3bcf0 100644 (file)
--- a/source3/rpc_client/cli_netlogon.c
+++ b/source3/rpc_client/cli_netlogon.c
@@ -158,7 +158,6 @@ BOOL cli_net_auth2(struct cli_state *cli, uint16 sec_chan,
     {
       /* report error code */
       DEBUG(0,("cli_net_auth2: Error %s\n", get_nt_error_msg(r_a.status)));
-      cli->nt_error = r_a.status;
       ok = False;
     }
 
@@ -248,7 +247,6 @@ BOOL cli_net_req_chal(struct cli_state *cli, DOM_CHAL *clnt_chal, DOM_CHAL *srv_
     {
       /* report error code */
       DEBUG(0,("cli_net_req_chal: Error %s\n", get_nt_error_msg(r_c.status)));
-      cli->nt_error = r_c.status;
       ok = False;
     }
 
@@ -314,7 +312,6 @@ BOOL cli_net_srv_pwset(struct cli_state *cli, uint8 hashed_mach_pwd[16])
     {
       /* report error code */
       DEBUG(0,("cli_net_srv_pwset: %s\n", get_nt_error_msg(r_s.status)));
-      cli->nt_error = r_s.status;
       ok = False;
     }
 
@@ -350,7 +347,7 @@ static uint32 cli_net_sam_logon_internal(struct cli_state *cli, NET_ID_INFO_CTR
        prs_struct buf; 
        NET_Q_SAM_LOGON q_s;
        NET_R_SAM_LOGON r_s;
-       uint32 retval;
+       uint32 retval = 0;
 
        gen_next_creds( cli, &new_clnt_cred);
 
@@ -383,7 +380,6 @@ static uint32 cli_net_sam_logon_internal(struct cli_state *cli, NET_ID_INFO_CTR
        /* send the data on \PIPE\ */
        if (!rpc_api_pipe_req(cli, NET_SAMLOGON, &buf, &rbuf)) {
                DEBUG(0,("cli_net_sam_logon_internal: Erro rpc_api_pipe_req failed.\n"));
-               retval = cli->nt_error;
                goto out;
        }
 
@@ -409,7 +405,6 @@ static uint32 cli_net_sam_logon_internal(struct cli_state *cli, NET_ID_INFO_CTR
        if (retval != 0) {
                /* report error code */
                DEBUG(0,("cli_net_sam_logon_internal: %s\n", get_nt_error_msg(r_s.status)));
-               cli->nt_error = r_s.status;
                goto out;
     }
 
@@ -529,7 +524,6 @@ BOOL cli_net_sam_logoff(struct cli_state *cli, NET_ID_INFO_CTR *ctr)
     {
       /* report error code */
       DEBUG(0,("cli_net_sam_logoff: %s\n", get_nt_error_msg(r_s.status)));
-      cli->nt_error = r_s.status;
       ok = False;
     }