Added new function krb_err_msg() that should be used instead of
indexing into krb_err_txt[]. The function does a sanity check on the error code. Replaced all occurencies of krb_err_txt[]. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@280 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -221,9 +221,9 @@ authenticate(p, addr)
|
||||
|
||||
if (auth != KSUCCESS) {
|
||||
pop_msg(p, POP_FAILURE, "Kerberos authentication failure: %s",
|
||||
krb_err_txt[auth]);
|
||||
krb_err_msg(auth));
|
||||
pop_log(p, POP_FAILURE, "%s: (%s.%s@%s) %s", p->client,
|
||||
kdata.pname, kdata.pinst, kdata.prealm, krb_err_txt[auth]);
|
||||
kdata.pname, kdata.pinst, kdata.prealm, krb_err_msg(auth));
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
|
@@ -38,9 +38,9 @@ POP * p;
|
||||
#ifdef KERBEROS
|
||||
if ((status = krb_get_lrealm(lrealm,1)) == KFAILURE) {
|
||||
pop_log(p, POP_FAILURE, "%s: (%s.%s@%s) %s", p->client, kdata.pname,
|
||||
kdata.pinst, kdata.prealm, krb_err_txt[status]);
|
||||
kdata.pinst, kdata.prealm, krb_err_msg(status));
|
||||
return(pop_msg(p,POP_FAILURE,
|
||||
"Kerberos error: \"%s\".", krb_err_txt[status]));
|
||||
"Kerberos error: \"%s\".", krb_err_msg(status)));
|
||||
}
|
||||
|
||||
if (strcmp(kdata.prealm,lrealm)) {
|
||||
|
@@ -194,11 +194,11 @@ kerberos4_send(char *name, Authenticator *ap)
|
||||
return(0);
|
||||
}
|
||||
if (r = krb_mk_req(&auth, KRB_SERVICE_NAME, instance, realm, 0L)) {
|
||||
printf("mk_req failed: %s\r\n", krb_err_txt[r]);
|
||||
printf("mk_req failed: %s\r\n", krb_err_msg(r));
|
||||
return(0);
|
||||
}
|
||||
if (r = krb_get_cred(KRB_SERVICE_NAME, instance, realm, &cred)) {
|
||||
printf("get_cred failed: %s\r\n", krb_err_txt[r]);
|
||||
printf("get_cred failed: %s\r\n", krb_err_msg(r));
|
||||
return(0);
|
||||
}
|
||||
if (!auth_sendname(UserNameRequested, strlen(UserNameRequested))) {
|
||||
@@ -298,7 +298,7 @@ kerberos4_is(ap, data, cnt)
|
||||
instance, 0, &adat, "")) {
|
||||
if (auth_debug_mode)
|
||||
printf("Kerberos failed him as %s\r\n", name);
|
||||
Data(ap, KRB_REJECT, (void *)krb_err_txt[r], -1);
|
||||
Data(ap, KRB_REJECT, (void *)krb_err_msg(r), -1);
|
||||
auth_finished(ap, AUTH_REJECT);
|
||||
return;
|
||||
}
|
||||
|
@@ -620,7 +620,7 @@ GetPasswd(Widget w, XEvent *_event, String *_s, Cardinal *_n)
|
||||
fprintf(stderr,
|
||||
"%s: Warning %s\n",
|
||||
ProgName,
|
||||
krb_err_txt[code]);
|
||||
krb_err_msg(code));
|
||||
}
|
||||
leave();
|
||||
}
|
||||
|
Reference in New Issue
Block a user