svn rev #24186: trunk/src/ include/ kdc/ lib/kdb/ plugins/kdb/db2/ plugins/kdb/ldap/libkdb_ldap/
ghudson@MIT.EDU
ghudson at MIT.EDU
Tue Jul 13 12:09:02 EDT 2010
http://src.mit.edu/fisheye/changelog/krb5/?cs=24186
Commit By: ghudson
Log Message:
ticket: 6749
status: open
Addendum to r24185: make audit_as_req return void, since it's an
informational method and we're not going to do anything with the
result.
Changed Files:
U trunk/src/include/kdb.h
U trunk/src/kdc/kdc_util.c
U trunk/src/lib/kdb/kdb5.c
U trunk/src/plugins/kdb/db2/db2_exp.c
U trunk/src/plugins/kdb/db2/kdb_db2.c
U trunk/src/plugins/kdb/db2/kdb_db2.h
U trunk/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.c
U trunk/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
Modified: trunk/src/include/kdb.h
===================================================================
--- trunk/src/include/kdb.h 2010-07-13 15:53:23 UTC (rev 24185)
+++ trunk/src/include/kdb.h 2010-07-13 16:09:01 UTC (rev 24186)
@@ -615,12 +615,9 @@
const char **status,
krb5_data *e_data);
-krb5_error_code krb5_db_audit_as_req(krb5_context kcontext,
- krb5_kdc_req *request,
- krb5_db_entry *client,
- krb5_db_entry *server,
- krb5_timestamp authtime,
- krb5_error_code error_code);
+void krb5_db_audit_as_req(krb5_context kcontext, krb5_kdc_req *request,
+ krb5_db_entry *client, krb5_db_entry *server,
+ krb5_timestamp authtime, krb5_error_code error_code);
krb5_error_code krb5_db_invoke ( krb5_context kcontext,
unsigned int method,
@@ -1271,14 +1268,11 @@
/*
* Optional: This method informs the module of a successful or unsuccessful
- * AS request. The resulting error code is currently ignored by the KDC.
+ * AS request.
*/
- krb5_error_code (*audit_as_req)(krb5_context kcontext,
- krb5_kdc_req *request,
- krb5_db_entry *client,
- krb5_db_entry *server,
- krb5_timestamp authtime,
- krb5_error_code error_code);
+ void (*audit_as_req)(krb5_context kcontext, krb5_kdc_req *request,
+ krb5_db_entry *client, krb5_db_entry *server,
+ krb5_timestamp authtime, krb5_error_code error_code);
/* Note: there is currently no method for auditing TGS requests. */
Modified: trunk/src/kdc/kdc_util.c
===================================================================
--- trunk/src/kdc/kdc_util.c 2010-07-13 15:53:23 UTC (rev 24185)
+++ trunk/src/kdc/kdc_util.c 2010-07-13 16:09:01 UTC (rev 24186)
@@ -2356,8 +2356,8 @@
ktypestr, fromstring, status,
cname2, sname2, emsg ? ", " : "", emsg ? emsg : "");
}
- (void) krb5_db_audit_as_req(kdc_context, request, client, server,
- authtime, errcode);
+ krb5_db_audit_as_req(kdc_context, request, client, server, authtime,
+ errcode);
#if 0
/* Sun (OpenSolaris) version would probably something like this.
The client and server names passed can be null, unlike in the
Modified: trunk/src/lib/kdb/kdb5.c
===================================================================
--- trunk/src/lib/kdb/kdb5.c 2010-07-13 15:53:23 UTC (rev 24185)
+++ trunk/src/lib/kdb/kdb5.c 2010-07-13 16:09:01 UTC (rev 24186)
@@ -2303,7 +2303,7 @@
e_data);
}
-krb5_error_code
+void
krb5_db_audit_as_req(krb5_context kcontext, krb5_kdc_req *request,
krb5_db_entry *client, krb5_db_entry *server,
krb5_timestamp authtime, krb5_error_code error_code)
@@ -2312,12 +2312,9 @@
kdb_vftabl *v;
status = get_vftabl(kcontext, &v);
- if (status)
- return status;
- if (v->audit_as_req == NULL)
- return KRB5_PLUGIN_OP_NOTSUPP;
- return v->audit_as_req(kcontext, request, client, server, authtime,
- error_code);
+ if (status || v->audit_as_req == NULL)
+ return;
+ v->audit_as_req(kcontext, request, client, server, authtime, error_code);
}
krb5_error_code
Modified: trunk/src/plugins/kdb/db2/db2_exp.c
===================================================================
--- trunk/src/plugins/kdb/db2/db2_exp.c 2010-07-13 15:53:23 UTC (rev 24185)
+++ trunk/src/plugins/kdb/db2/db2_exp.c 2010-07-13 16:09:01 UTC (rev 24186)
@@ -186,11 +186,11 @@
krb5_data *e_data),
(kcontext, request, client, server, kdc_time, status, e_data));
-WRAP_K (krb5_db2_audit_as_req,
- (krb5_context kcontext, krb5_kdc_req *request, krb5_db_entry *client,
- krb5_db_entry *server, krb5_timestamp authtime,
- krb5_error_code error_code),
- (kcontext, request, client, server, authtime, error_code));
+WRAP_VOID (krb5_db2_audit_as_req,
+ (krb5_context kcontext, krb5_kdc_req *request,
+ krb5_db_entry *client, krb5_db_entry *server,
+ krb5_timestamp authtime, krb5_error_code error_code),
+ (kcontext, request, client, server, authtime, error_code));
WRAP_K (krb5_db2_invoke,
(krb5_context kcontext,
Modified: trunk/src/plugins/kdb/db2/kdb_db2.c
===================================================================
--- trunk/src/plugins/kdb/db2/kdb_db2.c 2010-07-13 15:53:23 UTC (rev 24185)
+++ trunk/src/plugins/kdb/db2/kdb_db2.c 2010-07-13 16:09:01 UTC (rev 24186)
@@ -1650,10 +1650,10 @@
return retval;
}
-krb5_error_code
+void
krb5_db2_audit_as_req(krb5_context kcontext, krb5_kdc_req *request,
krb5_db_entry *client, krb5_db_entry *server,
krb5_timestamp authtime, krb5_error_code error_code)
{
- return krb5_db2_lockout_audit(kcontext, client, authtime, error_code);
+ (void) krb5_db2_lockout_audit(kcontext, client, authtime, error_code);
}
Modified: trunk/src/plugins/kdb/db2/kdb_db2.h
===================================================================
--- trunk/src/plugins/kdb/db2/kdb_db2.h 2010-07-13 15:53:23 UTC (rev 24185)
+++ trunk/src/plugins/kdb/db2/kdb_db2.h 2010-07-13 16:09:01 UTC (rev 24186)
@@ -152,7 +152,7 @@
krb5_timestamp kdc_time, const char **status,
krb5_data *e_data);
-krb5_error_code
+void
krb5_db2_audit_as_req(krb5_context kcontext, krb5_kdc_req *request,
krb5_db_entry *client, krb5_db_entry *server,
krb5_timestamp authtime, krb5_error_code error_code);
Modified: trunk/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.c
===================================================================
--- trunk/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.c 2010-07-13 15:53:23 UTC (rev 24185)
+++ trunk/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.c 2010-07-13 16:09:01 UTC (rev 24186)
@@ -542,10 +542,10 @@
return retval;
}
-krb5_error_code
+void
krb5_ldap_audit_as_req(krb5_context kcontext, krb5_kdc_req *request,
krb5_db_entry *client, krb5_db_entry *server,
krb5_timestamp authtime, krb5_error_code error_code)
{
- return krb5_ldap_lockout_audit(kcontext, client, authtime, error_code);
+ (void) krb5_ldap_lockout_audit(kcontext, client, authtime, error_code);
}
Modified: trunk/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
===================================================================
--- trunk/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h 2010-07-13 15:53:23 UTC (rev 24185)
+++ trunk/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h 2010-07-13 16:09:01 UTC (rev 24186)
@@ -302,7 +302,7 @@
krb5_timestamp kdc_time, const char **status,
krb5_data *e_data);
-krb5_error_code
+void
krb5_ldap_audit_as_req(krb5_context kcontext, krb5_kdc_req *request,
krb5_db_entry *client, krb5_db_entry *server,
krb5_timestamp authtime, krb5_error_code error_code);
More information about the cvs-krb5
mailing list