Page MenuHomeFreeBSD
Files F108612796

D43198.diff
No OneTemporary
Actions

D43198.diff
View Options

diff --git a/usr.sbin/ctld/ctld.c b/usr.sbin/ctld/ctld.c
--- a/usr.sbin/ctld/ctld.c
+++ b/usr.sbin/ctld/ctld.c
@@ -532,6 +532,7 @@
{
struct auth_group *ag;
+ assert(name != NULL);
TAILQ_FOREACH(ag, &conf->conf_auth_groups, ag_next) {
if (ag->ag_name != NULL && strcmp(ag->ag_name, name) == 0)
return (ag);
diff --git a/usr.sbin/ctld/uclparse.c b/usr.sbin/ctld/uclparse.c
--- a/usr.sbin/ctld/uclparse.c
+++ b/usr.sbin/ctld/uclparse.c
@@ -60,6 +60,7 @@
const struct auth *ca;
const ucl_object_t *user, *secret;
+ assert(auth_group != NULL);
user = ucl_object_find_key(obj, "user");
if (!user || user->type != UCL_STRING) {
log_warnx("chap section in auth-group \"%s\" is missing "
@@ -90,6 +91,7 @@
const ucl_object_t *user, *secret, *mutual_user;
const ucl_object_t *mutual_secret;
+ assert(auth_group != NULL);
user = ucl_object_find_key(obj, "user");
if (!user || user->type != UCL_STRING) {
log_warnx("chap-mutual section in auth-group \"%s\" is missing "
@@ -714,6 +716,8 @@
}
if (!strcmp(key, "auth-group")) {
+ const char *ag;
+
if (target->t_auth_group != NULL) {
if (target->t_auth_group->ag_name != NULL)
log_warnx("auth-group for target \"%s\" "
@@ -725,8 +729,12 @@
"target \"%s\"", target->t_name);
return (1);
}
- target->t_auth_group = auth_group_find(conf,
- ucl_object_tostring(obj));
+ ag = ucl_object_tostring(obj);
+ if (!ag) {
+ log_warnx("auth-group must be a string");
+ return (1);
+ }
+ target->t_auth_group = auth_group_find(conf, ag);
if (target->t_auth_group == NULL) {
log_warnx("unknown auth-group \"%s\" for target "
"\"%s\"", ucl_object_tostring(obj),
@@ -759,6 +767,20 @@
}
if (!strcmp(key, "chap")) {
+ if (target->t_auth_group != NULL) {
+ if (target->t_auth_group->ag_name != NULL) {
+ log_warnx("cannot use both auth-group "
+ "and chap for target \"%s\"",
+ target->t_name);
+ return (1);
+ }
+ } else {
+ target->t_auth_group = auth_group_new(conf, NULL);
+ if (target->t_auth_group == NULL) {
+ return (1);
+ }
+ target->t_auth_group->ag_target = target;
+ }
if (uclparse_chap(target->t_auth_group, obj) != 0)
return (1);
}

File Metadata

Mime Type
text/plain
Expires
Mon, Jan 27, 9:32 PM (7 h, 53 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16213762
Default Alt Text
D43198.diff (2 KB)

Event Timeline