librpc: remove nbt dependency to svcctl.

Guenther

diff --git a/libcli/netlogon/netlogon.h b/libcli/netlogon/netlogon.h
index 30f716cceb704cc70586f2d26b539184337e5efa..d9589f8ce2e73c9b5bc191ea607f9a79912deb0d 100644 (file)
--- a/libcli/netlogon/netlogon.h
+++ b/libcli/netlogon/netlogon.h
@@ -26,7 +26,6 @@
 
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_security.h"
-#include "librpc/gen_ndr/ndr_svcctl.h"
 
 struct netlogon_samlogon_response
 {

diff --git a/librpc/idl/misc.idl b/librpc/idl/misc.idl
index 4d6fe3019a6210022d7ec1a8f2909a5c6ab005f8..f3e6f27b8ae072db625b006dd0022d5ade0ecd7c 100644 (file)
--- a/librpc/idl/misc.idl
+++ b/librpc/idl/misc.idl
@@ -84,4 +84,37 @@ interface misc
                SAM_DATABASE_BUILTIN = 1, /* BUILTIN users and groups */
                SAM_DATABASE_PRIVS   = 2 /* Privileges */
        } netr_SamDatabaseID;
+
+       typedef [public,bitmap32bit] bitmap {
+               SV_TYPE_WORKSTATION       = 0x00000001,
+               SV_TYPE_SERVER            = 0x00000002,
+               SV_TYPE_SQLSERVER         = 0x00000004,
+               SV_TYPE_DOMAIN_CTRL       = 0x00000008,
+               SV_TYPE_DOMAIN_BAKCTRL    = 0x00000010,
+               SV_TYPE_TIME_SOURCE       = 0x00000020,
+               SV_TYPE_AFP               = 0x00000040,
+               SV_TYPE_NOVELL            = 0x00000080,
+
+               SV_TYPE_DOMAIN_MEMBER     = 0x00000100,
+               SV_TYPE_PRINTQ_SERVER     = 0x00000200,
+               SV_TYPE_DIALIN_SERVER     = 0x00000400,
+               SV_TYPE_SERVER_UNIX       = 0x00000800,
+               SV_TYPE_NT                = 0x00001000,
+               SV_TYPE_WFW               = 0x00002000,
+               SV_TYPE_SERVER_MFPN       = 0x00004000,
+               SV_TYPE_SERVER_NT         = 0x00008000,
+               SV_TYPE_POTENTIAL_BROWSER = 0x00010000,
+               SV_TYPE_BACKUP_BROWSER    = 0x00020000,
+               SV_TYPE_MASTER_BROWSER    = 0x00040000,
+               SV_TYPE_DOMAIN_MASTER     = 0x00080000,
+               SV_TYPE_SERVER_OSF        = 0x00100000,
+               SV_TYPE_SERVER_VMS        = 0x00200000,
+               SV_TYPE_WIN95_PLUS        = 0x00400000,
+               SV_TYPE_DFS_SERVER        = 0x00800000,
+               SV_TYPE_ALTERNATE_XPORT   = 0x20000000,
+               SV_TYPE_LOCAL_LIST_ONLY   = 0x40000000,
+               SV_TYPE_DOMAIN_ENUM       = 0x80000000
+       } svcctl_ServerType;
+
+       const uint32 SV_TYPE_ALL        = 0xFFFFFFFF;
 }

diff --git a/librpc/idl/nbt.idl b/librpc/idl/nbt.idl
index eb2e8117edb5809eb89072b25c37ac47c91cac1b..227e0a46a4b3ff744049be7a3a13b9eeab7d845a 100644 (file)
--- a/librpc/idl/nbt.idl
+++ b/librpc/idl/nbt.idl
@@ -8,7 +8,7 @@
    encoding if it doesn't work out
 */
 
-import "misc.idl", "security.idl", "svcctl.idl";
+import "misc.idl", "security.idl";
 [
        helper("../libcli/netlogon/netlogon.h", "../libcli/nbt/libnbt.h"),
        helpstring("NBT messages"),

diff --git a/librpc/idl/svcctl.idl b/librpc/idl/svcctl.idl
index 19866d273f4350fe85976c2b4dbe37d193468c0d..52ebd44128c57dccbe2880fd2f55bcfe44c36260 100644 (file)
--- a/librpc/idl/svcctl.idl
+++ b/librpc/idl/svcctl.idl
@@ -80,39 +80,6 @@ import "misc.idl", "security.idl";
        const int SERVICE_TYPE_WIN32=SERVICE_TYPE_WIN32_OWN_PROCESS|SERVICE_TYPE_WIN32_SHARE_PROCESS;
        const int SERVICE_TYPE_INTERACTIVE_PROCESS = 0x100;
 
-       typedef [public,bitmap32bit] bitmap {
-               SV_TYPE_WORKSTATION       = 0x00000001,
-               SV_TYPE_SERVER            = 0x00000002,
-               SV_TYPE_SQLSERVER         = 0x00000004,
-               SV_TYPE_DOMAIN_CTRL       = 0x00000008,
-               SV_TYPE_DOMAIN_BAKCTRL    = 0x00000010,
-               SV_TYPE_TIME_SOURCE       = 0x00000020,
-               SV_TYPE_AFP               = 0x00000040,
-               SV_TYPE_NOVELL            = 0x00000080,
-
-               SV_TYPE_DOMAIN_MEMBER     = 0x00000100,
-               SV_TYPE_PRINTQ_SERVER     = 0x00000200,
-               SV_TYPE_DIALIN_SERVER     = 0x00000400,
-               SV_TYPE_SERVER_UNIX       = 0x00000800,
-               SV_TYPE_NT                = 0x00001000,
-               SV_TYPE_WFW               = 0x00002000,
-               SV_TYPE_SERVER_MFPN       = 0x00004000,
-               SV_TYPE_SERVER_NT         = 0x00008000,
-               SV_TYPE_POTENTIAL_BROWSER = 0x00010000,
-               SV_TYPE_BACKUP_BROWSER    = 0x00020000,
-               SV_TYPE_MASTER_BROWSER    = 0x00040000,
-               SV_TYPE_DOMAIN_MASTER     = 0x00080000,
-               SV_TYPE_SERVER_OSF        = 0x00100000,
-               SV_TYPE_SERVER_VMS        = 0x00200000,
-               SV_TYPE_WIN95_PLUS        = 0x00400000,
-               SV_TYPE_DFS_SERVER        = 0x00800000,
-               SV_TYPE_ALTERNATE_XPORT   = 0x20000000,
-               SV_TYPE_LOCAL_LIST_ONLY   = 0x40000000,
-               SV_TYPE_DOMAIN_ENUM       = 0x80000000
-       } svcctl_ServerType;
-
-       const uint32 SV_TYPE_ALL        = 0xFFFFFFFF;
-
        /*****************/
        /* Function 0x00 */
        WERROR svcctl_CloseServiceHandle(