diff options
| author | Theodore Tso <tytso@mit.edu> | 1994-12-19 23:07:39 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1994-12-19 23:07:39 +0000 |
| commit | fd36a5a8fa518d256eecef38ff74f1cf0e5ea53b (patch) | |
| tree | a28b29689aab820c0d51f934db9ac0c1f5242613 | |
| parent | 3c8d1dca27c8880ebf395172cb6d20001a7af738 (diff) | |
| download | krb5-fd36a5a8fa518d256eecef38ff74f1cf0e5ea53b.tar.gz krb5-fd36a5a8fa518d256eecef38ff74f1cf0e5ea53b.tar.xz krb5-fd36a5a8fa518d256eecef38ff74f1cf0e5ea53b.zip | |
Do the right thing if we are compiling without V4 support. (The
dump_v4db command is disabled.)
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4736 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/admin/edit/ChangeLog | 7 | ||||
| -rw-r--r-- | src/admin/edit/Makefile.in | 5 | ||||
| -rw-r--r-- | src/admin/edit/configure.in | 7 | ||||
| -rw-r--r-- | src/admin/edit/dumpv4.c | 11 |
4 files changed, 27 insertions, 3 deletions
diff --git a/src/admin/edit/ChangeLog b/src/admin/edit/ChangeLog index c1516e9f3..c7049b108 100644 --- a/src/admin/edit/ChangeLog +++ b/src/admin/edit/ChangeLog @@ -1,3 +1,10 @@ +Mon Dec 19 18:04:11 1994 Theodore Y. Ts'o (tytso@dcl) + + * configure.in: + * Makefile.in: + * dumpv4.c (dump_v4db): Do the right thing if we are compiling + without V4 support. (The dump_v4db command is disabled.) + Wed Dec 7 00:07:46 1994 <tytso@rsx-11.mit.edu> * dumpv4.c (v4_print_time): gmtime expects a pointer to a time_t, diff --git a/src/admin/edit/Makefile.in b/src/admin/edit/Makefile.in index 65c84dc7f..335092337 100644 --- a/src/admin/edit/Makefile.in +++ b/src/admin/edit/Makefile.in @@ -9,8 +9,7 @@ DBMLIB= KDBLIB=$(TOPLIBD)/libkdb5.a DEPKDBLIB=$(TOPLIBD)/libkdb5.a -KDB4LIB=$(KRB4)/lib/libkdb.a -KRB4LIB=$(KRB4)/lib/libkrb.a $(TOPLIBD)/libdes425.a +K4LIB=@K4LIB@ all:: @@ -19,7 +18,7 @@ DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) $(DB DEPLIBS = $(DEPKDBLIB) $(DEPKLIB) -LOCAL_LIBRARIES = $(KDBLIB) $(KLIB) $(KDB4LIB) $(KRB4LIB) +LOCAL_LIBRARIES = $(KDBLIB) $(KLIB) $(K4LIB) LOCALINCLUDE=-I$(SRCTOP)/include/kerberosIV -I$(BUILDTOP)/include/kerberosIV OBJS= kdb5_edit.o kdb5_ed_ct.o util.o dump.o dumpv4.o ss_wrapper.o diff --git a/src/admin/edit/configure.in b/src/admin/edit/configure.in index d3a3cbc81..73d33b828 100644 --- a/src/admin/edit/configure.in +++ b/src/admin/edit/configure.in @@ -12,5 +12,12 @@ SS_RULES KRB_INCLUDE ISODE_INCLUDE WITH_KRB4 +AC_ARG_WITH([krb4], +[ --with-krb4=KRB4DIR build with Kerberos V4 backwards compatibility], +ADD_DEF(-DKRB4) +K4LIB='$(KRB4)/lib/libkdb.a $(KRB4)/lib/libkrb.a $(KRB4)/lib/libdes.a', +echo "warning: no krb4 backwards compatibility support" +K4LIB=) +AC_SUBST(K4LIB) WITH_KRB5ROOT V5_AC_OUTPUT_MAKEFILE diff --git a/src/admin/edit/dumpv4.c b/src/admin/edit/dumpv4.c index f31c5bce7..c542603b6 100644 --- a/src/admin/edit/dumpv4.c +++ b/src/admin/edit/dumpv4.c @@ -24,6 +24,8 @@ * Dump a KDC database into a V4 slave dump. */ +#ifdef KRB4 + #include <des.h> #include <krb.h> #include <krb_db.h> @@ -364,3 +366,12 @@ handle_one_key(arg, v5master, v5key, v4key) return 0; } + +#else /* KRB4 */ +void dump_v4db(argc, argv) + int argc; + char **argv; +{ + printf("This version of krb5_edit does not support the V4 dump command.\n"); +} +#endif /* KRB4 */ |