From 6cce2f45e8b48422b2c3534b7a73c10ba95ad2fe Mon Sep 17 00:00:00 2001 From: Martin Nagy Date: Thu, 26 Jun 2008 12:52:25 +0200 Subject: Fix some small issues that caused compiler warnings, like uninitialized or unused variables or missing krb5 prototypes. --- ipa-server/ipa-slapi-plugins/dna/dna.c | 5 ++--- ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'ipa-server/ipa-slapi-plugins') diff --git a/ipa-server/ipa-slapi-plugins/dna/dna.c b/ipa-server/ipa-slapi-plugins/dna/dna.c index 6f0780b07..a092d1bc2 100644 --- a/ipa-server/ipa-slapi-plugins/dna/dna.c +++ b/ipa-server/ipa-slapi-plugins/dna/dna.c @@ -371,7 +371,7 @@ static int dna_start(Slapi_PBlock * pb) /** * Load the config for our plug-in */ - dna_global_config = (struct configEntry *) + dna_global_config = (PRCList *) slapi_ch_calloc(1, sizeof(struct configEntry)); PR_INIT_CLIST(dna_global_config); @@ -973,7 +973,6 @@ static int dna_get_next_value(struct configEntry *config_entry, PRUint64 setval = 0; PRUint64 newval = 0; PRUint64 maxval = -1; - int result; /* do update */ ret = slapi_search_internal_get_entry(dn, attrlist, &e, @@ -1342,7 +1341,7 @@ static int dna_pre_op(Slapi_PBlock * pb, int modtype) slapi_log_error(SLAPI_LOG_PLUGIN, DNA_PLUGIN_SUBSYSTEM, "dna_pre_op: operation failure [%d]\n", ret); slapi_send_ldap_result(pb, ret, NULL, errstr, 0, NULL); - slapi_ch_free(&errstr); + slapi_ch_free((void **)&errstr); ret = DNA_FAILURE; } diff --git a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c index c25d0f11b..e05d12e4b 100644 --- a/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c +++ b/ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c @@ -63,6 +63,7 @@ #include #include #include +#define KRB5_PRIVATE 1 #include #include #include @@ -121,6 +122,8 @@ #define KRB5P_SALT_SIZE 16 +void krb5int_c_free_keyblock_contents(krb5_context context, register krb5_keyblock *key); + static const char *ipapwd_def_encsalts[] = { "des3-hmac-sha1:normal", /* "arcfour-hmac:normal", -- cgit