diff options
author | Henning Brauer <henning@cvs.openbsd.org> | 2003-10-08 14:47:58 +0000 |
---|---|---|
committer | Henning Brauer <henning@cvs.openbsd.org> | 2003-10-08 14:47:58 +0000 |
commit | 5e9a03443ac47ea447e675721d16139b979f0901 (patch) | |
tree | e532b1ad2e10df2a0e46cfa8cd463d8e12be2d39 | |
parent | 2cf854f09103031e7cd807730df36b1b9534f687 (diff) |
fix cedric's breakage:
int is not the same as u_long
caused an integer overflow on our 64 bit archs and thus made pf not working
there
ok mcbride@ marc@ millert@ cedric@
-rw-r--r-- | sbin/pfctl/pfctl.h | 4 | ||||
-rw-r--r-- | sbin/pfctl/pfctl_parser.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sbin/pfctl/pfctl.h b/sbin/pfctl/pfctl.h index cc18acf7039..9568b153470 100644 --- a/sbin/pfctl/pfctl.h +++ b/sbin/pfctl/pfctl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pfctl.h,v 1.26 2003/09/26 21:44:09 cedric Exp $ */ +/* $OpenBSD: pfctl.h,v 1.27 2003/10/08 14:47:57 henning Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -115,6 +115,6 @@ int pfctl_cmdline_symset(char *); int pfctl_add_trans(struct pfr_buffer *, int, const char *, const char *); u_int32_t pfctl_get_ticket(struct pfr_buffer *, int, const char *, const char *); -int pfctl_trans(int, struct pfr_buffer *, int, int); +int pfctl_trans(int, struct pfr_buffer *, u_long, int); #endif /* _PFCTL_H_ */ diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c index 24d5c3fc13c..026f6818a89 100644 --- a/sbin/pfctl/pfctl_parser.c +++ b/sbin/pfctl/pfctl_parser.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfctl_parser.c,v 1.176 2003/09/26 21:44:09 cedric Exp $ */ +/* $OpenBSD: pfctl_parser.c,v 1.177 2003/10/08 14:47:57 henning Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -1317,7 +1317,7 @@ pfctl_get_ticket(struct pfr_buffer *buf, int rs_num, const char *anchor, } int -pfctl_trans(int dev, struct pfr_buffer *buf, int cmd, int from) +pfctl_trans(int dev, struct pfr_buffer *buf, u_long cmd, int from) { struct pfioc_trans trans; |