dovecot-1.2: gssapi: Code cleanup.
dovecot at dovecot.org
dovecot at dovecot.org
Wed Jul 8 04:25:39 EEST 2009
details: http://hg.dovecot.org/dovecot-1.2/rev/5d9eab092e97
changeset: 9200:5d9eab092e97
user: Timo Sirainen <tss at iki.fi>
date: Tue Jul 07 21:25:35 2009 -0400
description:
gssapi: Code cleanup.
diffstat:
1 file changed, 29 insertions(+), 34 deletions(-)
src/auth/mech-gssapi.c | 63 ++++++++++++++++++++++--------------------------
diffs (137 lines):
diff -r f4ff64dd79a9 -r 5d9eab092e97 src/auth/mech-gssapi.c
--- a/src/auth/mech-gssapi.c Tue Jul 07 21:05:31 2009 -0400
+++ b/src/auth/mech-gssapi.c Tue Jul 07 21:25:35 2009 -0400
@@ -75,9 +75,9 @@ struct gssapi_auth_request {
static bool gssapi_initialized = FALSE;
-static void auth_request_log_gss_error(struct auth_request *request,
- OM_uint32 status_value, int status_type,
- const char *description)
+static void mech_gssapi_log_error(struct auth_request *request,
+ OM_uint32 status_value, int status_type,
+ const char *description)
{
OM_uint32 message_context = 0;
OM_uint32 minor_status;
@@ -171,9 +171,8 @@ obtain_service_credentials(struct auth_r
str_free(&principal_name);
if (GSS_ERROR(major_status)) {
- auth_request_log_gss_error(request, major_status,
- GSS_C_GSS_CODE,
- "importing principal name");
+ mech_gssapi_log_error(request, major_status, GSS_C_GSS_CODE,
+ "importing principal name");
return major_status;
}
@@ -181,12 +180,10 @@ obtain_service_credentials(struct auth_r
GSS_C_NULL_OID_SET, GSS_C_ACCEPT,
ret_r, NULL, NULL);
if (GSS_ERROR(major_status)) {
- auth_request_log_gss_error(request, major_status,
- GSS_C_GSS_CODE,
- "acquiring service credentials");
- auth_request_log_gss_error(request, minor_status,
- GSS_C_MECH_CODE,
- "acquiring service credentials");
+ mech_gssapi_log_error(request, major_status, GSS_C_GSS_CODE,
+ "acquiring service credentials");
+ mech_gssapi_log_error(request, minor_status, GSS_C_MECH_CODE,
+ "acquiring service credentials");
return major_status;
}
@@ -206,8 +203,8 @@ import_name(struct auth_request *request
major_status = gss_import_name(&minor_status, &name_buf,
GSS_C_NO_OID, &name);
if (GSS_ERROR(major_status)) {
- auth_request_log_gss_error(request, major_status,
- GSS_C_GSS_CODE, "gss_import_name");
+ mech_gssapi_log_error(request, major_status, GSS_C_GSS_CODE,
+ "gss_import_name");
return GSS_C_NO_NAME;
}
return name;
@@ -222,9 +219,8 @@ static int get_display_name(struct auth_
major_status = gss_display_name(&minor_status, name,
&buf, name_type_r);
if (major_status != GSS_S_COMPLETE) {
- auth_request_log_gss_error(auth_request, major_status,
- GSS_C_GSS_CODE,
- "gss_display_name");
+ mech_gssapi_log_error(auth_request, major_status,
+ GSS_C_GSS_CODE, "gss_display_name");
return -1;
}
*display_name_r = t_strndup(buf.value, buf.length);
@@ -257,12 +253,12 @@ mech_gssapi_sec_context(struct gssapi_au
);
if (GSS_ERROR(major_status)) {
- auth_request_log_gss_error(auth_request, major_status,
- GSS_C_GSS_CODE,
- "processing incoming data");
- auth_request_log_gss_error(auth_request, minor_status,
- GSS_C_MECH_CODE,
- "processing incoming data");
+ mech_gssapi_log_error(auth_request, major_status,
+ GSS_C_GSS_CODE,
+ "processing incoming data");
+ mech_gssapi_log_error(auth_request, minor_status,
+ GSS_C_MECH_CODE,
+ "processing incoming data");
return -1;
}
@@ -322,9 +318,9 @@ mech_gssapi_wrap(struct gssapi_auth_requ
GSS_C_QOP_DEFAULT, &inbuf, NULL, &outbuf);
if (GSS_ERROR(major_status)) {
- auth_request_log_gss_error(&request->auth_request, major_status,
+ mech_gssapi_log_error(&request->auth_request, major_status,
GSS_C_GSS_CODE, "sending security layer negotiation");
- auth_request_log_gss_error(&request->auth_request, minor_status,
+ mech_gssapi_log_error(&request->auth_request, minor_status,
GSS_C_MECH_CODE, "sending security layer negotiation");
return -1;
}
@@ -407,9 +403,9 @@ mech_gssapi_userok(struct gssapi_auth_re
request->authz_name,
&equal_authn_authz);
if (GSS_ERROR(major_status)) {
- auth_request_log_gss_error(auth_request, major_status,
- GSS_C_GSS_CODE,
- "gss_compare_name failed");
+ mech_gssapi_log_error(auth_request, major_status,
+ GSS_C_GSS_CODE,
+ "gss_compare_name failed");
return -1;
}
@@ -422,9 +418,8 @@ mech_gssapi_userok(struct gssapi_auth_re
major_status = __gss_userok(&minor_status, request->authn_name,
login_user, &login_ok);
if (GSS_ERROR(major_status)) {
- auth_request_log_gss_error(auth_request, major_status,
- GSS_C_GSS_CODE,
- "__gss_userok failed");
+ mech_gssapi_log_error(auth_request, major_status,
+ GSS_C_GSS_CODE, "__gss_userok failed");
return -1;
}
@@ -471,9 +466,9 @@ mech_gssapi_unwrap(struct gssapi_auth_re
&inbuf, &outbuf, NULL, NULL);
if (GSS_ERROR(major_status)) {
- auth_request_log_gss_error(auth_request, major_status,
- GSS_C_GSS_CODE,
- "final negotiation: gss_unwrap");
+ mech_gssapi_log_error(auth_request, major_status,
+ GSS_C_GSS_CODE,
+ "final negotiation: gss_unwrap");
return -1;
}
More information about the dovecot-cvs
mailing list