30c30
< * $FreeBSD: stable/10/usr.sbin/ctld/parse.y 279006 2015-02-19 14:52:01Z mav $
---
> * $FreeBSD: stable/10/usr.sbin/ctld/parse.y 279055 2015-02-20 17:09:49Z mav $
64c64
< %token PATH PIDFILE PORTAL_GROUP REDIRECT SEMICOLON SERIAL SIZE STR
---
> %token PATH PIDFILE PORT PORTAL_GROUP REDIRECT SEMICOLON SERIAL SIZE STR
467a468,469
> target_port
> |
710a713,742
> target_port: PORT STR
> {
> struct pport *pp;
> struct port *tp;
>
> pp = pport_find(conf, $2);
> if (pp == NULL) {
> log_warnx("unknown port \"%s\" for target \"%s\"",
> $2, target->t_name);
> free($2);
> return (1);
> }
> if (!TAILQ_EMPTY(&pp->pp_ports)) {
> log_warnx("can't link port \"%s\" to target \"%s\", "
> "port already linked to some target",
> $2, target->t_name);
> free($2);
> return (1);
> }
> tp = port_new_pp(conf, target, pp);
> if (tp == NULL) {
> log_warnx("can't link port \"%s\" to target \"%s\"",
> $2, target->t_name);
> free($2);
> return (1);
> }
> free($2);
> }
> ;
>
940c972
< conf_new_from_file(const char *path)
---
> conf_new_from_file(const char *path, struct conf *oldconf)
943a976
> struct pport *pp;
949a983,985
> TAILQ_FOREACH(pp, &oldconf->conf_pports, pp_next)
> pport_copy(pp, conf);
>