mirror of
https://git.FreeBSD.org/src.git
synced 2025-01-08 13:28:05 +00:00
Get rid of se_ctladdrinitok, which doesn't do anything and seemes
to have been accidently imported when ipv6 support was added to inetd. Approved by: ume
This commit is contained in:
parent
14784fdec9
commit
d57dbd1615
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=77832
@ -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 @@ getconfigent()
|
||||
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
|
||||
}
|
||||
|
@ -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 *));
|
||||
|
Loading…
Reference in New Issue
Block a user