socket: Get address option defaults correctly.

[fwd] / socket.c

diff --git a/socket.c b/socket.c
index c92faad0bbca013a23745d1d9f1f7992ed8ec6e9..c85c2d4f0cf8923a8dc3a277b14b2b7c13c0c6b6 100644 (file)
--- a/socket.c
+++ b/socket.c
@@ -372,9 +372,10 @@ static source *ssource_read(scanner *sc)
   ss->a = getaddr(sc, ADDR_SRC);
   if (ss->a->ops->initsrcopts)
     ss->ao = ss->a->ops->initsrcopts();
   ss->a = getaddr(sc, ADDR_SRC);
   if (ss->a->ops->initsrcopts)
     ss->ao = ss->a->ops->initsrcopts();

-  else
+  else {

     ss->ao = CREATE(addr_opts);
     ss->ao = CREATE(addr_opts);

-  *ss->ao = gsao;
+    *ss->ao = gsao;
+  }

   ss->o = ssgo;
   return (&ss->s);
 }
   ss->o = ssgo;
   return (&ss->s);
 }


@@ -633,9 +634,10 @@ static target *starget_read(scanner *sc)
   st->a = getaddr(sc, ADDR_DEST);
   if (st->a->ops->inittargopts)
     st->ao = st->a->ops->inittargopts();
   st->a = getaddr(sc, ADDR_DEST);
   if (st->a->ops->inittargopts)
     st->ao = st->a->ops->inittargopts();

-  else
+  else {

     st->ao = CREATE(addr_opts);
     st->ao = CREATE(addr_opts);

-  *st->ao = gtao;
+    *st->ao = gtao;
+  }

   dstr_puts(&d, "socket.");
   st->a->ops->print(st->a, ADDR_DEST, &d);
   st->t.desc = xstrdup(d.buf);
   dstr_puts(&d, "socket.");
   st->a->ops->print(st->a, ADDR_DEST, &d);
   st->t.desc = xstrdup(d.buf);