From 1d165c080300c7ecef63164c323b1ec0a37bc012 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 2 May 2011 12:05:02 +1000 Subject: s3-include: use new roles.h Pair-Programmed-With: Andrew Bartlett --- source3/auth/auth_ntlmssp.c | 2 +- source3/include/smb.h | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) (limited to 'source3') diff --git a/source3/auth/auth_ntlmssp.c b/source3/auth/auth_ntlmssp.c index 58974210dd..4151ebaf9d 100644 --- a/source3/auth/auth_ntlmssp.c +++ b/source3/auth/auth_ntlmssp.c @@ -184,7 +184,7 @@ NTSTATUS auth_ntlmssp_start(struct auth_ntlmssp_state **auth_ntlmssp_state) struct auth_ntlmssp_state *ans; struct auth_context *auth_context; - if ((enum server_types)lp_server_role() == ROLE_STANDALONE) { + if ((enum server_role)lp_server_role() == ROLE_STANDALONE) { is_standalone = true; } else { is_standalone = false; diff --git a/source3/include/smb.h b/source3/include/smb.h index 8885ef2d14..827a9db018 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -27,6 +27,7 @@ #define _SMB_H #include "libcli/smb/smb_common.h" +#include "libds/common/roles.h" /* logged when starting the various Samba daemons */ #define COPYRIGHT_STARTUP_MESSAGE "Copyright Andrew Tridgell and the Samba Team 1992-2011" @@ -1298,14 +1299,6 @@ enum protocol_types { /* security levels */ enum security_types {SEC_SHARE,SEC_USER,SEC_SERVER,SEC_DOMAIN,SEC_ADS}; -/* server roles */ -enum server_types { - ROLE_STANDALONE, - ROLE_DOMAIN_MEMBER, - ROLE_DOMAIN_BDC, - ROLE_DOMAIN_PDC -}; - /* printing types */ enum printing_types {PRINT_BSD,PRINT_SYSV,PRINT_AIX,PRINT_HPUX, PRINT_QNX,PRINT_PLP,PRINT_LPRNG,PRINT_SOFTQ, -- cgit