diff options
-rw-r--r-- | usr.sbin/inetd/inetd.c | 14 | ||||
-rw-r--r-- | usr.sbin/inetd/inetd.h | 2 |
2 files changed, 0 insertions, 16 deletions
diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c index 2c6d90c..eca4749 100644 --- a/usr.sbin/inetd/inetd.c +++ b/usr.sbin/inetd/inetd.c @@ -987,12 +987,6 @@ void config() } switch (sep->se_family) { case AF_INET: - if (sep->se_ctladdrinitok == 0) { - memcpy(&sep->se_ctrladdr4, bind_sa4, - sizeof(sep->se_ctrladdr4)); - sep->se_ctrladdr_size = - sizeof(sep->se_ctrladdr4); - } if (sp->s_port != sep->se_ctrladdr4.sin_port) { sep->se_ctrladdr4.sin_port = sp->s_port; @@ -1001,12 +995,6 @@ void config() break; #ifdef INET6 case AF_INET6: - if (sep->se_ctladdrinitok == 0) { - memcpy(&sep->se_ctrladdr6, bind_sa6, - sizeof(sep->se_ctrladdr6)); - sep->se_ctrladdr_size = - sizeof(sep->se_ctrladdr6); - } if (sp->s_port != sep->se_ctrladdr6.sin6_port) { sep->se_ctrladdr6.sin6_port = @@ -1623,14 +1611,12 @@ more: memcpy(&sep->se_ctrladdr4, bind_sa4, sizeof(sep->se_ctrladdr4)); sep->se_ctrladdr_size = sizeof(sep->se_ctrladdr4); - sep->se_ctladdrinitok = 1; break; #ifdef INET6 case AF_INET6: memcpy(&sep->se_ctrladdr6, bind_sa6, sizeof(sep->se_ctrladdr6)); sep->se_ctrladdr_size = sizeof(sep->se_ctrladdr6); - sep->se_ctladdrinitok = 1; break; #endif } diff --git a/usr.sbin/inetd/inetd.h b/usr.sbin/inetd/inetd.h index c11f4ad..f54447f 100644 --- a/usr.sbin/inetd/inetd.h +++ b/usr.sbin/inetd/inetd.h @@ -97,13 +97,11 @@ struct servtab { struct servtab *se_next; struct se_flags { u_int se_nomapped : 1; - u_int se_ctladdrinitok : 1; u_int se_reset : 1; } se_flags; }; #define se_nomapped se_flags.se_nomapped -#define se_ctladdrinitok se_flags.se_ctladdrinitok #define se_reset se_flags.se_reset void chargen_dg __P((int, struct servtab *)); |