Fix compiler errors in python-kadmv

lib/py-python-kadmv/src/PyKAdminCommon.c

@@ -215,9 +215,8 @@ krb5_error_code pykadmin_unpack_xdr_osa_princ_ent_rec(PyKAdminObject *kadmin, kr
 
 */
 
-static kadm5_ret_t krb5_copy_key_data_contents(context, from, to)
-    krb5_context context;
-    krb5_key_data *from, *to;
+static kadm5_ret_t krb5_copy_key_data_contents(
+    krb5_context context, krb5_key_data *from, krb5_key_data *to)
 {
     int i, idx;
 
@@ -376,13 +375,14 @@ krb5_error_code pykadmin_kadm_from_kdb(PyKAdminObject *kadmin, krb5_db_entry *kd
             entry->key_data = calloc(entry->n_key_data, sizeof(krb5_key_data));
             if (!entry->key_data)
                 goto done;
-        } else
-            entry->key_data = NULL;
-
-            for (i = 0; i < entry->n_key_data; i++)
+            for (i = 0; i < entry->n_key_data; i++) {
                 retval = krb5_copy_key_data_contents(kadmin->context, &kdb->key_data[i], &entry->key_data[i]);
-        if (retval)
-            goto done;
+                if (retval)
+                    goto done;
+            }
+        } else {
+            entry->key_data = NULL;
+        }
     }
 
 

lib/py-python-kadmv/src/PyKAdminPrincipalObject.c

@@ -681,7 +681,7 @@ static PyObject *PyKAdminPrincipal_kt_add(PyKAdminPrincipalObject *self, PyObjec
     if (!PyArg_ParseTuple(args, "s", &keytab_str))
         return NULL;
 
-    if (*keytab_str == NULL) {
+    if (keytab_str == NULL) {
         PyKAdminError_raise_error(1, "empty keytab");
         result = NULL;
         return result;

lib/py-python-kadmv/src/PyKAdminXDR.c

@@ -36,7 +36,7 @@ int pykadmin_xdr_osa_princ_ent_rec(XDR *xdrs, osa_princ_ent_rec *entry) {
   if (!xdr_array(xdrs, (caddr_t *) &entry->old_keys, (unsigned int *) &entry->old_key_len, ~0, sizeof(osa_pw_hist_ent), pykadmin_xdr_osa_pw_hist_ent))
    	goto done;
 
-	result = 1;
+  result = 1;
 
 done:
 
@@ -109,8 +109,8 @@ int pykadmin_xdr_uint16(XDR *xdrs, unsigned int *data) {
 	return result;
 }
 
-int pykadmin_xdr_krb5_key_data(XDR *xdrs, krb5_key_data *key_data) {
-
+int pykadmin_xdr_krb5_key_data(XDR *xdrs, void *data) {
+    krb5_key_data *key_data = (krb5_key_data *)data;
     int result = 0;
     unsigned int temp;
 
@@ -145,9 +145,9 @@ int pykadmin_xdr_krb5_key_data(XDR *xdrs, krb5_key_data *key_data) {
 	return result;
 }
 
-int pykadmin_xdr_osa_pw_hist_ent(XDR *xdrs, osa_pw_hist_ent *pw_hist) {
-
-	int result = 0;
+int pykadmin_xdr_osa_pw_hist_ent(XDR *xdrs, void *data) {
+    osa_pw_hist_ent *pw_hist = (osa_pw_hist_ent *)data;
+    int result = 0;
     if (!xdr_array(xdrs, (caddr_t *) &pw_hist->key_data, (unsigned int *) &pw_hist->n_key_data, ~0, sizeof(krb5_key_data), pykadmin_xdr_krb5_key_data))
     	goto done;
 

lib/py-python-kadmv/src/PyKAdminXDR.h

@@ -29,9 +29,9 @@ typedef struct _osa_princ_ent_t {
 } osa_princ_ent_rec, *osa_princ_ent_t;
 
 int pykadmin_xdr_nullstring(XDR *xdrs, char **string);
-int pykadmin_xdr_osa_pw_hist_ent(XDR *xdrs, osa_pw_hist_ent *objp);
+int pykadmin_xdr_osa_pw_hist_ent(XDR *xdrs, void *objp);
 int pykadmin_xdr_osa_princ_ent_rec(XDR *xdrs, osa_princ_ent_rec *entry);
 
 void pykadmin_xdr_osa_free_princ_ent(osa_princ_ent_rec *entry); 
 
-#endif
+#endif

lib/py-python-kadmv/src/getdate.y

@@ -107,9 +107,6 @@ struct my_timeb {
 #define bcopy(from, to, len) memcpy ((to), (from), (len))
 #endif
 
-extern struct tm	*gmtime();
-extern struct tm	*localtime();
-
 #define yyparse getdate_yyparse
 #define yylex getdate_yylex
 #define yyerror getdate_yyerror