Fixed some compiler warning issues

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/mkey_migrate@21743 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/kadmin/dbutil/kdb5_mkey.c b/src/kadmin/dbutil/kdb5_mkey.c
index 2d489669051b9e670baa225a476d25609ff74912..6860d96c59569c1196a7f5d457c7209a6bac52c2 100644 (file)
--- a/src/kadmin/dbutil/kdb5_mkey.c
+++ b/src/kadmin/dbutil/kdb5_mkey.c
@@ -333,7 +333,7 @@ kdb5_use_mkey(int argc, char *argv[])
     krb5_kvno  use_kvno;
     krb5_timestamp now, start_time;
     krb5_actkvno_node *actkvno_list, *new_actkvno_list_head, *new_actkvno,
-                        *prev_actkvno, *cur_actkvno;
+                      *prev_actkvno, *cur_actkvno;
     krb5_db_entry master_entry;
     int   nentries = 0;
     krb5_boolean more = 0;

diff --git a/src/kadmin/dbutil/kdb5_util.c b/src/kadmin/dbutil/kdb5_util.c
index ee6513a3bf6a484c4f127dc33636644411ff3a0e..3fc489f4559de61cca5be5be39ffa2ecaa29aa27 100644 (file)
--- a/src/kadmin/dbutil/kdb5_util.c
+++ b/src/kadmin/dbutil/kdb5_util.c
@@ -89,7 +89,9 @@ void usage()
             "\t        [-mkey_convert] [-new_mkey_file mkey_file]\n"
             "\t        [-rev] [-recurse] [filename [princs...]]\n"
             "\tload    [-old] [-ov] [-b6] [-verbose] [-update] filename\n"
-            "\tark     [-e etype_list] principal\n"
+            "\tark     [-e etype_list] principal\n");
+     /* avoid a string length compiler warning */
+     fprintf(stderr,
             "\nwhere,\n\t[-x db_args]* - any number of database specific arguments.\n"
             "\t\t\tLook at each database documentation for supported arguments\n");
      exit(1);

diff --git a/src/kdc/do_tgs_req.c b/src/kdc/do_tgs_req.c
index 24136c374f00c12d3acb66d5133bd9410a098bb9..3812698808d5bccdc79d55f16e5b6f79bcf5d1d1 100644 (file)
--- a/src/kdc/do_tgs_req.c
+++ b/src/kdc/do_tgs_req.c
@@ -98,7 +98,7 @@ process_tgs_req(krb5_data *pkt, const krb5_fulladdr *from,
     int nprincs = 0;
     krb5_boolean more;
     krb5_timestamp kdc_time, authtime=0;
-    krb5_keyblock session_key, *tmp_mkey;
+    krb5_keyblock session_key;
     krb5_timestamp until, rtime;
     krb5_keyblock encrypting_key;
     krb5_key_data  *server_key;

diff --git a/src/kdc/kdc_preauth.c b/src/kdc/kdc_preauth.c
index 1f23b716a77ecf4f9a1e9f5abbf0bd550094a3c6..d1acf01e1d913e00719f9deb8a438fb6afd346ae 100644 (file)
--- a/src/kdc/kdc_preauth.c
+++ b/src/kdc/kdc_preauth.c
@@ -667,6 +667,7 @@ get_entry_data(krb5_context context,
     krb5_deltat *delta;
     krb5_keyblock *keys, *tmp_mkey;
     krb5_key_data *entry_key;
+    krb5_error_code error;
 
     switch (type) {
     case krb5plugin_preauth_entry_request_certificate:
@@ -700,8 +701,10 @@ get_entry_data(krb5_context context,
        ret->data = (char *) keys;
        ret->length = sizeof(krb5_keyblock) * (request->nktypes + 1);
        memset(ret->data, 0, ret->length);
-       if ((ret = krb5_dbe_find_mkey(context, master_keylist, &entry, &tmp_mkey)))
-           return (ret);
+       if ((error = krb5_dbe_find_mkey(context, master_keylist, entry, &tmp_mkey))) {
+            free(ret);
+           return (error);
+        }
        k = 0;
        for (i = 0; i < request->nktypes; i++) {
            entry_key = NULL;
@@ -1357,7 +1360,7 @@ verify_enc_timestamp(krb5_context context, krb5_db_entry *client,
     if ((enc_ts_data.data = (char *) malloc(enc_ts_data.length)) == NULL)
        goto cleanup;
 
-    if ((retval = krb5_dbe_find_mkey(context, master_keylist, &client, &tmp_mkey)))
+    if ((retval = krb5_dbe_find_mkey(context, master_keylist, client, &tmp_mkey)))
        goto cleanup;
 
     start = 0;

diff --git a/src/kdc/kdc_util.c b/src/kdc/kdc_util.c
index c1bdd6351cbc3961d028d74bf7296fb7329ddc94..0d6b96e5071d3ad08529d0b53c58836a42836e65 100644 (file)
--- a/src/kdc/kdc_util.c
+++ b/src/kdc/kdc_util.c
@@ -440,11 +440,11 @@ kdc_get_server_key(krb5_ticket *ticket, unsigned int flags,
        return(KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN);
     }
 
-    retval = krb5_dbe_find_mkey(kdc_context, master_keylist, &server, &tmp_mkey);
+    retval = krb5_dbe_find_mkey(kdc_context, master_keylist, server, &tmp_mkey);
     if (retval)
        goto errout;
 
-    retval = krb5_dbe_find_enctype(kdc_context, &server,
+    retval = krb5_dbe_find_enctype(kdc_context, server,
                                   ticket->enc_part.enctype, -1,
                                   (krb5_int32)ticket->enc_part.kvno, &server_key);
     if (retval)

diff --git a/src/lib/kadm5/misc_free.c b/src/lib/kadm5/misc_free.c
index e856f4e91d33226c6aefbcd2f5a4b8dbda9c060d..e0d954245e6cc82be8eb47ade28d0fce3c2b80c0 100644 (file)
--- a/src/lib/kadm5/misc_free.c
+++ b/src/lib/kadm5/misc_free.c
@@ -7,6 +7,7 @@
 #if !defined(lint) && !defined(__CODECENTER__)
 static char *rcsid = "$Header$";
 #endif
+#include       <k5-int.h>
 #include       <kadm5/admin.h>
 #include       <stdlib.h>
 #include       "server_internal.h"
@@ -37,25 +38,6 @@ kadm5_ret_t
      free(names);
     return KADM5_OK;
 }
-/* XXX WAF: maybe delete this if all compiles */
-#if 0 /************** Begin IFDEF'ed OUT *******************************/
-/* XXX this ought to be in libkrb5.a, but isn't */
-kadm5_ret_t krb5_free_key_data_contents(context, key)
-   krb5_context context;
-   krb5_key_data *key;
-{
-     int i, idx;
-     
-     idx = (key->key_data_ver == 1 ? 1 : 2);
-     for (i = 0; i < idx; i++) {
-         if (key->key_data_contents[i]) {
-              memset(key->key_data_contents[i], 0, key->key_data_length[i]);
-              free(key->key_data_contents[i]);
-         }
-     }
-     return KADM5_OK;
-}
-#endif /**************** END IFDEF'ed OUT *******************************/
 
 kadm5_ret_t kadm5_free_key_data(void *server_handle,
                                krb5_int16 *n_key_data,

diff --git a/src/lib/kadm5/srv/server_kdb.c b/src/lib/kadm5/srv/server_kdb.c
index 70403ce144b7223fbff9eac2e71f8f860f352148..164da7963fa0201655c706f013e30f85d3ee34db 100644 (file)
--- a/src/lib/kadm5/srv/server_kdb.c
+++ b/src/lib/kadm5/srv/server_kdb.c
@@ -34,7 +34,6 @@ krb5_error_code kdb_init_master(kadm5_server_handle_t handle,
     int                   ret = 0;
     char          *realm;
     krb5_boolean   from_kbd = FALSE;
-    krb5_keyblock  *mkey;
     krb5_kvno       mkvno = IGNORE_VNO;
 
     if (from_keyboard)
@@ -83,7 +82,7 @@ krb5_error_code kdb_init_master(kadm5_server_handle_t handle,
 #endif /**************** END IFDEF'ed OUT *******************************/
 
     if ((ret = krb5_db_fetch_mkey_list(handle->context, master_princ,
-                                      mkey, mkvno, &master_keylist))) {
+                                      &master_keyblock, mkvno, &master_keylist))) {
        krb5_db_fini(handle->context);
        return (ret);
     }

diff --git a/src/lib/kadm5/srv/svr_principal.c b/src/lib/kadm5/srv/svr_principal.c
index f21b6f549a3bd2beb1a24a1a4a19ee67cfc849b5..5930d79d1265c06618445e480f5235bae65b6006 100644 (file)
--- a/src/lib/kadm5/srv/svr_principal.c
+++ b/src/lib/kadm5/srv/svr_principal.c
@@ -346,8 +346,12 @@ kadm5_create_principal_3(void *server_handle,
 
     ret = krb5_dbe_find_act_mkey(handle->context, master_keylist,
                                 active_mkey_list, &act_kvno, &act_mkey);
-    if (ret)
-       return (ret);
+    if (ret) {
+        krb5_db_free_principal(handle->context, &kdb, 1);
+        if (mask & KADM5_POLICY)
+            (void) kadm5_free_policy_ent(handle->lhandle, &polent);
+        return (ret);
+    }
 
     if ((ret = krb5_dbe_cpw(handle->context, act_mkey,
                            n_ks_tuple?ks_tuple:handle->params.keysalts,