add some krb5_{set,clear}_error_string
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9937 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1997, 1998, 1999 Kungliga Tekniska H<>gskolan
|
||||
* Copyright (c) 1997 - 2001 Kungliga Tekniska H<>gskolan
|
||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||
* All rights reserved.
|
||||
*
|
||||
@@ -43,11 +43,12 @@ krb5_rd_error(krb5_context context,
|
||||
|
||||
size_t len;
|
||||
krb5_error_code ret;
|
||||
|
||||
ret = decode_KRB_ERROR(msg->data, msg->length, result, &len);
|
||||
if(ret)
|
||||
return ret;
|
||||
result->error_code += KRB5KDC_ERR_NONE;
|
||||
return 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
void
|
||||
@@ -64,3 +65,56 @@ krb5_free_error (krb5_context context,
|
||||
krb5_free_error_contents (context, error);
|
||||
free (error);
|
||||
}
|
||||
|
||||
krb5_error_code
|
||||
krb5_error_from_rd_error(krb5_context context,
|
||||
const krb5_error *error,
|
||||
const krb5_creds *creds)
|
||||
{
|
||||
krb5_error_code ret;
|
||||
|
||||
ret = error->error_code;
|
||||
if (error->e_text != NULL) {
|
||||
krb5_set_error_string(context, "%s", *error->e_text);
|
||||
} else {
|
||||
char clientname[256], servername[256];
|
||||
|
||||
if (creds != NULL) {
|
||||
krb5_unparse_name_fixed(context, creds->client,
|
||||
clientname, sizeof(clientname));
|
||||
krb5_unparse_name_fixed(context, creds->server,
|
||||
servername, sizeof(servername));
|
||||
}
|
||||
|
||||
switch (ret) {
|
||||
case KRB5KDC_ERR_NAME_EXP :
|
||||
krb5_set_error_string(context, "Client %s%s%s expired",
|
||||
creds ? "(" : "",
|
||||
creds ? clientname : "",
|
||||
creds ? "(" : "");
|
||||
break;
|
||||
case KRB5KDC_ERR_SERVICE_EXP :
|
||||
krb5_set_error_string(context, "Server %s%s%s expired",
|
||||
creds ? "(" : "",
|
||||
creds ? servername : "",
|
||||
creds ? "(" : "");
|
||||
break;
|
||||
case KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN :
|
||||
krb5_set_error_string(context, "Client %s%s%s unknown",
|
||||
creds ? "(" : "",
|
||||
creds ? clientname : "",
|
||||
creds ? "(" : "");
|
||||
break;
|
||||
case KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN :
|
||||
krb5_set_error_string(context, "Server %s%s%s unknown",
|
||||
creds ? "(" : "",
|
||||
creds ? servername : "",
|
||||
creds ? "(" : "");
|
||||
break;
|
||||
default :
|
||||
krb5_clear_error_string(context);
|
||||
break;
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
Reference in New Issue
Block a user