r18717: remove old defines in preference of the flags in librpc/gen_ndr/srvsvc.h

(This used to be commit 080c51dd8046cb19cca90035efe73529a3f6970b)

3 files changed, 5 insertions, 39 deletions

diff --git a/source3/include/rpc_client.h b/source3/include/rpc_client.h
index 766b35a2f92..78efc7c2fca 100644
--- a/source3/include/rpc_client.h
+++ b/source3/include/rpc_client.h
@@ -28,6 +28,7 @@
 #include "librpc/gen_ndr/cli_dfs.h"
 #include "librpc/gen_ndr/cli_lsa.h"
 #include "librpc/gen_ndr/cli_winreg.h"
+#include "librpc/gen_ndr/cli_wkssvc.h"
 
 /* macro to expand cookie-cutter code in cli_xxx() using rpc_api_pipe_req() */
 
diff --git a/source3/include/rpc_srvsvc.h b/source3/include/rpc_srvsvc.h
index 31032f64a4d..62acce58050 100644
--- a/source3/include/rpc_srvsvc.h
+++ b/source3/include/rpc_srvsvc.h
@@ -443,12 +443,6 @@ typedef struct ptr_info_1004_info
 	SH_INFO_1004_STR info_1004_str; 
 } SRV_SHARE_INFO_1004;
 
-#define SHARE_1005_IN_DFS               0x00000001
-#define SHARE_1005_DFS_ROOT             0x00000002
-/* use the CSC policy mask and shift to match up with the smb.conf parm */
-#define SHARE_1005_CSC_POLICY_MASK      0x00000030
-#define SHARE_1005_CSC_POLICY_SHIFT     4
-
 typedef struct share_info_1005_info
 {
   uint32 share_info_flags; 
diff --git a/source3/include/smb.h b/source3/include/smb.h
index c8d19dacefd..bba1621e8f4 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -134,11 +134,7 @@
 #define OPENX_FILE_FAIL_IF_NOT_EXIST 0
 
 /* share types */
-#define STYPE_DISKTREE  0	/* Disk drive */
-#define STYPE_PRINTQ    1	/* Spooler queue */
-#define STYPE_DEVICE    2	/* Serial device */
-#define STYPE_IPC       3	/* Interprocess communication (IPC) */
-#define STYPE_HIDDEN    0x80000000 /* share is a hidden one (ends with $) */
+/* defined in librpc/gen_ndr/srvsvc.h */
 
 #include "doserr.h"
 
@@ -285,6 +281,8 @@ typedef struct dom_sid {
 #include "librpc/gen_ndr/initshutdown.h"
 #include "librpc/gen_ndr/winreg.h"
 #include "librpc/gen_ndr/eventlog.h"
+#include "librpc/gen_ndr/srvsvc.h"
+#include "librpc/gen_ndr/wkssvc.h"
 
 struct lsa_dom_info {
 	BOOL valid;
@@ -1356,34 +1354,7 @@ char *strdup(char *s);
 #endif
 
 /* these are used in NetServerEnum to choose what to receive */
-#define SV_TYPE_WORKSTATION         0x00000001
-#define SV_TYPE_SERVER              0x00000002
-#define SV_TYPE_SQLSERVER           0x00000004
-#define SV_TYPE_DOMAIN_CTRL         0x00000008
-#define SV_TYPE_DOMAIN_BAKCTRL      0x00000010
-#define SV_TYPE_TIME_SOURCE         0x00000020
-#define SV_TYPE_AFP                 0x00000040
-#define SV_TYPE_NOVELL              0x00000080
-#define SV_TYPE_DOMAIN_MEMBER       0x00000100
-#define SV_TYPE_PRINTQ_SERVER       0x00000200
-#define SV_TYPE_DIALIN_SERVER       0x00000400
-#define SV_TYPE_SERVER_UNIX         0x00000800
-#define SV_TYPE_NT                  0x00001000
-#define SV_TYPE_WFW                 0x00002000
-#define SV_TYPE_SERVER_MFPN         0x00004000
-#define SV_TYPE_SERVER_NT           0x00008000
-#define SV_TYPE_POTENTIAL_BROWSER   0x00010000
-#define SV_TYPE_BACKUP_BROWSER      0x00020000
-#define SV_TYPE_MASTER_BROWSER      0x00040000
-#define SV_TYPE_DOMAIN_MASTER       0x00080000
-#define SV_TYPE_SERVER_OSF          0x00100000
-#define SV_TYPE_SERVER_VMS          0x00200000
-#define SV_TYPE_WIN95_PLUS          0x00400000
-#define SV_TYPE_DFS_SERVER	    0x00800000
-#define SV_TYPE_ALTERNATE_XPORT     0x20000000  
-#define SV_TYPE_LOCAL_LIST_ONLY     0x40000000  
-#define SV_TYPE_DOMAIN_ENUM         0x80000000
-#define SV_TYPE_ALL                 0xFFFFFFFF  
+/* defined in librpc/gen_ndr/srvsvc.h */
 
 /* This was set by JHT in liaison with Jeremy Allison early 1997
  * History: