70 lines
2.4 KiB
Diff
70 lines
2.4 KiB
Diff
From 29262595f5c603276dbeb016b122141839304755 Mon Sep 17 00:00:00 2001
|
|
From: Robbie Harwood <rharwood@redhat.com>
|
|
Date: Thu, 2 May 2019 16:57:51 -0400
|
|
Subject: [PATCH] Remove dead variable def_kslist from two files
|
|
|
|
def_kslist was part of kdb5_create.c since its addition (commit
|
|
edf8b4d8a6a665c2aa150993cd813ea6c5cf12e1) and has always been
|
|
irrelevant since the rblock structure is fully initialized in
|
|
kdb5_create().
|
|
|
|
def_klist was copied into kdb5_ldap_realm.c (present in addition at
|
|
commit 42d9d6ab320ee3a661fe21472be542acd542d5be). The global rblock
|
|
structure (and therefore the initializer) was removed in commit
|
|
9c850f8b62784170a5e42315c1a9552ddcf4ca2b, leaving def_kslist
|
|
unreferenced.
|
|
|
|
Remove def_kslist from both files, and remove the rblock initializer
|
|
from kdb5_create.c.
|
|
|
|
[ghudson@mit.edu: edited commit message]
|
|
|
|
(cherry picked from commit 6309f5e3508cd24151222b2cd095766283e205f2)
|
|
---
|
|
src/kadmin/dbutil/kdb5_create.c | 12 +-----------
|
|
src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c | 1 -
|
|
2 files changed, 1 insertion(+), 12 deletions(-)
|
|
|
|
diff --git a/src/kadmin/dbutil/kdb5_create.c b/src/kadmin/dbutil/kdb5_create.c
|
|
index bc1b9195d..efdb8adb0 100644
|
|
--- a/src/kadmin/dbutil/kdb5_create.c
|
|
+++ b/src/kadmin/dbutil/kdb5_create.c
|
|
@@ -66,8 +66,6 @@ enum ap_op {
|
|
TGT_KEY /* special handling for tgt key */
|
|
};
|
|
|
|
-krb5_key_salt_tuple def_kslist = { ENCTYPE_DES_CBC_CRC, KRB5_KDB_SALTTYPE_NORMAL };
|
|
-
|
|
struct realm_info {
|
|
krb5_deltat max_life;
|
|
krb5_deltat max_rlife;
|
|
@@ -76,15 +74,7 @@ struct realm_info {
|
|
krb5_keyblock *key;
|
|
krb5_int32 nkslist;
|
|
krb5_key_salt_tuple *kslist;
|
|
-} rblock = { /* XXX */
|
|
- KRB5_KDB_MAX_LIFE,
|
|
- KRB5_KDB_MAX_RLIFE,
|
|
- KRB5_KDB_EXPIRATION,
|
|
- KRB5_KDB_DEF_FLAGS,
|
|
- (krb5_keyblock *) NULL,
|
|
- 1,
|
|
- &def_kslist
|
|
-};
|
|
+} rblock;
|
|
|
|
struct iterate_args {
|
|
krb5_context ctx;
|
|
diff --git a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c
|
|
index 5a745e21d..c21d19981 100644
|
|
--- a/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c
|
|
+++ b/src/plugins/kdb/ldap/ldap_util/kdb5_ldap_realm.c
|
|
@@ -91,7 +91,6 @@
|
|
extern time_t get_date(char *); /* kadmin/cli/getdate.o */
|
|
|
|
char *yes = "yes\n"; /* \n to compare against result of fgets */
|
|
-krb5_key_salt_tuple def_kslist = {ENCTYPE_DES_CBC_CRC, KRB5_KDB_SALTTYPE_NORMAL};
|
|
|
|
krb5_data tgt_princ_entries[] = {
|
|
{0, KRB5_TGS_NAME_SIZE, KRB5_TGS_NAME},
|