More status32 conversions.

diff --git a/source/rpc_client/cli_login.c b/source/rpc_client/cli_login.c
index 92a70886d9c8ffd5e5d2856f06ebe8174783136b..0eb5bd1af7c4f8136170bd628c0bc5c668f71154 100644 (file)
--- a/source/rpc_client/cli_login.c
+++ b/source/rpc_client/cli_login.c
@@ -156,9 +156,10 @@ NT login - network.
 password equivalents over the network. JRA.
 ****************************************************************************/
 
-BOOL cli_nt_login_network(struct cli_state *cli, const auth_usersupplied_info *user_info, 
-                          uint32 smb_userid_low, NET_ID_INFO_CTR *ctr, 
-                         NET_USER_INFO_3 *user_info3)
+uint32 cli_nt_login_network(struct cli_state *cli, 
+                            const auth_usersupplied_info *user_info, 
+                            uint32 smb_userid_low, NET_ID_INFO_CTR *ctr, 
+                            NET_USER_INFO_3 *user_info3)
 {
   DEBUG(5,("cli_nt_login_network: %d\n", __LINE__));
   /* indicate a "network" login */

diff --git a/source/rpc_client/cli_netlogon.c b/source/rpc_client/cli_netlogon.c
index 18266739ac8e52f6f442a6fdbf95f393d56a25a8..2dd9eb0141f874549550967f25a345f2f4040d71 100644 (file)
--- a/source/rpc_client/cli_netlogon.c
+++ b/source/rpc_client/cli_netlogon.c
@@ -437,18 +437,18 @@ password ?).\n", cli->desthost ));
 LSA SAM Logon - interactive or network.
 ****************************************************************************/
 
-BOOL cli_net_sam_logon(struct cli_state *cli, NET_ID_INFO_CTR *ctr, NET_USER_INFO_3 *user_info3)
+uint32 cli_net_sam_logon(struct cli_state *cli, NET_ID_INFO_CTR *ctr, 
+                         NET_USER_INFO_3 *user_info3)
 {
-       BOOL ok = True;
        uint16 validation_level=3;
-       uint32 ret_err_code;
+       uint32 result;
 
-       ret_err_code = cli_net_sam_logon_internal(cli, ctr, user_info3, validation_level);
+       result = cli_net_sam_logon_internal(cli, ctr, user_info3, 
+                                            validation_level);
 
-       if(ret_err_code == NT_STATUS_NOPROBLEMO) {
+       if(result == NT_STATUS_NOPROBLEMO) {
                DEBUG(10,("cli_net_sam_logon: Success \n"));
-               ok = True;
-       } else if (ret_err_code == NT_STATUS_INVALID_INFO_CLASS) {
+       } else if (result == NT_STATUS_INVALID_INFO_CLASS) {
                DEBUG(10,("cli_net_sam_logon: STATUS INVALID INFO CLASS \n"));
 
                validation_level=2;
@@ -458,15 +458,13 @@ BOOL cli_net_sam_logon(struct cli_state *cli, NET_ID_INFO_CTR *ctr, NET_USER_INF
                 * for the error. If its error, return False. 
                 */
 
-               if(cli_net_sam_logon_internal(cli, ctr, user_info3, validation_level) != 0)
-                       ok = False;
-
+               result = cli_net_sam_logon_internal(cli, ctr, user_info3,
+                                                    validation_level);
        } else {
                DEBUG(10,("cli_net_sam_logon: Error\n"));
-               ok = False;
        }
 
-       return ok;
+       return result;
 }
 
 /***************************************************************************