Imported Upstream version 1.17

[platform/upstream/krb5.git] / src / plugins / kdb / db2 / db2_exp.c

diff --git a/src/plugins/kdb/db2/db2_exp.c b/src/plugins/kdb/db2/db2_exp.c
index 010a79d..4d905db 100644 (file)
--- a/src/plugins/kdb/db2/db2_exp.c
+++ b/src/plugins/kdb/db2/db2_exp.c
@@ -58,12 +58,11 @@
 
 k5_mutex_t *krb5_db2_mutex;
 
-#define WRAP(NAME,TYPE,ARGLIST,ARGNAMES,ERROR_RESULT)   \
+#define WRAP(NAME,TYPE,ARGLIST,ARGNAMES)                \
     static TYPE wrap_##NAME ARGLIST                     \
     {                                                   \
         TYPE result;                                    \
-        int code = k5_mutex_lock (krb5_db2_mutex);      \
-        if (code) { return ERROR_RESULT; }              \
+        k5_mutex_lock (krb5_db2_mutex);                 \
         result = NAME ARGNAMES;                         \
         k5_mutex_unlock (krb5_db2_mutex);               \
         return result;                                  \
@@ -77,8 +76,7 @@ k5_mutex_t *krb5_db2_mutex;
 #define WRAP_VOID(NAME,ARGLIST,ARGNAMES)                \
     static void wrap_##NAME ARGLIST                     \
     {                                                   \
-        int code = k5_mutex_lock (krb5_db2_mutex);      \
-        if (code) { return; }                           \
+        k5_mutex_lock (krb5_db2_mutex);                 \
         NAME ARGNAMES;                                  \
         k5_mutex_unlock (krb5_db2_mutex);               \
     }                                                   \
@@ -86,7 +84,7 @@ k5_mutex_t *krb5_db2_mutex;
     static void wrap_##NAME ()
 
 #define WRAP_K(NAME,ARGLIST,ARGNAMES)                   \
-    WRAP(NAME,krb5_error_code,ARGLIST,ARGNAMES,code)
+    WRAP(NAME,krb5_error_code,ARGLIST,ARGNAMES)
 
 WRAP_K (krb5_db2_open,
         ( krb5_context kcontext,
@@ -119,10 +117,6 @@ WRAP_K (krb5_db2_get_principal,
          unsigned int f,
          krb5_db_entry **d),
         (ctx, p, f, d));
-WRAP_VOID (krb5_db2_free_principal,
-           (krb5_context ctx,
-            krb5_db_entry *d),
-           (ctx, d));
 WRAP_K (krb5_db2_put_principal,
         (krb5_context ctx,
          krb5_db_entry *d,
@@ -137,8 +131,8 @@ WRAP_K (krb5_db2_iterate,
         (krb5_context ctx, char *s,
          krb5_error_code (*f) (krb5_pointer,
                                krb5_db_entry *),
-         krb5_pointer p),
-        (ctx, s, f, p));
+         krb5_pointer p, krb5_flags flags),
+        (ctx, s, f, p, flags));
 
 WRAP_K (krb5_db2_create_policy,
         (krb5_context context, osa_policy_ent_t entry),
@@ -160,9 +154,6 @@ WRAP_K (krb5_db2_iter_policy,
 WRAP_K (krb5_db2_delete_policy,
         ( krb5_context kcontext, char *policy ),
         (kcontext, policy));
-WRAP_VOID (krb5_db2_free_policy,
-           ( krb5_context kcontext, osa_policy_ent_t entry ),
-           (kcontext, entry));
 
 WRAP_K (krb5_db2_promote_db,
         ( krb5_context kcontext, char *conf_section, char **db_args ),
@@ -171,14 +162,17 @@ WRAP_K (krb5_db2_promote_db,
 WRAP_K (krb5_db2_check_policy_as,
         (krb5_context kcontext, krb5_kdc_req *request, krb5_db_entry *client,
          krb5_db_entry *server, krb5_timestamp kdc_time, const char **status,
-         krb5_data *e_data),
+         krb5_pa_data ***e_data),
         (kcontext, request, client, server, kdc_time, status, e_data));
 
 WRAP_VOID (krb5_db2_audit_as_req,
            (krb5_context kcontext, krb5_kdc_req *request,
+            const krb5_address *local_addr,
+            const krb5_address *remote_addr,
             krb5_db_entry *client, krb5_db_entry *server,
             krb5_timestamp authtime, krb5_error_code error_code),
-           (kcontext, request, client, server, authtime, error_code));
+           (kcontext, request, local_addr, remote_addr, client, server,
+            authtime, error_code));
 
 static krb5_error_code
 hack_init (void)
@@ -217,18 +211,15 @@ kdb_vftabl PLUGIN_SYMBOL_NAME(krb5_db2, kdb_function_table) = {
     /* lock */                          wrap_krb5_db2_lock,
     /* unlock */                        wrap_krb5_db2_unlock,
     /* get_principal */                 wrap_krb5_db2_get_principal,
-    /* free_principal */                wrap_krb5_db2_free_principal,
     /* put_principal */                 wrap_krb5_db2_put_principal,
     /* delete_principal */              wrap_krb5_db2_delete_principal,
+    /* rename_principal */              NULL,
     /* iterate */                       wrap_krb5_db2_iterate,
     /* create_policy */                 wrap_krb5_db2_create_policy,
     /* get_policy */                    wrap_krb5_db2_get_policy,
     /* put_policy */                    wrap_krb5_db2_put_policy,
     /* iter_policy */                   wrap_krb5_db2_iter_policy,
     /* delete_policy */                 wrap_krb5_db2_delete_policy,
-    /* free_policy */                   wrap_krb5_db2_free_policy,
-    /* alloc */                         krb5_db2_alloc,
-    /* free */                          krb5_db2_free,
     /* blah blah blah */ 0,0,0,0,0,
     /* promote_db */                    wrap_krb5_db2_promote_db,
     0, 0, 0, 0,