[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1728-g1acb9da

[Günther Deschner]

The branch, v3-2-test has been updated
       via  1acb9daf809acab15bc390f6598814549b88368c (commit)
      from  93d2ad944772513520de22aecffda15f38907b4e (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 1acb9daf809acab15bc390f6598814549b88368c
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Thu Jan 31 01:23:49 2008 +0100

    Cleanup status codes inside _net_logon_ctrl2() reply structs.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source/rpc_server/srv_netlog_nt.c |   18 +++++-------------
 1 files changed, 5 insertions(+), 13 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/rpc_server/srv_netlog_nt.c 
b/source/rpc_server/srv_netlog_nt.c
index 5003af8..fd90e88 100644
--- a/source/rpc_server/srv_netlog_nt.c
+++ b/source/rpc_server/srv_netlog_nt.c
@@ -43,14 +43,6 @@ static void init_net_r_req_chal(NET_R_REQ_CHAL *r_c,
 }
 
 /*************************************************************************
- error messages cropping up when using nltest.exe...
- *************************************************************************/
-
-#define ERROR_NO_SUCH_DOMAIN   0x54b
-#define ERROR_NO_LOGON_SERVERS 0x51f
-#define NO_ERROR               0x0
-
-/*************************************************************************
  net_reply_logon_ctrl:
  *************************************************************************/
 
@@ -97,7 +89,7 @@ NTSTATUS _net_logon_ctrl2(pipes_struct *p, NET_Q_LOGON_CTRL2 
*q_u, NET_R_LOGON_C
 
        r_u->status = NT_STATUS_OK;
        
-       tc_status = ERROR_NO_SUCH_DOMAIN;
+       tc_status = W_ERROR_V(WERR_NO_SUCH_DOMAIN);
        fstrcpy( dc_name, "" );
        
        switch ( q_u->function_code ) {
@@ -108,13 +100,13 @@ NTSTATUS _net_logon_ctrl2(pipes_struct *p, 
NET_Q_LOGON_CTRL2 *q_u, NET_R_LOGON_C
                                break;
                                
                        if ( !get_dc_name( domain, NULL, dc_name2, &dc_ss ) ) {
-                               tc_status = ERROR_NO_LOGON_SERVERS;
+                               tc_status = W_ERROR_V(WERR_NO_LOGON_SERVERS);
                                break;
                        }
 
                        fstr_sprintf( dc_name, "\\\\%s", dc_name2 );
                                
-                       tc_status = NO_ERROR;
+                       tc_status = W_ERROR_V(WERR_OK);
                        
                        break;
                        
@@ -125,13 +117,13 @@ NTSTATUS _net_logon_ctrl2(pipes_struct *p, 
NET_Q_LOGON_CTRL2 *q_u, NET_R_LOGON_C
                                break;
                                
                        if ( !get_dc_name( domain, NULL, dc_name2, &dc_ss ) ) {
-                               tc_status = ERROR_NO_LOGON_SERVERS;
+                               tc_status = W_ERROR_V(WERR_NO_LOGON_SERVERS);
                                break;
                        }
 
                        fstr_sprintf( dc_name, "\\\\%s", dc_name2 );
                                
-                       tc_status = NO_ERROR;
+                       tc_status = W_ERROR_V(WERR_OK);
                        
                        break;
                        


-- 
Samba Shared Repository