[grsec] gradm-2.1.6 corrections

[Peter S. Mazinger]

Hello Brad!

The attached patch corrects all warning in gradm. Building w/ byacc is ok, 
using bison-1.35 fails:
grlearn2_config.y:28/29/30/31/32/38: type clash (`' `string') on default 
action

Peter

-- 
Peter S. Mazinger <ps dot m at gmx dot net>           ID: 0xA5F059F2
Key fingerprint = 92A4 31E1 56BC 3D5A 2D08  BB6E C389 975E A5F0 59F2
-------------- next part --------------
--- gradm2/gradm_adm.c.mps	Thu Jun  9 13:45:55 2005
+++ gradm2/gradm_adm.c	Thu Jun  9 13:46:07 2005
@@ -114,7 +114,6 @@
 void
 add_gradm_pam_acl(struct role_acl *role)
 {
-	struct stat fstat;
 	struct ip_acl ip;
 	struct protoent *proto;
 
--- gradm2/gradm_parse.c.mps	Thu Jun  9 13:46:23 2005
+++ gradm2/gradm_parse.c	Thu Jun  9 13:47:45 2005
@@ -790,7 +790,7 @@
 	     (GR_ROLE_AUTH | GR_ROLE_PAM)) ||
 	    ((retmode & (GR_ROLE_NOPW | GR_ROLE_AUTH | GR_ROLE_PAM)) ==
 	     (GR_ROLE_NOPW | GR_ROLE_PAM))) {
-		fprintf(stderr, "Error on line %lu of %s.  The role mode must contain only one of the auth, noauth, and pamauth modes.\n");
+		fprintf(stderr, "Error on line %lu of %s.  The role mode must contain only one of the auth, noauth, and pamauth modes.\n", lineno, current_acl_file);
 		exit(EXIT_FAILURE);
 	}
 
--- gradm2/grlearn2_config.y.mps	Thu Jun  9 14:01:38 2005
+++ gradm2/grlearn2_config.y	Thu Jun  9 14:01:14 2005
@@ -2,6 +2,7 @@
 #include "gradm.h"
 extern int grlearn_configlex(void);
 extern void add_always_reduce(char *str);
+extern void grlearn_configerror(const char *s);
 
 #define grlearn2_configerror grlearn_configerror
 #define grlearn2_configlex grlearn_configlex
--- gradm2/grlearn.c.mps	Thu Jun  9 13:54:35 2005
+++ gradm2/grlearn.c	Thu Jun  9 13:57:11 2005
@@ -15,6 +15,7 @@
 static int fd2 = -1;
 
 extern FILE *grlearn_configin;
+extern int grlearn2_configparse(void);
 
 static void parse_learn2_config(void)
 {
@@ -185,7 +186,6 @@
 	char *endobj;
 	char *next;
 	unsigned int len;
-	unsigned int ourlen = 0;
 	struct always_reduce_entry *arep;
 
 	for (i = 0; i < 8; i++) {