Commit 3ff01ac5 authored by Marco d'Itri's avatar Marco d'Itri

Refresh the Debian patches

parent 52a8e88d
......@@ -42,7 +42,7 @@
Examples might be
.Dq tcp
or
@@ -377,9 +375,7 @@ If you have only one server on
@@ -368,9 +366,7 @@ If you have only one server on
only IPv6 traffic will be routed to the server.
.El
.Sh SEE ALSO
......@@ -51,8 +51,8 @@
-.Xr ftp-proxy 8 ,
.Xr ftpd 8 ,
.Xr identd 8 ,
.Xr rshd 8 ,
@@ -394,7 +390,23 @@ Support for Sun-RPC
.Xr talkd 8
@@ -383,7 +379,23 @@ Support for Sun-RPC
based services is modelled after that
provided by SunOS 4.1.
IPv6 support was added by the KAME project in 1999.
......@@ -102,7 +102,7 @@
#include "pathnames.h"
#define TOOMANY 256 /* don't start more than TOOMANY */
@@ -318,14 +322,11 @@ main(int argc, char *argv[])
@@ -324,14 +328,11 @@ main(int argc, char *argv[])
fd_set *fdsrp = NULL;
int readablen = 0, ch;
struct servtab *sep;
......@@ -117,7 +117,7 @@
break;
case 'R': { /* invocation rate */
char *p;
@@ -367,9 +368,13 @@ main(int argc, char *argv[])
@@ -373,9 +374,13 @@ main(int argc, char *argv[])
umask(022);
if (debug == 0) {
daemon(0, 0);
......@@ -131,7 +131,7 @@
if (uid == 0) {
gid_t gid = getgid();
@@ -414,6 +419,15 @@ main(int argc, char *argv[])
@@ -420,6 +425,15 @@ main(int argc, char *argv[])
sa.sa_handler = SIG_IGN;
sigaction(SIGPIPE, &sa, &sapipe);
......@@ -147,8 +147,8 @@
for (;;) {
int n, ctrl = -1;
@@ -569,9 +583,6 @@ dg_badinput(struct sockaddr *sa)
return 0;
@@ -576,9 +590,6 @@ dg_badinput(struct sockaddr *sa)
goto bad;
}
- if (port < IPPORT_RESERVED || port == NFS_PORT)
......@@ -157,7 +157,7 @@
return (0);
bad:
@@ -581,6 +592,7 @@ bad:
@@ -588,6 +599,7 @@ bad:
int
dg_broadcast(struct in_addr *in)
{
......@@ -165,7 +165,7 @@
struct ifaddrs *ifa, *ifap;
struct sockaddr_in *sin;
@@ -597,6 +609,7 @@ dg_broadcast(struct in_addr *in)
@@ -604,6 +616,7 @@ dg_broadcast(struct in_addr *in)
}
}
freeifaddrs(ifap);
......@@ -173,16 +173,16 @@
return (0);
}
@@ -1843,7 +1856,7 @@ print_service(char *action, struct servt
@@ -1852,7 +1865,7 @@ print_service(char *action, struct servt
fprintf(stderr,
" wait.max=%hd.%d user:group=%s:%s builtin=%lx server=%s\n",
" wait.max=%d.%d user:group=%s:%s builtin=%lx server=%s\n",
sep->se_wait, sep->se_max, sep->se_user,
- sep->se_group ? sep->se_group : "wheel",
+ sep->se_group ? sep->se_group : "(default)",
(long)sep->se_bi, sep->se_server);
}
@@ -1951,6 +1964,7 @@ spawn(struct servtab *sep, int ctrl)
@@ -1960,6 +1973,7 @@ spawn(struct servtab *sep, int ctrl)
if (uid != pwd->pw_uid)
exit(1);
} else {
......@@ -190,7 +190,7 @@
tmpint = LOGIN_SETALL &
~(LOGIN_SETGROUP|LOGIN_SETLOGIN);
if (pwd->pw_uid)
@@ -1966,6 +1980,53 @@ spawn(struct servtab *sep, int ctrl)
@@ -1975,6 +1989,53 @@ spawn(struct servtab *sep, int ctrl)
sep->se_service, sep->se_proto);
exit(1);
}
......
--- a/inetd.8
+++ b/inetd.8
@@ -413,6 +413,11 @@ and IPv6 traffic will go to server on
@@ -405,6 +405,11 @@ and IPv6 traffic will go to server on
If you have only one server on
.Dq tcp6 ,
only IPv6 traffic will be routed to the server.
......@@ -14,16 +14,18 @@
.Xr fingerd 8 ,
--- a/inetd.c
+++ b/inetd.c
@@ -814,10 +814,14 @@ doconfig(void)
@@ -816,11 +816,15 @@ doconfig(void)
if (!port) {
/* XXX */
+ char *p;
+ unsigned char *p;
strncpy(protoname, sep->se_proto,
sizeof(protoname));
- if (isdigit(protoname[strlen(protoname) - 1]))
- if (isdigit((unsigned char)
- protoname[strlen(protoname) - 1]))
- protoname[strlen(protoname) - 1] = '\0';
+ for (p = protoname; *p; p++)
+ for (p = (unsigned char *)
+ protoname; *p; p++)
+ if (isdigit(*p)) {
+ *p = '\0';
+ break;
......@@ -31,7 +33,7 @@
sp = getservbyname(sep->se_service,
protoname);
if (sp == 0) {
@@ -1011,6 +1015,16 @@ setup(struct servtab *sep)
@@ -1015,6 +1019,16 @@ setup(struct servtab *sep)
sep->se_service, sep->se_proto);
return;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment