summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKeith Vetter <keithv@fusion.com>1995-09-29 03:53:36 +0000
committerKeith Vetter <keithv@fusion.com>1995-09-29 03:53:36 +0000
commit98789fc8c5500ede8d0c77a02583aa7ab2d863bc (patch)
tree9269718cbfed8e83bf73c6873ad1eb7da9de9331 /src
parent776389d695336a046cea6990411eac28f74f72e4 (diff)
downloadkrb5-98789fc8c5500ede8d0c77a02583aa7ab2d863bc.tar.gz
krb5-98789fc8c5500ede8d0c77a02583aa7ab2d863bc.tar.xz
krb5-98789fc8c5500ede8d0c77a02583aa7ab2d863bc.zip
Rename verify.c to t_verify.c to remove conflict with
gssapi/krb5/verify.c on the Mac. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6884 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/lib/crypto/des/ChangeLog5
-rw-r--r--src/lib/crypto/des/Makefile.in6
-rw-r--r--src/lib/crypto/des/t_verify.c (renamed from src/lib/crypto/des/verify.c)0
3 files changed, 8 insertions, 3 deletions
diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog
index 80254d692..5e1961759 100644
--- a/src/lib/crypto/des/ChangeLog
+++ b/src/lib/crypto/des/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep 28 16:00:00 1995 John Rivlin <jrivlin@fusion.com>
+
+ * Makefile.in: Renamed verify.c to t_verify.c to avoid conflict with
+ lib/gssapi/krb5/verify.c on the Mac.
+
Mon Sep 25 16:48:36 1995 Theodore Y. Ts'o <tytso@dcl>
* Makefile.in: Removed "foo:: foo-$(WHAT)" lines from the
diff --git a/src/lib/crypto/des/Makefile.in b/src/lib/crypto/des/Makefile.in
index 5cd1c04ee..4cd74bdcb 100644
--- a/src/lib/crypto/des/Makefile.in
+++ b/src/lib/crypto/des/Makefile.in
@@ -62,8 +62,8 @@ depend:: $(SRCS)
clean::
$(RM) fp.c ip.c key_perm.h odd.h p.c p_table.h s_table.h
-verify$(EXEEXT): verify.$(OBJEXT) $(DEPKLIB)
- $(CC) -o $@ verify.$(OBJEXT) $(KLIB) $(LIBS) $(CFLAGS) $(LDFLAGS)
+verify$(EXEEXT): t_verify.$(OBJEXT) $(DEPKLIB)
+ $(CC) -o $@ t_verify.$(OBJEXT) $(KLIB) $(LIBS) $(CFLAGS) $(LDFLAGS)
destest$(EXEEXT): destest.$(OBJEXT) $(DEPKLIB)
$(CC) -o $@ destest.$(OBJEXT) $(KLIB) $(LIBS) $(CFLAGS) $(LDFLAGS)
@@ -79,7 +79,7 @@ check-unix:: destest verify
check-windows::
clean::
- $(RM) destest$(EXEEXT) verify$(EXEEXT) destest.$(OBJEXT) verify.$(OBJEXT)
+ $(RM) destest$(EXEEXT) verify$(EXEEXT) destest.$(OBJEXT) t_verify.$(OBJEXT)
clean-unix::
$(RM) shared/*
diff --git a/src/lib/crypto/des/verify.c b/src/lib/crypto/des/t_verify.c
index 7ae08c763..7ae08c763 100644
--- a/src/lib/crypto/des/verify.c
+++ b/src/lib/crypto/des/t_verify.c