29c29
< * $FreeBSD: stable/10/usr.sbin/ctld/ctld.c 263719 2014-03-25 12:00:05Z trasz $
---
> * $FreeBSD: stable/10/usr.sbin/ctld/ctld.c 263720 2014-03-25 12:01:55Z trasz $
151a152,239
> const struct auth_name *
> auth_name_new(struct auth_group *ag, const char *name)
> {
> struct auth_name *an;
>
> an = calloc(1, sizeof(*an));
> if (an == NULL)
> log_err(1, "calloc");
> an->an_auth_group = ag;
> an->an_initator_name = checked_strdup(name);
> TAILQ_INSERT_TAIL(&ag->ag_names, an, an_next);
> return (an);
> }
>
> static void
> auth_name_delete(struct auth_name *an)
> {
> TAILQ_REMOVE(&an->an_auth_group->ag_names, an, an_next);
>
> free(an->an_initator_name);
> free(an);
> }
>
> bool
> auth_name_defined(const struct auth_group *ag)
> {
> if (TAILQ_EMPTY(&ag->ag_names))
> return (false);
> return (true);
> }
>
> const struct auth_name *
> auth_name_find(const struct auth_group *ag, const char *name)
> {
> const struct auth_name *auth_name;
>
> TAILQ_FOREACH(auth_name, &ag->ag_names, an_next) {
> if (strcmp(auth_name->an_initator_name, name) == 0)
> return (auth_name);
> }
>
> return (NULL);
> }
>
> const struct auth_portal *
> auth_portal_new(struct auth_group *ag, const char *portal)
> {
> struct auth_portal *ap;
>
> ap = calloc(1, sizeof(*ap));
> if (ap == NULL)
> log_err(1, "calloc");
> ap->ap_auth_group = ag;
> ap->ap_initator_portal = checked_strdup(portal);
> TAILQ_INSERT_TAIL(&ag->ag_portals, ap, ap_next);
> return (ap);
> }
>
> static void
> auth_portal_delete(struct auth_portal *ap)
> {
> TAILQ_REMOVE(&ap->ap_auth_group->ag_portals, ap, ap_next);
>
> free(ap->ap_initator_portal);
> free(ap);
> }
>
> bool
> auth_portal_defined(const struct auth_group *ag)
> {
> if (TAILQ_EMPTY(&ag->ag_portals))
> return (false);
> return (true);
> }
>
> const struct auth_portal *
> auth_portal_find(const struct auth_group *ag, const char *portal)
> {
> const struct auth_portal *auth_portal;
>
> TAILQ_FOREACH(auth_portal, &ag->ag_portals, ap_next) {
> if (strcmp(auth_portal->ap_initator_portal, portal) == 0)
> return (auth_portal);
> }
>
> return (NULL);
> }
>
170a259,260
> TAILQ_INIT(&ag->ag_names);
> TAILQ_INIT(&ag->ag_portals);
180c270,272
< struct auth *auth, *tmp;
---
> struct auth *auth, *auth_tmp;
> struct auth_name *auth_name, *auth_name_tmp;
> struct auth_portal *auth_portal, *auth_portal_tmp;
184c276
< TAILQ_FOREACH_SAFE(auth, &ag->ag_auths, a_next, tmp)
---
> TAILQ_FOREACH_SAFE(auth, &ag->ag_auths, a_next, auth_tmp)
185a278,282
> TAILQ_FOREACH_SAFE(auth_name, &ag->ag_names, an_next, auth_name_tmp)
> auth_name_delete(auth_name);
> TAILQ_FOREACH_SAFE(auth_portal, &ag->ag_portals, ap_next,
> auth_portal_tmp)
> auth_portal_delete(auth_portal);
834a932,933
> struct auth_name *auth_name;
> struct auth_portal *auth_portal;
846a946,951
> TAILQ_FOREACH(auth_name, &ag->ag_names, an_next)
> fprintf(stderr, "\t initiator-name %s\n",
> auth_name->an_initator_name);
> TAILQ_FOREACH(auth_portal, &ag->ag_portals, an_next)
> fprintf(stderr, "\t initiator-portal %s\n",
> auth_portal->an_initator_portal);