diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-21 10:20:05 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-23 13:47:27 +0200 |
| commit | 38b5beb33d78fd6a799fa591e29e5e1227adfa70 (patch) | |
| tree | 99570f7dbd10e339ffafda3d7311a59c79b80e38 /source4 | |
| parent | 4d2c56c4b1a4f846b44f24c6f73e1b95fdf3a9bb (diff) | |
| download | samba-38b5beb33d78fd6a799fa591e29e5e1227adfa70.tar.gz samba-38b5beb33d78fd6a799fa591e29e5e1227adfa70.tar.bz2 samba-38b5beb33d78fd6a799fa591e29e5e1227adfa70.zip | |
param: Remove "announce as" parameter
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/param/loadparm.c | 11 | ||||
| -rw-r--r-- | source4/param/param.h | 7 | ||||
| -rw-r--r-- | source4/rpc_server/common/server_info.c | 18 |
3 files changed, 2 insertions, 34 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index 4ad555626a..14285be017 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -135,15 +135,6 @@ static const struct enum_list enum_security[] = { {-1, NULL} }; -static const struct enum_list enum_announce_as[] = { - {ANNOUNCE_AS_NT_SERVER, "NT"}, - {ANNOUNCE_AS_NT_SERVER, "NT Server"}, - {ANNOUNCE_AS_NT_WORKSTATION, "NT Workstation"}, - {ANNOUNCE_AS_WIN95, "win95"}, - {ANNOUNCE_AS_WFW, "WfW"}, - {-1, NULL} -}; - static const struct enum_list enum_bool_auto[] = { {false, "No"}, {false, "False"}, @@ -283,7 +274,6 @@ static struct parm_struct parm_table[] = { {"nt status support", P_BOOL, P_GLOBAL, GLOBAL_VAR(bNTStatusSupport), NULL, NULL}, {"announce version", P_STRING, P_GLOBAL, GLOBAL_VAR(szAnnounceVersion), NULL, NULL}, - {"announce as", P_ENUM, P_GLOBAL, GLOBAL_VAR(announce_as), NULL, enum_announce_as}, {"max mux", P_INTEGER, P_GLOBAL, GLOBAL_VAR(max_mux), NULL, NULL}, {"max xmit", P_BYTES, P_GLOBAL, GLOBAL_VAR(max_xmit), NULL, NULL}, @@ -629,7 +619,6 @@ FN_GLOBAL_INTEGER(cli_maxprotocol, cli_maxprotocol) FN_GLOBAL_INTEGER(cli_minprotocol, cli_minprotocol) FN_GLOBAL_INTEGER(security, security) FN_GLOBAL_BOOL(paranoid_server_security, paranoid_server_security) -FN_GLOBAL_INTEGER(announce_as, announce_as) FN_LOCAL_STRING(pathname, szPath) FN_LOCAL_LIST(hostsallow, szHostsallow) diff --git a/source4/param/param.h b/source4/param/param.h index 4ba9d497f8..ebf41f7213 100644 --- a/source4/param/param.h +++ b/source4/param/param.h @@ -49,13 +49,6 @@ typedef NTSTATUS (*init_module_fn) (void); #include "libds/common/roles.h" -enum announce_as {/* Types of machine we can announce as. */ - ANNOUNCE_AS_NT_SERVER=1, - ANNOUNCE_AS_WIN95=2, - ANNOUNCE_AS_WFW=3, - ANNOUNCE_AS_NT_WORKSTATION=4 -}; - struct loadparm_context; struct loadparm_service; struct smbcli_options; diff --git a/source4/rpc_server/common/server_info.c b/source4/rpc_server/common/server_info.c index 7f533ecf77..68985d81aa 100644 --- a/source4/rpc_server/common/server_info.c +++ b/source4/rpc_server/common/server_info.c @@ -68,22 +68,8 @@ uint32_t dcesrv_common_get_server_type(TALLOC_CTX *mem_ctx, struct tevent_contex default_server_announce |= SV_TYPE_SERVER; default_server_announce |= SV_TYPE_SERVER_UNIX; - switch (lpcfg_announce_as(dce_ctx->lp_ctx)) { - case ANNOUNCE_AS_NT_SERVER: - default_server_announce |= SV_TYPE_SERVER_NT; - /* fall through... */ - case ANNOUNCE_AS_NT_WORKSTATION: - default_server_announce |= SV_TYPE_NT; - break; - case ANNOUNCE_AS_WIN95: - default_server_announce |= SV_TYPE_WIN95_PLUS; - break; - case ANNOUNCE_AS_WFW: - default_server_announce |= SV_TYPE_WFW; - break; - default: - break; - } + default_server_announce |= SV_TYPE_SERVER_NT; + default_server_announce |= SV_TYPE_NT; switch (lpcfg_server_role(dce_ctx->lp_ctx)) { case ROLE_DOMAIN_MEMBER: |