32c32
< __FBSDID("$FreeBSD: head/usr.sbin/ctld/ctld.c 273635 2014-10-25 12:50:26Z mav $");
---
> __FBSDID("$FreeBSD: head/usr.sbin/ctld/ctld.c 273813 2014-10-29 09:26:55Z trasz $");
981a982,1028
> static int
> portal_group_set_filter(struct portal_group *pg, int filter)
> {
>
> if (pg->pg_discovery_filter == PG_FILTER_UNKNOWN) {
> pg->pg_discovery_filter = filter;
> return (0);
> }
>
> if (pg->pg_discovery_filter == filter)
> return (0);
>
> return (1);
> }
>
> int
> portal_group_set_filter_str(struct portal_group *pg, const char *str)
> {
> int error, filter;
>
> if (strcmp(str, "none") == 0) {
> filter = PG_FILTER_NONE;
> } else if (strcmp(str, "portal") == 0) {
> filter = PG_FILTER_PORTAL;
> } else if (strcmp(str, "portal-name") == 0) {
> filter = PG_FILTER_PORTAL_NAME;
> } else if (strcmp(str, "portal-name-auth") == 0) {
> filter = PG_FILTER_PORTAL_NAME_AUTH;
> } else {
> log_warnx("invalid discovery-filter \"%s\" for portal-group "
> "\"%s\"; valid values are \"none\", \"portal\", "
> "\"portal-name\", and \"portal-name-auth\"",
> str, pg->pg_name);
> return (1);
> }
>
> error = portal_group_set_filter(pg, filter);
> if (error != 0) {
> log_warnx("cannot set discovery-filter to \"%s\" for "
> "portal-group \"%s\"; already has a different "
> "value", str, pg->pg_name);
> return (1);
> }
>
> return (error);
> }
>
1480a1528,1530
> if (pg->pg_discovery_filter == PG_FILTER_UNKNOWN)
> pg->pg_discovery_filter = PG_FILTER_NONE;
>