libds: moved enum security_types to a common header

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

diff --git a/libds/common/roles.h b/libds/common/roles.h
index b546b94349610f0c5f9f12e878d149c1e17bf26f..0ebb8771ac149ae1cdca369e08b2e12c27a9fcc3 100644 (file)
--- a/libds/common/roles.h
+++ b/libds/common/roles.h
@@ -39,4 +39,7 @@ enum server_role {
 */
 #define ROLE_DOMAIN_CONTROLLER ROLE_DOMAIN_BDC
 
+/* security levels for 'security =' option */
+enum security_types {SEC_SHARE,SEC_USER,SEC_SERVER,SEC_DOMAIN,SEC_ADS};
+
 #endif /* _LIBDS_ROLES_H_ */

diff --git a/source3/include/smb.h b/source3/include/smb.h
index d584a9db45e4951f53b19709e935fa707a252f9f..863ba7cf1f1c8581a85bb1caf28ce988855c6a3e 100644 (file)
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1296,9 +1296,6 @@ enum protocol_types {
        PROTOCOL_SMB2
 };
 
-/* security levels */
-enum security_types {SEC_SHARE,SEC_USER,SEC_SERVER,SEC_DOMAIN,SEC_ADS};
-
 /* printing types */
 enum printing_types {PRINT_BSD,PRINT_SYSV,PRINT_AIX,PRINT_HPUX,
                     PRINT_QNX,PRINT_PLP,PRINT_LPRNG,PRINT_SOFTQ,

diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index fa00beee967fbc5ad22dde4bcad713ca5582cece..79706b4f09bf3d51561c91a0a0d61c60311d8eaa 100644 (file)
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -264,6 +264,7 @@ static const struct enum_list enum_protocol[] = {
 static const struct enum_list enum_security[] = {
        {SEC_SHARE, "SHARE"},
        {SEC_USER, "USER"},
+       {SEC_ADS, "ADS"},
        {-1, NULL}
 };
 

diff --git a/source4/smb_server/smb_server.h b/source4/smb_server/smb_server.h
index 83612194fff4eed0f9e509df38e5baea3651ddb2..6fcd9787bb705876fac37983d59afc73744fa40d 100644 (file)
--- a/source4/smb_server/smb_server.h
+++ b/source4/smb_server/smb_server.h
@@ -22,6 +22,7 @@
 #include "libcli/raw/request.h"
 #include "libcli/raw/interfaces.h"
 #include "lib/socket/socket.h"
+#include "libds/common/roles.h"
 #include "../lib/util/dlinklist.h"
 #include "../librpc/gen_ndr/nbt.h"
 
@@ -265,8 +266,6 @@ struct smbsrv_request {
        struct smb_request_buffer out;
 };
 
-enum security_types {SEC_SHARE,SEC_USER};
-
 /* smb server context structure. This should contain all the state
  * information associated with a SMB server connection 
  */