From: Theodore Tso <tytso@mit.edu>
Date: Sun, 25 Feb 1996 00:00:39 +0000 (+0000)
Subject: Under windows, let it be %s\v5srvtab.  It will be filled in by the
X-Git-Tag: krb5-1.0-beta6~468
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=354078fdef236a452fd5bb0893164f00a1a94a73;p=krb5.git

Under windows, let it be %s\v5srvtab.  It will be filled in by the
krb5_kt_default_name with the name of windows directory.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7527 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/include/krb5/stock/ChangeLog b/src/include/krb5/stock/ChangeLog
index 23ab74913..c3df1478b 100644
--- a/src/include/krb5/stock/ChangeLog
+++ b/src/include/krb5/stock/ChangeLog
@@ -1,3 +1,9 @@
+Sat Feb 24 18:59:39 1996  Theodore Y. Ts'o  <tytso@dcl>
+
+	* osconf.h (DEFAULT_KEYTAB_NAME): Under windows, let it be
+		%s\v5srvtab.  It will be filled in by the
+		krb5_kt_default_name with the name of windows directory.
+
 Thu Oct  5 21:45:13 1995  Theodore Y. Ts'o  <tytso@dcl>
 
 	* osconf.h (DEFAULT_KDC_PROFILE): Change the name of the kdc
diff --git a/src/include/krb5/stock/osconf.h b/src/include/krb5/stock/osconf.h
index 0c5e4eaf8..07b678bef 100644
--- a/src/include/krb5/stock/osconf.h
+++ b/src/include/krb5/stock/osconf.h
@@ -35,10 +35,10 @@
 #endif
 #endif
 
-#ifdef _WINDOWS
+#if defined(_WINDOWS) || defined(WIN32)
 #define DEFAULT_PROFILE_FILENAME "krb5.ini"
 #define	DEFAULT_LNAME_FILENAME	"/aname"
-#define	DEFAULT_KEYTAB_NAME	"FILE:/v5srvtab"
+#define	DEFAULT_KEYTAB_NAME	"FILE:%s\\v5srvtab"
 #else /* !_WINDOWS */
 #define DEFAULT_PROFILE_PATH "/etc/krb5.conf:@PREFIX/lib/krb5.conf"
 #define	DEFAULT_KEYTAB_NAME	"FILE:/etc/v5srvtab"