Novell Database Abstraction Layer merge.

[krb5.git] / src / kadmin / dbutil / ovload.c

diff --git a/src/kadmin/dbutil/ovload.c b/src/kadmin/dbutil/ovload.c
index 15978f8a37fead1e994fc8ba11b077bc0933bc94..f4338bc906287eaa1d16aff5df3c7b84dd1feb69 100644 (file)
--- a/src/kadmin/dbutil/ovload.c
+++ b/src/kadmin/dbutil/ovload.c
@@ -5,7 +5,10 @@
 #include    <memory.h>
 #endif
 
-#include    <kadm5/adb.h>
+#include    <k5-int.h>
+#include <kadm5/admin.h>
+#include <kadm5/server_internal.h>
+#include    <krb5/kdb.h>
 #include    "import_err.h"
 #include    "kdb5_util.h"
 #include    "nstrtok.h"
@@ -92,17 +95,16 @@ done:
  *     [modifies]
  * 
  */
-int process_ov_principal(fname, kcontext, filep, verbose, linenop, pol_db)
+int process_ov_principal(fname, kcontext, filep, verbose, linenop)
     char               *fname;
     krb5_context       kcontext;
     FILE               *filep;
     int                        verbose;
     int                        *linenop;
-    void *pol_db;
 {
     XDR                            xdrs;
     osa_princ_ent_t        rec;
-    osa_adb_ret_t          ret;
+    krb5_error_code        ret;
     krb5_tl_data           tl_data;
     krb5_principal         princ;
     krb5_db_entry          kdb;
@@ -177,7 +179,7 @@ int process_ov_principal(fname, kcontext, filep, verbose, linenop, pol_db)
     xdralloc_create(&xdrs, XDR_ENCODE);
     if (! xdr_osa_princ_ent_rec(&xdrs, rec)) {
         xdr_destroy(&xdrs);
-        ret = OSA_ADB_XDR_FAILURE;
+        ret = KADM5_XDR_FAILURE;
         goto done;
     }