aboutsummaryrefslogtreecommitdiff
path: root/src/tests/verify
diff options
context:
space:
mode:
Diffstat (limited to 'src/tests/verify')
-rw-r--r--src/tests/verify/ChangeLog6
-rw-r--r--src/tests/verify/Makefile.in3
-rw-r--r--src/tests/verify/kdb5_verify.c5
3 files changed, 12 insertions, 2 deletions
diff --git a/src/tests/verify/ChangeLog b/src/tests/verify/ChangeLog
index c978b27..61b7357 100644
--- a/src/tests/verify/ChangeLog
+++ b/src/tests/verify/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-20 Ken Raeburn <raeburn@mit.edu>
+
+ Novell merge.
+ * Makefile.in:
+ * kdb5_verify.c:
+
2002-08-29 Ken Raeburn <raeburn@mit.edu>
* Makefile.in: Revert $(S)=>/ change, for Windows support.
diff --git a/src/tests/verify/Makefile.in b/src/tests/verify/Makefile.in
index 249e70e..0444803 100644
--- a/src/tests/verify/Makefile.in
+++ b/src/tests/verify/Makefile.in
@@ -4,13 +4,14 @@ mydir=verify
BUILDTOP=$(REL)..$(S)..
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
+KDB5_DEP_LIB=-lpthread -ldl
SRCS=$(srcdir)/kdb5_verify.c
all:: kdb5_verify
kdb5_verify: kdb5_verify.o $(KDB5_DEPLIBS) $(KRB5_BASE_DEPLIBS)
- $(CC_LINK) -o kdb5_verify kdb5_verify.o $(KDB5_LIBS) $(KRB5_BASE_LIBS)
+ $(CC_LINK) -o kdb5_verify kdb5_verify.o $(KDB5_LIBS) $(KDB5_DEP_LIB) $(KRB5_BASE_LIBS)
install::
diff --git a/src/tests/verify/kdb5_verify.c b/src/tests/verify/kdb5_verify.c
index 878104d..60c082f 100644
--- a/src/tests/verify/kdb5_verify.c
+++ b/src/tests/verify/kdb5_verify.c
@@ -361,11 +361,14 @@ set_dbname_help(context, pname, dbname)
krb5_boolean more;
krb5_data pwd, scratch;
+#if 0
if ((retval = krb5_db_set_name(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(context, mkey_name, cur_realm, 0,
@@ -397,7 +400,7 @@ set_dbname_help(context, pname, dbname)
return(1);
}
}
- if ((retval = krb5_db_init(context ))) {
+ if ((retval = krb5_db_open(context, NULL, KRB5_KDB_OPEN_RO))) {
com_err(pname, retval, "while initializing database");
return(1);
}