summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libds/common/roles.h3
-rw-r--r--source3/include/smb.h3
-rw-r--r--source4/param/loadparm.c1
-rw-r--r--source4/smb_server/smb_server.h3
4 files changed, 5 insertions, 5 deletions
diff --git a/libds/common/roles.h b/libds/common/roles.h
index b546b94349..0ebb8771ac 100644
--- 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 d584a9db45..863ba7cf1f 100644
--- 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 fa00beee96..79706b4f09 100644
--- 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 83612194ff..6fcd9787bb 100644
--- 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
*/