Fix various warnings

6 files changed, 11 insertions, 17 deletions

diff --git a/src/kadmin/dbutil/kdb5_create.c b/src/kadmin/dbutil/kdb5_create.c
index cbdea16edc..96275ca7b0 100644
--- a/src/kadmin/dbutil/kdb5_create.c
+++ b/src/kadmin/dbutil/kdb5_create.c
@@ -264,8 +264,7 @@ void kdb5_create(argc, argv)
 
     rblock.key = &master_keyblock;
 
-    seed.length = master_keyblock.length;
-    seed.data = master_keyblock.contents;
+    seed = make_data(master_keyblock.contents, master_keyblock.length);
 
     if ((retval = krb5_c_random_seed(util_context, &seed))) {
         com_err(progname, retval,
diff --git a/src/kadmin/dbutil/kdb5_mkey.c b/src/kadmin/dbutil/kdb5_mkey.c
index 21f8073d37..4edacb6248 100644
--- a/src/kadmin/dbutil/kdb5_mkey.c
+++ b/src/kadmin/dbutil/kdb5_mkey.c
@@ -73,7 +73,7 @@ add_new_mkey(krb5_context context, krb5_db_entry *master_entry,
     krb5_error_code retval = 0;
     int old_key_data_count, i;
     krb5_kvno new_mkey_kvno;
-    krb5_key_data tmp_key_data, *old_key_data;
+    krb5_key_data tmp_key_data;
     krb5_mkey_aux_node  *mkey_aux_data_head = NULL, **mkey_aux_data;
     krb5_keylist_node  *keylist_node;
     krb5_keylist_node *master_keylist = krb5_db_mkey_list_alias(context);
@@ -84,9 +84,7 @@ add_new_mkey(krb5_context context, krb5_db_entry *master_entry,
     if (use_mkvno != 0 && new_mkey_kvno != use_mkvno)
         return (KRB5_KDB_KVNONOMATCH);
 
-    /* save the old keydata */
     old_key_data_count = master_entry->n_key_data;
-    old_key_data = master_entry->key_data;
 
     /* alloc enough space to hold new and existing key_data */
     /*
diff --git a/src/kadmin/dbutil/ovload.c b/src/kadmin/dbutil/ovload.c
index d514f8c7d8..b972cc5bb4 100644
--- a/src/kadmin/dbutil/ovload.c
+++ b/src/kadmin/dbutil/ovload.c
@@ -111,7 +111,7 @@ int process_ov_principal(kcontext, fname, filep, verbose, linenop)
     krb5_db_entry           *kdb = NULL;
     char                    *current = 0;
     char                    *cp;
-    int                     x;
+    unsigned int            x;
     char                    line[LINESIZE];
 
     if (fgets(line, LINESIZE, filep) == (char *) NULL) {
diff --git a/src/kadmin/server/ipropd_svc.c b/src/kadmin/server/ipropd_svc.c
index 008bff01eb..4a25998f45 100644
--- a/src/kadmin/server/ipropd_svc.c
+++ b/src/kadmin/server/ipropd_svc.c
@@ -473,7 +473,7 @@ check_iprop_rpcsec_auth(struct svc_req *rqstp)
      gss_name_t name;
      krb5_principal princ;
      int ret, success;
-     krb5_data *c1, *c2, *realm;
+     krb5_data *c1, *realm;
      gss_buffer_desc gss_str;
      kadm5_server_handle_t handle;
      size_t slen;
@@ -514,7 +514,6 @@ check_iprop_rpcsec_auth(struct svc_req *rqstp)
 	  goto fail_princ;
 
      c1 = krb5_princ_component(kctx, princ, 0);
-     c2 = krb5_princ_component(kctx, princ, 1);
      realm = krb5_princ_realm(kctx, princ);
      if (strncmp(handle->params.realm, realm->data, realm->length) == 0
 	 && strncmp("kiprop", c1->data, c1->length) == 0) {
diff --git a/src/kadmin/server/misc.c b/src/kadmin/server/misc.c
index b9212fa0f2..192145c60d 100644
--- a/src/kadmin/server/misc.c
+++ b/src/kadmin/server/misc.c
@@ -186,16 +186,15 @@ check_min_life(void *server_handle, krb5_principal principal,
            !(princ.attributes & KRB5_KDB_REQUIRES_PWCHANGE)) {
             if (msg_ret != NULL) {
                 time_t until;
-                char *time_string, *ptr, *errstr;
+                char *time_string, *ptr;
+                const char *errstr;
 
                 until = princ.last_pwd_change + pol.pw_min_life;
 
                 time_string = ctime(&until);
                 errstr = error_message(CHPASS_UTIL_PASSWORD_TOO_SOON);
 
-                if (strlen(errstr) + strlen(time_string) >= msg_len) {
-                    *errstr = '\0';
-                } else {
+                if (strlen(errstr) + strlen(time_string) < msg_len) {
                     if (*(ptr = &time_string[strlen(time_string)-1]) == '\n')
                         *ptr = '\0';
                     snprintf(msg_ret, msg_len, errstr, time_string);
diff --git a/src/kadmin/server/ovsec_kadmd.c b/src/kadmin/server/ovsec_kadmd.c
index dad7248696..37e66316e2 100644
--- a/src/kadmin/server/ovsec_kadmd.c
+++ b/src/kadmin/server/ovsec_kadmd.c
@@ -150,15 +150,14 @@ static void display_status_1(m, code, type)
     OM_uint32 code;
     int type;
 {
-    OM_uint32 maj_stat, min_stat;
+    OM_uint32 min_stat;
     gss_buffer_desc msg;
     OM_uint32 msg_ctx;
 
     msg_ctx = 0;
     while (1) {
-        maj_stat = gss_display_status(&min_stat, code,
-                                      type, GSS_C_NULL_OID,
-                                      &msg_ctx, &msg);
+        (void) gss_display_status(&min_stat, code, type, GSS_C_NULL_OID,
+                                  &msg_ctx, &msg);
         fprintf(stderr, _("GSS-API error %s: %s\n"), m, (char *)msg.value);
         (void) gss_release_buffer(&min_stat, &msg);
 
@@ -223,7 +222,7 @@ int main(int argc, char *argv[])
     kadm5_config_params params;
     char **db_args      = NULL;
     int    db_args_size = 0;
-    char *errmsg;
+    const char *errmsg;
     int i;
     int strong_random = 1;
     const char *pid_file = NULL;