Start importing the Python testing framework that Tim and I have been

[samba.git] / source3 / rpc_server / srv_wkssvc_nt.c

diff --git a/source3/rpc_server/srv_wkssvc_nt.c b/source3/rpc_server/srv_wkssvc_nt.c
index 688c7f1d0173cee1dc7d3c09d9b596d3d1d67e69..bda7b14a422c6d31fb25d55ae571d2d1c1ad96e8 100644 (file)
--- a/source3/rpc_server/srv_wkssvc_nt.c
+++ b/source3/rpc_server/srv_wkssvc_nt.c
@@ -1,7 +1,5 @@
-#define OLD_NTDOMAIN 1
 /* 
- *  Unix SMB/Netbios implementation.
- *  Version 1.9.
+ *  Unix SMB/CIFS implementation.
  *  RPC Pipe client / server routines
  *  Copyright (C) Andrew Tridgell              1992-1997,
  *  Copyright (C) Luke Kenneth Casson Leighton 1996-1997,
@@ -27,8 +25,8 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
-extern pstring global_myname;
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_RPC_SRV
 
 /*******************************************************************
  create_wks_info_100
@@ -41,7 +39,7 @@ static void create_wks_info_100(WKS_INFO_100 *inf)
 
        DEBUG(5,("create_wks_info_100: %d\n", __LINE__));
 
-       pstrcpy (my_name, global_myname);
+       pstrcpy (my_name, global_myname());
        strupper(my_name);
 
        pstrcpy (domain, lp_workgroup());
@@ -51,7 +49,7 @@ static void create_wks_info_100(WKS_INFO_100 *inf)
                          0x000001f4, /* platform id info */
                          lp_major_announce_version(),
                          lp_minor_announce_version(),
-                         my_name, unix_to_dos(domain,False));
+                         my_name, domain);
 }
 
 /*******************************************************************
@@ -61,7 +59,7 @@ static void create_wks_info_100(WKS_INFO_100 *inf)
 
  ********************************************************************/
 
-uint32 _wks_query_info(pipes_struct *p, WKS_Q_QUERY_INFO *q_u, WKS_R_QUERY_INFO *r_u)
+NTSTATUS _wks_query_info(pipes_struct *p, WKS_Q_QUERY_INFO *q_u, WKS_R_QUERY_INFO *r_u)
 {
        WKS_INFO_100 *wks100 = NULL;
 
@@ -73,10 +71,9 @@ uint32 _wks_query_info(pipes_struct *p, WKS_Q_QUERY_INFO *q_u, WKS_R_QUERY_INFO
                return NT_STATUS_NO_MEMORY;
 
        create_wks_info_100(wks100);
-       init_wks_r_query_info(r_u, q_u->switch_value, wks100, NT_STATUS_NOPROBLEMO);
+       init_wks_r_query_info(r_u, q_u->switch_value, wks100, NT_STATUS_OK);
 
        DEBUG(5,("_wks_query_info: %d\n", __LINE__));
 
        return r_u->status;
 }
-#undef OLD_NTDOMAIN