diff options
Diffstat (limited to 'src/tests/create')
| -rw-r--r-- | src/tests/create/ChangeLog | 6 | ||||
| -rw-r--r-- | src/tests/create/Makefile.in | 3 | ||||
| -rw-r--r-- | src/tests/create/kdb5_mkdums.c | 8 |
3 files changed, 16 insertions, 1 deletions
diff --git a/src/tests/create/ChangeLog b/src/tests/create/ChangeLog index 8d2b01aa6..2078bcab3 100644 --- a/src/tests/create/ChangeLog +++ b/src/tests/create/ChangeLog @@ -1,3 +1,9 @@ +2005-06-20 Ken Raeburn <raeburn@mit.edu> + + Novell merge. + * Makefile.in: + * kdb5_mkdums.c: + 2004-05-24 Ezra Peisach <epeisach@mit.edu> * kdb5_mkdums.c (main): Fix memory leak of master principal at exit. diff --git a/src/tests/create/Makefile.in b/src/tests/create/Makefile.in index c9042bd67..6a566b827 100644 --- a/src/tests/create/Makefile.in +++ b/src/tests/create/Makefile.in @@ -5,11 +5,12 @@ BUILDTOP=$(REL)..$(S).. PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) SRCS=$(srcdir)/kdb5_mkdums.c +KDB5_DEP_LIBS=-lpthread -ldl all:: kdb5_mkdums kdb5_mkdums: kdb5_mkdums.o $(KDB5_DEPLIBS) $(KRB5_BASE_DEPLIBS) - $(CC_LINK) -o kdb5_mkdums kdb5_mkdums.o $(KDB5_LIBS) $(KRB5_BASE_LIBS) + $(CC_LINK) -o kdb5_mkdums kdb5_mkdums.o $(KDB5_DEP_LIBS) $(KDB5_LIBS) $(KRB5_BASE_LIBS) all:: kdb5_mkdums diff --git a/src/tests/create/kdb5_mkdums.c b/src/tests/create/kdb5_mkdums.c index 024664c80..9d1799cfc 100644 --- a/src/tests/create/kdb5_mkdums.c +++ b/src/tests/create/kdb5_mkdums.c @@ -323,7 +323,10 @@ add_princ(context, str_newprinc) fprintf(stdout, "Added %s to database\n", princ_name); error: /* Do cleanup of newentry regardless of error */ +#if 0 krb5_dbe_free_contents(context, &newentry); +#endif + krb5_db_free_principal(context, &newentry, 1); return; } @@ -337,11 +340,13 @@ char *dbname; krb5_boolean more; krb5_data pwd, scratch; +#if 0 if ((retval = krb5_db_set_name(test_context, dbname))) { com_err(pname, retval, "while setting active database to '%s'", dbname); return(1); } +#endif /* assemble & parse the master key name */ if ((retval = krb5_db_setup_mkey_name(test_context, mkey_name, cur_realm, @@ -375,7 +380,10 @@ char *dbname; return(1); } } +#if 0 if ((retval = krb5_db_init(test_context))) { +#endif + if ((retval = krb5_db_open(test_context, NULL, KRB5_KDB_OPEN_RO))) { com_err(pname, retval, "while initializing database"); return(1); } |