diff options
-rw-r--r-- | daemons/ipa-kdb/ipa_kdb_passwords.c | 3 | ||||
-rw-r--r-- | daemons/ipa-kdb/ipa_kdb_principals.c | 3 | ||||
-rw-r--r-- | daemons/ipa-kdb/ipa_kdb_pwdpolicy.c | 3 | ||||
-rw-r--r-- | ipa-client/ipa-getkeytab.c | 4 |
4 files changed, 11 insertions, 2 deletions
diff --git a/daemons/ipa-kdb/ipa_kdb_passwords.c b/daemons/ipa-kdb/ipa_kdb_passwords.c index c717e2031..b6520ea75 100644 --- a/daemons/ipa-kdb/ipa_kdb_passwords.c +++ b/daemons/ipa-kdb/ipa_kdb_passwords.c @@ -71,6 +71,9 @@ static krb5_error_code ipadb_check_pw_policy(krb5_context context, int ret; ipactx = ipadb_get_context(context); + if (!ipactx) { + return KRB5_KDB_DBNOTINITED; + } ied = (struct ipadb_e_data *)db_entry->e_data; if (ied->magic != IPA_E_DATA_MAGIC) { diff --git a/daemons/ipa-kdb/ipa_kdb_principals.c b/daemons/ipa-kdb/ipa_kdb_principals.c index a0d468717..143261982 100644 --- a/daemons/ipa-kdb/ipa_kdb_principals.c +++ b/daemons/ipa-kdb/ipa_kdb_principals.c @@ -373,6 +373,9 @@ static krb5_error_code ipadb_parse_ldap_entry(krb5_context kcontext, /* proceed to fill in attributes in the order they are defined in * krb5_db_entry in kdb.h */ ipactx = ipadb_get_context(kcontext); + if (!ipactx) { + return KRB5_KDB_DBNOTINITED; + } lcontext = ipactx->lcontext; entry->magic = KRB5_KDB_MAGIC_NUMBER; diff --git a/daemons/ipa-kdb/ipa_kdb_pwdpolicy.c b/daemons/ipa-kdb/ipa_kdb_pwdpolicy.c index 91de0342b..a54380815 100644 --- a/daemons/ipa-kdb/ipa_kdb_pwdpolicy.c +++ b/daemons/ipa-kdb/ipa_kdb_pwdpolicy.c @@ -121,6 +121,9 @@ krb5_error_code ipadb_get_ipapwd_policy(struct ipadb_context *ipactx, done: ldap_msgfree(res); + if (kerr) { + free(pol); + } return kerr; } diff --git a/ipa-client/ipa-getkeytab.c b/ipa-client/ipa-getkeytab.c index aa9336f2e..05e57bbe1 100644 --- a/ipa-client/ipa-getkeytab.c +++ b/ipa-client/ipa-getkeytab.c @@ -211,10 +211,10 @@ static int prep_ksdata(krb5_context krbctx, const char *str, if (krberr != 0) { fprintf(stderr, _("Warning unrecognized encryption type: [%s]\n"), t); - t = p+1; + if (p) t = p + 1; continue; } - t = p+1; + if (p) t = p + 1; if (!q) { ksdata[j].salttype = KRB5_KDB_SALTTYPE_NORMAL; |