d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make it possible to redefine portal-group "default".

Browse Source 
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Edward Tomasz Napierala 2014-02-11 11:27:25 +00:00
parent df9900fb5b
commit 252d941cc3
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=261759
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
usr.sbin/ctld/ctld.h
View File

@ -146,6 +146,9 @@ struct conf {
uint16_t conf_last_portal_group_tag;
struct pidfh *conf_pidfh;
bool conf_default_pg_defined;
bool conf_default_ag_defined;
};
#define CONN_SESSION_TYPE_NONE 0

26
usr.sbin/ctld/parse.y
View File

@ -224,7 +224,17 @@ portal_group: PORTAL_GROUP portal_group_name
portal_group_name: STR
{
portal_group = portal_group_new(conf, $1);
/*
* Make it possible to redefine default
* portal-group. but only once.
*/
if (strcmp($1, "default") == 0 &&
conf->conf_default_pg_defined == false) {
portal_group = portal_group_find(conf, $1);
conf->conf_default_pg_defined = true;
} else {
portal_group = portal_group_new(conf, $1);
}
free($1);
if (portal_group == NULL)
return (1);
@ -703,6 +713,7 @@ conf_new_from_file(const char *path)
conf = conf_new();
ag = auth_group_new(conf, "no-authentication");
assert(ag != NULL);
ag->ag_type = AG_TYPE_NO_AUTHENTICATION;
/*
@ -710,11 +721,11 @@ conf_new_from_file(const char *path)
* any entries and thus will always deny access.
*/
ag = auth_group_new(conf, "no-access");
assert(ag != NULL);
ag->ag_type = AG_TYPE_CHAP;
pg = portal_group_new(conf, "default");
portal_group_add_listen(pg, "0.0.0.0:3260", false);
portal_group_add_listen(pg, "[::]:3260", false);
assert(pg != NULL);
yyin = fopen(path, "r");
if (yyin == NULL) {
@ -736,6 +747,15 @@ conf_new_from_file(const char *path)
return (NULL);
}
if (conf->conf_default_pg_defined == false) {
log_debugx("portal-group \"default\" not defined; "
"going with defaults");
pg = portal_group_find(conf, "default");
assert(pg != NULL);
portal_group_add_listen(pg, "0.0.0.0:3260", false);
portal_group_add_listen(pg, "[::]:3260", false);
}
error = conf_verify(conf);
if (error != 0) {
conf_delete(conf);