32c32
< __FBSDID("$FreeBSD: stable/10/usr.sbin/ctld/discovery.c 276613 2015-01-03 13:08:08Z mav $");
---
> __FBSDID("$FreeBSD: stable/10/usr.sbin/ctld/discovery.c 279006 2015-02-19 14:52:01Z mav $");
164a165
> struct port *port;
172c173,176
< TAILQ_FOREACH(portal, &targ->t_portal_group->pg_portals, p_next) {
---
> TAILQ_FOREACH(port, &targ->t_ports, p_ts) {
> if (port->p_portal_group == NULL)
> continue;
> TAILQ_FOREACH(portal, &port->p_portal_group->pg_portals, p_next) {
186c190
< targ->t_portal_group->pg_tag);
---
> port->p_portal_group->pg_tag);
192c196
< targ->t_portal_group->pg_tag);
---
> port->p_portal_group->pg_tag);
200a205
> }
206c211
< const struct target *targ)
---
> const struct port *port)
209a215
> const struct target *targ;
213c219,222
< ag = targ->t_auth_group;
---
> targ = port->p_target;
> ag = port->p_auth_group;
> if (ag == NULL)
> ag = targ->t_auth_group;
267a277
> const struct port *port;
269d278
< const struct target *targ;
287,294c296,297
< TAILQ_FOREACH(targ, &pg->pg_conf->conf_targets, t_next) {
< if (targ->t_portal_group != pg) {
< log_debugx("not returning target \"%s\"; "
< "belongs to a different portal group",
< targ->t_name);
< continue;
< }
< if (discovery_target_filtered_out(conn, targ)) {
---
> TAILQ_FOREACH(port, &pg->pg_ports, p_pgs) {
> if (discovery_target_filtered_out(conn, port)) {
298c301
< discovery_add_target(response_keys, targ);
---
> discovery_add_target(response_keys, port->p_target);
301,302c304,305
< targ = target_find(pg->pg_conf, send_targets);
< if (targ == NULL) {
---
> port = port_find_in_pg(pg, send_targets);
> if (port == NULL) {
306c309
< if (discovery_target_filtered_out(conn, targ)) {
---
> if (discovery_target_filtered_out(conn, port)) {
309c312
< discovery_add_target(response_keys, targ);
---
> discovery_add_target(response_keys, port->p_target);