Re: Slight tree breakage

[Andrey Smagin <andrey@smagin.com>]

On Thu, 31 Jul 2003 23:16:58 -0400
"STeve Andre'" <andres@msu.edu> wrote:

> ===> usr.sbin/authpf
> cc -O2   -I/usr/src/usr.sbin/authpf/../../sbin/pfctl -Wall -Werror  
> -c /usr/src/usr.sbin/authpf/authpf.c
> /usr/src/usr.sbin/authpf/authpf.c:853: conflicting types for 
> `pfctl_define_table'
> /usr/src/usr.sbin/authpf/../../sbin/pfctl/pfctl_parser.h:169:
> previous declaration of `pfctl_define_table'

The last commit to pfctl_parser.h did it...
http://www.openbsd.org/cgi-bin/cvsweb/src/sbin/pfctl/pfctl_parser.h
   "Make table tickets per-ruleset instead of global.
    Make table tickets u_int32_t for consistency with other parts of PF.
    Ok dhartmei@ henning@"


Fix:

Index: usr.sbin/authpf/authpf.c
===================================================================
RCS file: /cvs/src/usr.sbin/authpf/authpf.c,v
retrieving revision 1.66
diff -u -r1.66 authpf.c
--- usr.sbin/authpf/authpf.c	11 Jul 2003 08:29:34 -0000	1.66
+++ usr.sbin/authpf/authpf.c	1 Aug 2003 03:55:42 -0000
@@ -849,7 +849,7 @@
 
 int
 pfctl_define_table(char *name, int flags, int addrs, const char *anchor,
-    const char *ruleset, struct pfr_buffer *ab, int ticket)
+    const char *ruleset, struct pfr_buffer *ab, u_int32_t ticket)
 {
 	fprintf(stderr, "table definitions not yet supported in authpf\n");
 	return (1);