32c32
< __FBSDID("$FreeBSD: stable/10/usr.sbin/ctld/ctld.c 275244 2014-11-29 15:32:15Z trasz $");
---
> __FBSDID("$FreeBSD: stable/10/usr.sbin/ctld/ctld.c 275245 2014-11-29 15:34:17Z trasz $");
525,539d524
< static int
< auth_group_set_type(struct auth_group *ag, int type)
< {
<
< if (ag->ag_type == AG_TYPE_UNKNOWN) {
< ag->ag_type = type;
< return (0);
< }
<
< if (ag->ag_type == type)
< return (0);
<
< return (1);
< }
<
541c526
< auth_group_set_type_str(struct auth_group *ag, const char *str)
---
> auth_group_set_type(struct auth_group *ag, const char *str)
543c528
< int error, type;
---
> int type;
563,565c548,549
< error = auth_group_set_type(ag, type);
< if (error != 0) {
< if (ag->ag_name != NULL)
---
> if (ag->ag_type != AG_TYPE_UNKNOWN && ag->ag_type != type) {
> if (ag->ag_name != NULL) {
569c553
< else
---
> } else {
572a557
> }
576c561,563
< return (error);
---
> ag->ag_type = type;
>
> return (0);
982,996d968
< 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);
< }
<
998c970
< portal_group_set_filter_str(struct portal_group *pg, const char *str)
---
> portal_group_set_filter(struct portal_group *pg, const char *str)
1000c972
< int error, filter;
---
> int filter;
1018,1019c990,991
< error = portal_group_set_filter(pg, filter);
< if (error != 0) {
---
> if (pg->pg_discovery_filter != PG_FILTER_UNKNOWN &&
> pg->pg_discovery_filter != filter) {
1026c998,1000
< return (error);
---
> pg->pg_discovery_filter = filter;
>
> return (0);