diff options
| -rw-r--r-- | ipa-client/ipa-getkeytab.c | 11 | ||||
| -rw-r--r-- | ipa-server/ipa-kpasswd/ipa_kpasswd.c | 6 | ||||
| -rw-r--r-- | ipa-server/ipa-slapi-plugins/dna/dna.c | 5 | ||||
| -rw-r--r-- | ipa-server/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c | 3 |
4 files changed, 13 insertions, 12 deletions
diff --git a/ipa-client/ipa-getkeytab.c b/ipa-client/ipa-getkeytab.c index c68ed4eb..f9469513 100644 --- a/ipa-client/ipa-getkeytab.c +++ b/ipa-client/ipa-getkeytab.c @@ -30,6 +30,7 @@ #include <string.h> #include <errno.h> #include <time.h> +#define KRB5_PRIVATE 1 #include <krb5.h> #ifdef WITH_MOZLDAP #include <mozldap/ldap.h> @@ -95,7 +96,7 @@ static int get_enctypes(krb5_context krbctx, const char *str, /* count */ n = 0; p = t; - while (p = strchr(t, ',')) { + while ((p = strchr(t, ','))) { t = p+1; n++; } @@ -239,7 +240,7 @@ static struct berval *create_key_control(krb5_keyblock *keys, int num_keys, cons int filter_keys(krb5_context krbctx, krb5_keyblock *keys, int *num_keys, ber_int_t *enctypes) { - int ret, i, j, k; + int i, j, k; k = *num_keys; @@ -277,15 +278,12 @@ static int ldap_set_keytab(const char *servername, { int version; LDAP *ld = NULL; - BerElement *ctrl = NULL; BerElement *sctrl = NULL; struct berval *control = NULL; - struct berval **ncvals; - char *ldap_base = NULL; char *retoid = NULL; struct berval *retdata = NULL; struct timeval tv; - LDAPMessage *entry, *res = NULL; + LDAPMessage *res = NULL; LDAPControl **srvctrl = NULL; LDAPControl *pprc = NULL; char *err = NULL; @@ -293,7 +291,6 @@ static int ldap_set_keytab(const char *servername, int ret, rc; int kvno, i; ber_tag_t rtag; - struct berval bv; ber_int_t *encs = NULL; /* cant' return more than num_keys, sometimes less */ diff --git a/ipa-server/ipa-kpasswd/ipa_kpasswd.c b/ipa-server/ipa-kpasswd/ipa_kpasswd.c index 72d3c13d..2be9bb51 100644 --- a/ipa-server/ipa-kpasswd/ipa_kpasswd.c +++ b/ipa-server/ipa-kpasswd/ipa_kpasswd.c @@ -1004,7 +1004,9 @@ pid_t handle_conn(struct socklist *sd) int ret; fromlen = sizeof(from); + mfd = 0; tcp = 0; + reqlen = 0; /* receive request */ if (sd->socktype == SOCK_STREAM) { @@ -1305,7 +1307,7 @@ int main(int argc, char *argv[]) ret = getnameinfo(tifa->ifa_addr, sizeof(struct sockaddr_storage), host, sizeof(host), NULL, 0, NI_NUMERICHOST); if (ret) { - syslog(LOG_ERR, "Error converting address (%d)", + syslog(LOG_ERR, "Error converting address (%s)", gai_strerror(ret)); continue; } else { @@ -1319,7 +1321,7 @@ int main(int argc, char *argv[]) /* this shoud return 2 entries, one for UDP and one for TCP */ ret = getaddrinfo(host, "kpasswd", &hints, &ai); if (ret) { - syslog(LOG_ERR, "Error getting address info (%d) for [%s]", + syslog(LOG_ERR, "Error getting address info (%s) for [%s]", gai_strerror(ret), host); continue; } diff --git a/ipa-server/ipa-slapi-plugins/dna/dna.c b/ipa-server/ipa-slapi-plugins/dna/dna.c index 6f0780b0..a092d1bc 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 c25d0f11..e05d12e4 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 <prio.h> #include <ssl.h> #include <dirsrv/slapi-plugin.h> +#define KRB5_PRIVATE 1 #include <krb5.h> #include <lber.h> #include <time.h> @@ -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", |