From 8aac280e1459c4927323bd72f849f6a9110bc7cd Mon Sep 17 00:00:00 2001 From: Assar Westerlund Date: Mon, 5 Feb 2001 10:49:43 +0000 Subject: [PATCH] update to new db_fetch4 git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9636 ec53bebd-3082-4978-b11e-865c3cabbd6b --- kdc/kaserver.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/kdc/kaserver.c b/kdc/kaserver.c index b1fc8f927..3e48bf3cf 100644 --- a/kdc/kaserver.c +++ b/kdc/kaserver.c @@ -37,7 +37,6 @@ RCSID("$Id$"); #ifdef KASERVER -#include "kerberos4.h" #include #define KA_AUTHENTICATION_SERVICE 731 @@ -406,10 +405,10 @@ do_authenticate (struct rx_header *hdr, snprintf (client_name, sizeof(client_name), "%s.%s@%s", name, instance, v4_realm); - client_entry = db_fetch4 (name, instance, v4_realm); - if (client_entry == NULL) { - kdc_log(0, "Client not found in database: %s", - client_name); + ret = db_fetch4 (name, instance, v4_realm, &client_entry); + if (ret) { + kdc_log(0, "Client not found in database: %s: %s", + client_name, krb5_get_err_text(context, ret)); make_error_reply (hdr, KANOENT, reply); goto out; } @@ -417,9 +416,10 @@ do_authenticate (struct rx_header *hdr, snprintf (server_name, sizeof(server_name), "%s.%s@%s", "krbtgt", v4_realm, v4_realm); - server_entry = db_fetch4 ("krbtgt", v4_realm, v4_realm); - if (server_entry == NULL) { - kdc_log(0, "Server not found in database: %s", server_name); + ret = db_fetch4 ("krbtgt", v4_realm, v4_realm, &server_entry); + if (ret) { + kdc_log(0, "Server not found in database: %s: %s", + server_name, krb5_get_err_text(context, ret)); make_error_reply (hdr, KANOENT, reply); goto out; } @@ -599,9 +599,10 @@ do_getticket (struct rx_header *hdr, snprintf (server_name, sizeof(server_name), "%s.%s@%s", name, instance, v4_realm); - server_entry = db_fetch4 (name, instance, v4_realm); - if (server_entry == NULL) { - kdc_log(0, "Server not found in database: %s", server_name); + ret = db_fetch4 (name, instance, v4_realm, &server_entry); + if (ret) { + kdc_log(0, "Server not found in database: %s: %s", + server_name, krb5_get_err_text(context, ret)); make_error_reply (hdr, KANOENT, reply); goto out; } @@ -614,10 +615,10 @@ do_getticket (struct rx_header *hdr, goto out; } - krbtgt_entry = db_fetch4 ("krbtgt", v4_realm, v4_realm); - if (krbtgt_entry == NULL) { - kdc_log(0, "Server not found in database: %s.%s@%s", - "krbtgt", v4_realm, v4_realm); + ret = db_fetch4 ("krbtgt", v4_realm, v4_realm, &krbtgt_entry); + if (ret) { + kdc_log(0, "Server not found in database: %s.%s@%s: %s", + "krbtgt", v4_realm, v4_realm, krb5_get_err_text(context, ret)); make_error_reply (hdr, KANOENT, reply); goto out; }