Fix void use. Add some missing prototypes and includes.

6 files changed, 92 insertions, 5 deletions

diff --git a/net/tacacs/distinfo b/net/tacacs/distinfo
index 00d31b290e7..a2364441895 100644
--- a/net/tacacs/distinfo
+++ b/net/tacacs/distinfo
@@ -1,11 +1,15 @@
-$NetBSD: distinfo,v 1.5 2007/09/23 16:25:01 obache Exp $
+$NetBSD: distinfo,v 1.6 2013/01/11 00:03:30 joerg Exp $
 
 SHA1 (tac_plus.F4.0.4.alpha.tar.Z) = 23ccb0b7db6909bd45dcf6762ef32917d3465dd6
 RMD160 (tac_plus.F4.0.4.alpha.tar.Z) = 733fbac017cfd2efcd7b5e80e1747bdd0c6fd60e
 Size (tac_plus.F4.0.4.alpha.tar.Z) = 193771 bytes
 SHA1 (patch-aa) = daaf8f737441d17b1339bb1c6b7f865a95f706bc
-SHA1 (patch-ab) = 52ccf27a6a904d6e9c6dd6044784c7c4e0126000
+SHA1 (patch-ab) = f8e08d64045348ba034c277c790a55c16d4afac1
 SHA1 (patch-ac) = 11ea986ede6d2a277747cd9abc3bdcade1bf1e7a
 SHA1 (patch-ad) = 9cfabd64567a29f825edc487ddeb2d173a3e883f
 SHA1 (patch-ae) = 67305db0c6dd64b33c00b8dc5dbb3c40fa50e094
 SHA1 (patch-af) = 82c68318bb9290a9ebf7c31baa8d7983b24c6827
+SHA1 (patch-dump.c) = 05a5989f26857f7724c1c81f9f76c8a56eb00d7a
+SHA1 (patch-maxsess.c) = 5f62897318d85ea416091b1a13c771cf7c693a51
+SHA1 (patch-packet.c) = 1cda78ae1084332f012c7ed41f5210a4b57f4f3c
+SHA1 (patch-utils.c) = c1a190fba6b15bd10d0b0f4c62c3802e7c924d8f
diff --git a/net/tacacs/patches/patch-ab b/net/tacacs/patches/patch-ab
index da17c651f83..97d62b1521b 100644
--- a/net/tacacs/patches/patch-ab
+++ b/net/tacacs/patches/patch-ab
@@ -1,8 +1,14 @@
-$NetBSD: patch-ab,v 1.2 2005/12/18 19:23:04 joerg Exp $
+$NetBSD: patch-ab,v 1.3 2013/01/11 00:03:30 joerg Exp $
 
 --- tac_plus.h.orig	2000-06-18 17:26:54.000000000 +0000
 +++ tac_plus.h
-@@ -79,6 +79,7 @@
+@@ -74,11 +74,13 @@
+ /*
+  * System definitions. 
+  */
++#include <stdlib.h>
+ 
+ #ifdef NETBSD
  #define STDLIB_MALLOC
  #define NO_PWAGE
  #define CONST_SYSERRLIST
@@ -10,7 +16,7 @@ $NetBSD: patch-ab,v 1.2 2005/12/18 19:23:04 joerg Exp $
  #define VOIDSIG
  #endif
  
-@@ -689,12 +690,13 @@ extern void parser_init();
+@@ -689,12 +691,13 @@ extern void parser_init();
  extern void set_expiration_status();
  
  /* miscellaneous */
@@ -25,3 +31,13 @@ $NetBSD: patch-ab,v 1.2 2005/12/18 19:23:04 joerg Exp $
  extern int sendauth_fn();
  extern int sendpass_fn();
  extern int enable_fn();
+@@ -734,3 +737,9 @@ extern struct timeval started_at;
+ extern char *logfile;
+ extern char *wtmpfile;
+ extern int wtmpfd;
++
++void dump_nas_pak(u_char *);
++void dump_tacacs_pak(u_char *pak);
++void tac_exit(int status);
++void send_error_reply(int type, char *msg);
++void loguser(struct acct_rec *rec);
diff --git a/net/tacacs/patches/patch-dump.c b/net/tacacs/patches/patch-dump.c
new file mode 100644
index 00000000000..d3b9613a8ae
--- /dev/null
+++ b/net/tacacs/patches/patch-dump.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-dump.c,v 1.1 2013/01/11 00:03:30 joerg Exp $
+
+--- dump.c.orig	2013-01-10 22:32:13.000000000 +0000
++++ dump.c
+@@ -119,8 +119,7 @@ u_char *pak;
+ 
+ 
+ /* Dump packets originated by a NAS */
+-dump_nas_pak(pak)
+-u_char *pak;
++void dump_nas_pak(u_char *pak)
+ {
+     struct authen_start *start;
+     struct authen_cont *cont;
+@@ -377,8 +376,7 @@ u_char *pak;
+ 
+ /* Dump packets originated by Tacacsd  */
+ 
+-dump_tacacs_pak(pak)
+-u_char *pak;
++void dump_tacacs_pak(u_char *pak)
+ {
+     struct authen_reply *authen;
+     struct author_reply *author;
diff --git a/net/tacacs/patches/patch-maxsess.c b/net/tacacs/patches/patch-maxsess.c
new file mode 100644
index 00000000000..8e52bb0f078
--- /dev/null
+++ b/net/tacacs/patches/patch-maxsess.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-maxsess.c,v 1.1 2013/01/11 00:03:30 joerg Exp $
+
+--- maxsess.c.orig	2013-01-10 22:38:52.000000000 +0000
++++ maxsess.c
+@@ -220,8 +220,7 @@ struct identity *idp;
+  * Given a start or a stop accounting record, update the file of
+  * records which tracks who's logged on and where.
+  */
+-loguser(rec)
+-struct acct_rec *rec;
++void loguser(struct acct_rec *rec)
+ {
+     struct identity *idp;
+     int i;
diff --git a/net/tacacs/patches/patch-packet.c b/net/tacacs/patches/patch-packet.c
new file mode 100644
index 00000000000..b28177c3d64
--- /dev/null
+++ b/net/tacacs/patches/patch-packet.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-packet.c,v 1.1 2013/01/11 00:03:30 joerg Exp $
+
+--- packet.c.orig	2013-01-10 22:38:16.000000000 +0000
++++ packet.c
+@@ -520,9 +520,7 @@ u_char *pak;
+     return (0);
+ }
+ 
+-send_error_reply(type, msg)
+-int type;
+-char *msg;
++void send_error_reply(int type, char *msg)
+ {
+     switch (type) {
+     case TAC_PLUS_AUTHEN:
diff --git a/net/tacacs/patches/patch-utils.c b/net/tacacs/patches/patch-utils.c
new file mode 100644
index 00000000000..481de8447d8
--- /dev/null
+++ b/net/tacacs/patches/patch-utils.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-utils.c,v 1.1 2013/01/11 00:03:30 joerg Exp $
+
+--- utils.c.orig	2013-01-10 22:38:34.000000000 +0000
++++ utils.c
+@@ -71,8 +71,7 @@ int size;
+     return (p);
+ }
+ 
+-tac_exit(status)
+-int status;
++void tac_exit(int status)
+ {
+     if (debug & DEBUG_FORK_FLAG)
+ 	report(LOG_DEBUG, "exit status=%d", status);