Index: stable/10/contrib/ipfilter/lib/ipf_perror.c
===================================================================
--- stable/10/contrib/ipfilter/lib/ipf_perror.c	(revision 318389)
+++ stable/10/contrib/ipfilter/lib/ipf_perror.c	(revision 318390)
@@ -1,47 +1,47 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include "ipf.h"
 
 void
 ipf_perror(err, string)
 	int err;
 	char *string;
 {
 	if (err == 0)
 		fprintf(stderr, "%s\n", string);
 	else
-		fprintf(stderr, "%s %s\n", string, ipf_strerror(err));
+		fprintf(stderr, "%s: %s\n", string, ipf_strerror(err));
 }
 
 int
 ipf_perror_fd(fd, iocfunc, string)
 	int fd;
 	ioctlfunc_t iocfunc;
 	char *string;
 {
 	int save;
 	int realerr;
 
 	save = errno;
 	if ((*iocfunc)(fd, SIOCIPFINTERROR, &realerr) == -1)
 		realerr = 0;
 
 	errno = save;
 	fprintf(stderr, "%d:", realerr);
 	ipf_perror(realerr, string);
 	return realerr ? realerr : save;
 
 }
 
 void
 ipferror(fd, msg)
 	int fd;
 	char *msg;
 {
 	if (fd >= 0) {
 		ipf_perror_fd(fd, ioctl, msg);
 	} else {
 		fprintf(stderr, "0:");
 		perror(msg);
 	}
 }
Index: stable/10
===================================================================
--- stable/10	(revision 318389)
+++ stable/10	(revision 318390)

Property changes on: stable/10
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r318281
Index: stable/11/contrib/ipfilter/lib/ipf_perror.c
===================================================================
--- stable/11/contrib/ipfilter/lib/ipf_perror.c	(revision 318389)
+++ stable/11/contrib/ipfilter/lib/ipf_perror.c	(revision 318390)
@@ -1,47 +1,47 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include "ipf.h"
 
 void
 ipf_perror(err, string)
 	int err;
 	char *string;
 {
 	if (err == 0)
 		fprintf(stderr, "%s\n", string);
 	else
-		fprintf(stderr, "%s %s\n", string, ipf_strerror(err));
+		fprintf(stderr, "%s: %s\n", string, ipf_strerror(err));
 }
 
 int
 ipf_perror_fd(fd, iocfunc, string)
 	int fd;
 	ioctlfunc_t iocfunc;
 	char *string;
 {
 	int save;
 	int realerr;
 
 	save = errno;
 	if ((*iocfunc)(fd, SIOCIPFINTERROR, &realerr) == -1)
 		realerr = 0;
 
 	errno = save;
 	fprintf(stderr, "%d:", realerr);
 	ipf_perror(realerr, string);
 	return realerr ? realerr : save;
 
 }
 
 void
 ipferror(fd, msg)
 	int fd;
 	char *msg;
 {
 	if (fd >= 0) {
 		ipf_perror_fd(fd, ioctl, msg);
 	} else {
 		fprintf(stderr, "0:");
 		perror(msg);
 	}
 }
Index: stable/11
===================================================================
--- stable/11	(revision 318389)
+++ stable/11	(revision 318390)

Property changes on: stable/11
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r318281