* ss_wrapper.c: Include kadmin.h

	* kadmin.c, keytab.c: Warning cleanup of shadowing variables,
 	missing prototypes, assignments within conditionals. variables
 	type mismatches.

	* getdate.y: Prototypes in file are for getdate_yylex() and
 	getdaye_yyerror() and not yylex()/yyerror().

	* kadmin.h: New header file with ss callback prototypes and global
 	variables.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13026 dc483132-0cff-0310-8789-dd5450dbe970

1 files changed, 50 insertions, 40 deletions

diff --git a/src/kadmin/cli/kadmin.c b/src/kadmin/cli/kadmin.c
index 87feb9af5..0c223e04e 100644
--- a/src/kadmin/cli/kadmin.c
+++ b/src/kadmin/cli/kadmin.c
@@ -28,6 +28,7 @@
 #include <krb5.h>
 #include <k5-int.h>
 #include <kadm5/admin.h>
+#include <krb5/adm_proto.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
@@ -36,6 +37,7 @@
 #include <pwd.h>
 /* #include <sys/timeb.h> */
 #include <time.h>
+#include "kadmin.h"
 
 /* special struct to convert flag names for principals
    to actual krb5_flags for a principal */
@@ -91,7 +93,7 @@ void *handle = NULL;
 krb5_context context;
 char *ccache_name = NULL;
 
-void usage()
+static void usage()
 {
     fprintf(stderr,
 	 "Usage: %s [-r realm] [-p principal] [-q query] [clnt|local args]\n"
@@ -100,7 +102,7 @@ void usage()
     exit(1);
 }
 
-char *strdur(duration)
+static char *strdur(duration)
     time_t duration;
 {
     static char out[50];
@@ -124,7 +126,7 @@ char *strdur(duration)
     return out;
 }
 
-char *strdate(when)
+static char *strdate(when)
     krb5_timestamp when;
 {
     struct tm *tm;
@@ -138,7 +140,8 @@ char *strdate(when)
 
 /* this is a wrapper to go around krb5_parse_principal so we can set
    the default realm up properly */
-krb5_error_code kadmin_parse_name(name, principal)
+static krb5_error_code 
+kadmin_parse_name(name, principal)
     char *name;
     krb5_principal *principal;
 {
@@ -184,7 +187,8 @@ char *kadmin_startup(argc, argv)
 
     memset((char *) &params, 0, sizeof(params));
     
-    if (retval = krb5_init_context(&context)) {
+    retval = krb5_init_context(&context);
+    if (retval) {
 	 com_err(whoami, retval, "while initializing krb5 library");
 	 exit(1);
     }
@@ -260,13 +264,13 @@ char *kadmin_startup(argc, argv)
      * argument or the default.
      */
     if (ccache_name == NULL) {
-	 if (retval = krb5_cc_default(context, &cc)) {
+	 if ((retval = krb5_cc_default(context, &cc))) {
 	      com_err(whoami, retval,
 		      "while opening default credentials cache");
 	      exit(1);
 	 }
     } else {
-	 if (retval = krb5_cc_resolve(context, ccache_name, &cc)) {
+	 if ((retval = krb5_cc_resolve(context, ccache_name, &cc))) {
 	      com_err(whoami, retval,
 		      "while opening credentials cache %s", ccache_name);
 	      exit(1);
@@ -287,7 +291,7 @@ char *kadmin_startup(argc, argv)
     if (princstr == NULL) {
 	if (ccache_name != NULL &&
 	    !krb5_cc_get_principal(context, cc, &princ)) {
-	     if (retval = krb5_unparse_name(context, princ, &princstr)) {
+	     if ((retval = krb5_unparse_name(context, princ, &princstr))) {
 		  com_err(whoami, retval,
 			  "while canonicalizing principal name");
 		  krb5_free_principal(context, princ);
@@ -296,16 +300,16 @@ char *kadmin_startup(argc, argv)
 	     krb5_free_principal(context, princ);
 	     freeprinc++;
 	} else if (use_keytab != 0) {
-	     if (retval = krb5_sname_to_principal(context, NULL,
-						  "host",
-						  KRB5_NT_SRV_HST,
-						  &princ)) {
+	     if ((retval = krb5_sname_to_principal(context, NULL,
+						   "host",
+						   KRB5_NT_SRV_HST,
+						   &princ))) {
 		  com_err(whoami, retval,
 			  "creating host service principal");
 		  exit(1);
 	     }
-	     if (retval = krb5_unparse_name(context, princ, &princstr)) {
-		  com_err(whoami, retval,
+	     if ((retval = krb5_unparse_name(context, princ, &princstr))) {
+	          com_err(whoami, retval,
 			  "while canonicalizing principal name");
 		  krb5_free_principal(context, princ);
 		  exit(1);
@@ -354,7 +358,7 @@ char *kadmin_startup(argc, argv)
 	    free(canon);
 	    krb5_free_principal(context, princ);
 	    freeprinc++;
-	} else if (luser = getenv("USER")) {
+	} else if ((luser = getenv("USER"))) {
 	    princstr = (char *) malloc(strlen(luser) + 7 /* "/admin@" */
 			      + strlen(def_realm) + 1);
 	    if (princstr == NULL) {
@@ -366,7 +370,7 @@ char *kadmin_startup(argc, argv)
 	    strcat(princstr, "@");
 	    strcat(princstr, def_realm);
 	    freeprinc++;
-	} else if (pw = getpwuid(getuid())) {
+	} else if ((pw = getpwuid(getuid()))) {
 	    princstr = (char *) malloc(strlen(pw->pw_name) + 7 /* "/admin@" */
 			      + strlen(def_realm) + 1);
 	    if (princstr == NULL) {
@@ -436,14 +440,14 @@ char *kadmin_startup(argc, argv)
     if (freeprinc)
 	free(princstr);
 
-    if (retval = krb5_cc_close(context, cc)) {
+    if ((retval = krb5_cc_close(context, cc))) {
 	 com_err(whoami, retval, "while closing ccache %s",
 		 ccache_name);
 	 exit(1);
     }
 
     /* register the WRFILE keytab type and set it as the default */
-    if (retval = krb5_kt_register(context, &krb5_ktf_writable_ops)) {
+    if ((retval = krb5_kt_register(context, &krb5_ktf_writable_ops))) {
 	 com_err(whoami, retval,
 		 "while registering writable key table functions");
 	 exit(1);
@@ -531,7 +535,8 @@ void kadmin_cpw(argc, argv)
     static char prompt1[1024], prompt2[1024];
     char *canon;
     char *pwarg = NULL;
-    int n_ks_tuple = 0, keepold = 0, randkey = 0;
+    int n_ks_tuple = 0, randkey = 0;
+    krb5_boolean keepold = FALSE;
     krb5_key_salt_tuple *ks_tuple = NULL;
     krb5_principal princ;
     
@@ -553,7 +558,7 @@ void kadmin_cpw(argc, argv)
 	    continue;
 	}
 	if (!strcmp("-keepold", *argv)) {
-	    keepold++;
+	    keepold = TRUE;
 	    continue;
 	}
 	if (!strcmp("-e", *argv)) {
@@ -681,8 +686,9 @@ void kadmin_cpw(argc, argv)
    }
 }
 
-int kadmin_parse_princ_args(argc, argv, oprinc, mask, pass, randkey,
-			    ks_tuple, n_ks_tuple, caller)
+static int 
+kadmin_parse_princ_args(argc, argv, oprinc, mask, pass, randkey,
+			ks_tuple, n_ks_tuple, caller)
     int argc;
     char *argv[];
     kadm5_principal_ent_t oprinc;
@@ -828,14 +834,14 @@ int kadmin_parse_princ_args(argc, argv, oprinc, mask, pass, randkey,
 	    if (strlen(argv[i]) == flags[j].flaglen + 1 &&
 		!strcmp(flags[j].flagname,
 			&argv[i][1] /* strip off leading + or - */)) {
-		if (flags[j].set && argv[i][0] == '-' ||
-		    !flags[j].set && argv[i][0] == '+') {
+		if ((flags[j].set && argv[i][0] == '-') ||
+		    (!flags[j].set && argv[i][0] == '+')) {
 		    oprinc->attributes |= flags[j].theflag;
 		    *mask |= KADM5_ATTRIBUTES;
 		    attrib_set++;
 		    break;
-		} else if (flags[j].set && argv[i][0] == '+' ||
-			   !flags[j].set && argv[i][0] == '-') {
+		} else if ((flags[j].set && argv[i][0] == '+') ||
+			   (!flags[j].set && argv[i][0] == '-')) {
 		    oprinc->attributes &= ~flags[j].theflag;
 		    *mask |= KADM5_ATTRIBUTES;
 		    attrib_set++;
@@ -859,7 +865,8 @@ int kadmin_parse_princ_args(argc, argv, oprinc, mask, pass, randkey,
     return 0;
 }
 
-void kadmin_addprinc_usage(func)
+static void 
+kadmin_addprinc_usage(func)
    char *func;
 {
      fprintf(stderr, "usage: %s [options] principal\n", func);
@@ -872,7 +879,8 @@ void kadmin_addprinc_usage(func)
 	     "\t\trequires_hwauth needchange allow_svr password_changing_service\n");
 }
 
-void kadmin_modprinc_usage(func)
+static void 
+kadmin_modprinc_usage(func)
    char *func;
 {
      fprintf(stderr, "usage: %s [options] principal\n", func);
@@ -954,7 +962,7 @@ void kadmin_addprinc(argc, argv)
 	mask |= KADM5_ATTRIBUTES;
 	pass = dummybuf;
     } else if (pass == NULL) {
-	unsigned int i = sizeof (newpw) - 1;
+	unsigned int sz = sizeof (newpw) - 1;
 	
 	sprintf(prompt1, "Enter password for principal \"%.900s\": ",
 		canon);
@@ -962,7 +970,7 @@ void kadmin_addprinc(argc, argv)
 		"Re-enter password for principal \"%.900s\": ",
 		canon);
 	retval = krb5_read_password(context, prompt1, prompt2,
-				    newpw, &i);
+				    newpw, &sz);
 	if (retval) {
 	    com_err("add_principal", retval,
 		    "while reading password for \"%s\".", canon);
@@ -1233,15 +1241,15 @@ void kadmin_getprincs(argc, argv)
     char *argv[];
 {
     krb5_error_code retval;
-    char *exp, **names;
+    char *expr, **names;
     int i, count;
 
-    exp = NULL;
-    if (! (argc == 1 || (argc == 2 && (exp = argv[1])))) {
+    expr = NULL;
+    if (! (argc == 1 || (argc == 2 && (expr = argv[1])))) {
 	fprintf(stderr, "usage: get_principals [expression]\n");
 	return;
     }
-    retval = kadm5_get_principals(handle, exp, &names, &count);
+    retval = kadm5_get_principals(handle, expr, &names, &count);
     if (retval) {
 	com_err("get_principals", retval, "while retrieving list.");
 	return;
@@ -1251,7 +1259,8 @@ void kadmin_getprincs(argc, argv)
     kadm5_free_name_list(handle, names, count);
 }
 
-int kadmin_parse_policy_args(argc, argv, policy, mask, caller)
+static int 
+kadmin_parse_policy_args(argc, argv, policy, mask, caller)
     int argc;
     char *argv[];
     kadm5_policy_ent_t policy;
@@ -1332,7 +1341,8 @@ int kadmin_parse_policy_args(argc, argv, policy, mask, caller)
 	return 0;
 }
 
-void kadmin_addmodpol_usage(func)
+static void 
+kadmin_addmodpol_usage(func)
    char *func;
 {
      fprintf(stderr, "usage; %s [options] policy\n", func);
@@ -1461,15 +1471,15 @@ void kadmin_getpols(argc, argv)
     char *argv[];
 {
     krb5_error_code retval;
-    char *exp, **names;
+    char *expr, **names;
     int i, count;
 
-    exp = NULL;
-    if (! (argc == 1 || (argc == 2 && (exp = argv[1])))) {
+    expr = NULL;
+    if (! (argc == 1 || (argc == 2 && (expr = argv[1])))) {
 	fprintf(stderr, "usage: get_policies [expression]\n");
 	return;
     }
-    retval = kadm5_get_policies(handle, exp, &names, &count);
+    retval = kadm5_get_policies(handle, expr, &names, &count);
     if (retval) {
 	com_err("get_policies", retval, "while retrieving list.");
 	return;