|
 |
937546 |
From 480f8a40e9ff8d7f344faac1a9af64972cf2288a Mon Sep 17 00:00:00 2001
|
|
|
937546 |
From: Robbie Harwood <rharwood@redhat.com>
|
|
|
937546 |
Date: Thu, 5 Sep 2019 13:00:27 -0400
|
|
|
937546 |
Subject: [PATCH] Fix segfault in ipadb_parse_ldap_entry()
|
|
|
937546 |
|
|
|
937546 |
lcontext may be NULL here, probably due to a restarted 389ds. Based on
|
|
|
937546 |
a patch by Rob Crittenden.
|
|
|
937546 |
|
|
|
937546 |
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
|
|
|
937546 |
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
|
|
|
937546 |
---
|
|
|
937546 |
daemons/ipa-kdb/ipa_kdb_principals.c | 13 +++++++++++++
|
|
|
937546 |
1 file changed, 13 insertions(+)
|
|
|
937546 |
|
|
|
937546 |
diff --git a/daemons/ipa-kdb/ipa_kdb_principals.c b/daemons/ipa-kdb/ipa_kdb_principals.c
|
|
|
937546 |
index b27612258bbe198154dea5b5d79e551caf9857d1..0fe8e396b9bc011b77b183851389f6c57c70a2c9 100644
|
|
|
937546 |
--- a/daemons/ipa-kdb/ipa_kdb_principals.c
|
|
|
937546 |
+++ b/daemons/ipa-kdb/ipa_kdb_principals.c
|
|
|
937546 |
@@ -21,7 +21,9 @@
|
|
|
937546 |
*/
|
|
|
937546 |
|
|
|
937546 |
#include "ipa_kdb.h"
|
|
|
937546 |
+#include "ipa_krb5.h"
|
|
|
937546 |
#include <unicase.h>
|
|
|
937546 |
+#include <syslog.h>
|
|
|
937546 |
|
|
|
937546 |
/*
|
|
|
937546 |
* During TGS request search by ipaKrbPrincipalName (case-insensitive)
|
|
|
937546 |
@@ -554,6 +556,17 @@ static krb5_error_code ipadb_parse_ldap_entry(krb5_context kcontext,
|
|
|
937546 |
return KRB5_KDB_DBNOTINITED;
|
|
|
937546 |
}
|
|
|
937546 |
lcontext = ipactx->lcontext;
|
|
|
937546 |
+ if (!lcontext) {
|
|
|
937546 |
+ krb5_klog_syslog(LOG_INFO,
|
|
|
937546 |
+ "No LDAP connection in ipadb_parse_ldap_entry(); retrying...\n");
|
|
|
937546 |
+ ret = ipadb_get_connection(ipactx);
|
|
|
937546 |
+ if (ret != 0) {
|
|
|
937546 |
+ krb5_klog_syslog(LOG_ERR,
|
|
|
937546 |
+ "No LDAP connection on retry in ipadb_parse_ldap_entry()!\n");
|
|
|
937546 |
+ kerr = KRB5_KDB_INTERNAL_ERROR;
|
|
|
937546 |
+ goto done;
|
|
|
937546 |
+ }
|
|
|
937546 |
+ }
|
|
|
937546 |
|
|
|
937546 |
entry->magic = KRB5_KDB_MAGIC_NUMBER;
|
|
|
937546 |
entry->len = KRB5_KDB_V1_BASE_LENGTH;
|
|
|
937546 |
--
|
|
|
937546 |
2.20.1
|
|
|
937546 |
|