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 23ab749131b2b0a3fcfecf363e2d9d3b13002c58..c3df1478b879afdda1c3b28a74b2036f25e63b04 100644 (file)
--- 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 0c5e4eaf89ad8b34e933d1b101381d748ba6f95b..07b678bef89a79a5ac104f2964b8eb271796e121 100644 (file)
--- 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"