Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve conflict from the import.

This commit is contained in:
veego 1998-07-12 15:01:49 +00:00
parent 2e7d01894c
commit dd81fd7d91
4 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
usr.sbin/ipf/ipfstat/fils.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fils.c,v 1.13 1998/05/17 16:51:09 veego Exp $ */
/* $NetBSD: fils.c,v 1.14 1998/07/12 15:01:49 veego Exp $ */
/*
* Copyright (C) 1993-1997 by Darren Reed.
@ -48,7 +48,7 @@
#if !defined(lint)
static const char sccsid[] = "@(#)fils.c 1.21 4/20/96 (C) 1993-1996 Darren Reed";
static const char rcsid[] = "@(#)Id: fils.c,v 2.0.2.25.2.2 1997/11/20 12:41:04 darrenr Exp ";
static const char rcsid[] = "@(#)Id: fils.c,v 2.0.2.25.2.4 1998/06/08 06:58:12 darrenr Exp ";
#endif
#ifdef _PATH_UNIX
#define VMUNIX _PATH_UNIX
@ -449,6 +449,13 @@ ips_stat_t *ipsp;
PRINTF("\n");
/* ... phil@ultimate.com */
PRINTF("\tpkt_flags & %x = %x,\t", ips.is_flags & 0xf,
ips.is_flags >> 4);
PRINTF("\tpkt_options & %x = %x\n", ips.is_optmsk,
ips.is_opt);
PRINTF("\tpkt_security & %x = %x, pkt_auth & %x = %x\n",
ips.is_secmsk, ips.is_sec, ips.is_authmsk,
ips.is_auth);
istab[i] = ips.is_next;
}
}

2
usr.sbin/ipf/ipnat/ipnat.5
View File

@ -1,3 +1,5 @@
.\" $NetBSD: ipnat.5,v 1.8 1998/07/12 15:05:25 veego Exp $
.\"
.TH IPNAT 5
.SH NAME
ipnat, ipnat.conf \- IP NAT file format

9
usr.sbin/ipf/ipnat/ipnat.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ipnat.c,v 1.18 1998/05/29 20:52:04 veego Exp $ */
/* $NetBSD: ipnat.c,v 1.19 1998/07/12 15:02:44 veego Exp $ */
/*
* Copyright (C) 1993-1997 by Darren Reed.
@ -64,7 +64,7 @@ extern char *sys_errlist[];
#if !defined(lint)
static const char sccsid[] ="@(#)ipnat.c 1.9 6/5/96 (C) 1993 Darren Reed";
static const char rcsid[] = "@(#)Id: ipnat.c,v 2.0.2.21.2.6 1998/05/23 19:07:02 darrenr Exp ";
static const char rcsid[] = "@(#)Id: ipnat.c,v 2.0.2.21.2.8 1998/06/06 14:39:56 darrenr Exp ";
#endif
@ -371,7 +371,7 @@ int fd, opts;
ntohs(nat.nat_outport));
printf(" [%s %hu]", inet_ntoa(nat.nat_oip),
ntohs(nat.nat_oport));
printf(" %ld %hu %d", nat.nat_age,
printf(" %ld %hu %x", nat.nat_age,
nat.nat_use, nat.nat_sumd);
#if SOLARIS
printf(" %lx", nat.nat_ipsumd);
@ -702,6 +702,9 @@ char *line;
"missing parameter for \"proxy\"\n");
return NULL;
}
} else {
fprintf(stderr, "missing keyword \"port\"\n");
return NULL;
}
if ((proto = index(s, '/'))) {
*proto++ = '\0';

2
usr.sbin/ipf/rules/mkfilters.1
View File

@ -1,4 +1,4 @@
.\" $NetBSD: mkfilters.1,v 1.4 1998/05/17 16:55:03 veego Exp $
.\" $NetBSD: mkfilters.1,v 1.5 1998/07/12 15:06:36 veego Exp $
.\"
.TH MKFILTERS 1
.SH NAME