aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Maier <pmaier@sysmocom.de>2017-11-29 15:28:09 +0100
committerPhilipp Maier <pmaier@sysmocom.de>2017-11-30 09:21:51 +0100
commit20114aa809fbcef8510e656c74d22d7c76255441 (patch)
tree6fa2e2dddf5a9d11b25e8d26a45a8aa81aa2d1cc
parentad381102ea4ec189f0b48cc15cd25478c4817bc9 (diff)
auth: remove obsolete VTY commands
authentication (optional|required) is no longer needed, the related decisions are now made in the HLR. Change-Id: Ib6c6331cc86004c4862067031e4fcb12a6975b63
-rw-r--r--doc/examples/osmo-bsc/osmo-bsc.cfg1
-rw-r--r--doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg1
-rw-r--r--include/osmocom/bsc/gsm_data.h1
-rw-r--r--src/libbsc/bsc_vty.c3
-rw-r--r--src/libcommon-cs/common_cs_vty.c15
5 files changed, 0 insertions, 21 deletions
diff --git a/doc/examples/osmo-bsc/osmo-bsc.cfg b/doc/examples/osmo-bsc/osmo-bsc.cfg
index 60338d29c..64c3abd46 100644
--- a/doc/examples/osmo-bsc/osmo-bsc.cfg
+++ b/doc/examples/osmo-bsc/osmo-bsc.cfg
@@ -10,7 +10,6 @@ network
long name OsmoBSC
location updating reject cause 13
encryption a5 0
- authentication optional
neci 0
paging any use tch 0
rrlp mode none
diff --git a/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg b/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg
index f9f5ba655..769748169 100644
--- a/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg
+++ b/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg
@@ -9,7 +9,6 @@ network
long name OsmoBSC
location updating reject cause 13
encryption a5 0
- authentication optional
neci 0
paging any use tch 0
rrlp mode none
diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h
index 5190a2769..91aee437f 100644
--- a/include/osmocom/bsc/gsm_data.h
+++ b/include/osmocom/bsc/gsm_data.h
@@ -335,7 +335,6 @@ struct gsm_network {
char *name_short;
enum gsm48_reject_value reject_cause;
int a5_encryption;
- bool authentication_required;
int neci;
int send_mm_info;
struct {
diff --git a/src/libbsc/bsc_vty.c b/src/libbsc/bsc_vty.c
index c5dedb345..3f3935cbe 100644
--- a/src/libbsc/bsc_vty.c
+++ b/src/libbsc/bsc_vty.c
@@ -802,9 +802,6 @@ static int config_write_net(struct vty *vty)
vty_out(vty, " location updating reject cause %u%s",
gsmnet->reject_cause, VTY_NEWLINE);
vty_out(vty, " encryption a5 %u%s", gsmnet->a5_encryption, VTY_NEWLINE);
- vty_out(vty, " authentication %s%s",
- gsmnet->authentication_required ? "required" : "optional",
- VTY_NEWLINE);
vty_out(vty, " neci %u%s", gsmnet->neci, VTY_NEWLINE);
vty_out(vty, " paging any use tch %d%s", gsmnet->pag_any_tch, VTY_NEWLINE);
vty_out(vty, " rrlp mode %s%s", rrlp_mode_name(gsmnet->rrlp.mode),
diff --git a/src/libcommon-cs/common_cs_vty.c b/src/libcommon-cs/common_cs_vty.c
index 51f16c4c5..74b1a9395 100644
--- a/src/libcommon-cs/common_cs_vty.c
+++ b/src/libcommon-cs/common_cs_vty.c
@@ -134,20 +134,6 @@ DEFUN(cfg_net_encryption,
return CMD_SUCCESS;
}
-DEFUN(cfg_net_authentication,
- cfg_net_authentication_cmd,
- "authentication (optional|required)",
- "Whether to enforce MS authentication in 2G\n"
- "Allow MS to attach via 2G BSC without authentication\n"
- "Always do authentication\n")
-{
- struct gsm_network *gsmnet = gsmnet_from_vty(vty);
-
- gsmnet->authentication_required = (argv[0][0] == 'r') ? true : false;
-
- return CMD_SUCCESS;
-}
-
DEFUN(cfg_net_rrlp_mode, cfg_net_rrlp_mode_cmd,
"rrlp mode (none|ms-based|ms-preferred|ass-preferred)",
"Radio Resource Location Protocol\n"
@@ -297,7 +283,6 @@ int common_cs_vty_init(struct gsm_network *network,
install_element(GSMNET_NODE, &cfg_net_name_long_cmd);
install_element(GSMNET_NODE, &cfg_net_reject_cause_cmd);
install_element(GSMNET_NODE, &cfg_net_encryption_cmd);
- install_element(GSMNET_NODE, &cfg_net_authentication_cmd);
install_element(GSMNET_NODE, &cfg_net_rrlp_mode_cmd);
install_element(GSMNET_NODE, &cfg_net_mm_info_cmd);
install_element(GSMNET_NODE, &cfg_net_timezone_cmd);