diff options
Diffstat (limited to 'src/kadmin/dbutil/ovload.c')
| -rw-r--r-- | src/kadmin/dbutil/ovload.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/kadmin/dbutil/ovload.c b/src/kadmin/dbutil/ovload.c index 6cecac7d7c..e8075f114d 100644 --- a/src/kadmin/dbutil/ovload.c +++ b/src/kadmin/dbutil/ovload.c @@ -7,13 +7,14 @@ #include <kadm5/adb.h> #include "import_err.h" +#include "kdb5_util.h" char *nstrtok(); #define LINESIZE 32768 /* XXX */ #define PLURAL(count) (((count) == 1) ? error_message(IMPORT_SINGLE_RECORD) : error_message(IMPORT_PLURAL_RECORDS)) -int parse_pw_hist_ent(current, hist) +static int parse_pw_hist_ent(current, hist) char *current; osa_pw_hist_ent *hist; { @@ -108,7 +109,7 @@ int process_ov_principal(fname, kcontext, filep, verbose, linenop, pol_db) krb5_db_entry kdb; char *current; char *cp; - int tmp, x, i, one; + int x, one; krb5_boolean more; char line[LINESIZE]; @@ -186,16 +187,16 @@ int process_ov_principal(fname, kcontext, filep, verbose, linenop, pol_db) tl_data.tl_data_contents = (krb5_octet *) xdralloc_getdata(&xdrs); one = 1; - ret = krb5_db_get_principal(kcontext, princ, &kdb, &one, - &more); + ret = krb5_db_get_principal(kcontext, princ, &kdb, &one, &more); if (ret) goto done; - if (ret = krb5_dbe_update_tl_data(kcontext, &kdb, - &tl_data)) + ret = krb5_dbe_update_tl_data(kcontext, &kdb, &tl_data); + if (ret) goto done; - if (ret = krb5_db_put_principal(kcontext, &kdb, &one)) + ret = krb5_db_put_principal(kcontext, &kdb, &one); + if (ret) goto done; xdr_destroy(&xdrs); |