52 lines
2.1 KiB
Diff
52 lines
2.1 KiB
Diff
|
diff -u --recursive krb5-1.7-vanilla/src/include/osconf.hin krb5-1.7/src/include/osconf.hin
|
||
|
|
--- krb5-1.7-vanilla/src/include/osconf.hin 2010-01-08 21:37:20.940046728 -0500
|
||
|
|
+++ krb5-1.7/src/include/osconf.hin 2010-01-08 21:38:54.152350440 -0500
|
||
|
|
@@ -61,14 +61,14 @@
|
||
|
|
#define DEFAULT_LNAME_FILENAME "@PREFIX/lib/krb5.aname"
|
||
|
|
#endif /* _WINDOWS */
|
||
|
|
|
||
|
|
-#define DEFAULT_KDB_FILE "@LOCALSTATEDIR/krb5kdc/principal"
|
||
|
|
-#define DEFAULT_KEYFILE_STUB "@LOCALSTATEDIR/krb5kdc/.k5."
|
||
|
|
-#define KRB5_DEFAULT_ADMIN_ACL "@LOCALSTATEDIR/krb5kdc/krb5_adm.acl"
|
||
|
|
+#define DEFAULT_KDB_FILE "/etc/krb5kdc/principal"
|
||
|
|
+#define DEFAULT_KEYFILE_STUB "/etc/krb5kdc/.k5."
|
||
|
|
+#define KRB5_DEFAULT_ADMIN_ACL "/etc/krb5kdc/krb5_adm.acl"
|
||
|
|
/* Used by old admin server */
|
||
|
|
-#define DEFAULT_ADMIN_ACL "@LOCALSTATEDIR/krb5kdc/kadm_old.acl"
|
||
|
|
+#define DEFAULT_ADMIN_ACL "/etc/krb5kdc/kadm_old.acl"
|
||
|
|
|
||
|
|
/* Location of KDC profile */
|
||
|
|
-#define DEFAULT_KDC_PROFILE "@LOCALSTATEDIR/krb5kdc/kdc.conf"
|
||
|
|
+#define DEFAULT_KDC_PROFILE "/etc/krb5kdc/kdc.conf"
|
||
|
|
#define KDC_PROFILE_ENV "KRB5_KDC_PROFILE"
|
||
|
|
|
||
|
|
#if TARGET_OS_MAC
|
||
|
|
@@ -97,8 +97,8 @@
|
||
|
|
/*
|
||
|
|
* Defaults for the KADM5 admin system.
|
||
|
|
*/
|
||
|
|
-#define DEFAULT_KADM5_KEYTAB "@LOCALSTATEDIR/krb5kdc/kadm5.keytab"
|
||
|
|
-#define DEFAULT_KADM5_ACL_FILE "@LOCALSTATEDIR/krb5kdc/kadm5.acl"
|
||
|
|
+#define DEFAULT_KADM5_KEYTAB "/etc/krb5kdc/kadm5.keytab"
|
||
|
|
+#define DEFAULT_KADM5_ACL_FILE "/etc/krb5kdc/kadm5.acl"
|
||
|
|
#define DEFAULT_KADM5_PORT 749 /* assigned by IANA */
|
||
|
|
|
||
|
|
#define KRB5_DEFAULT_SUPPORTED_ENCTYPES \
|
||
|
|
@@ -123,13 +123,13 @@
|
||
|
|
* krb5 slave support follows
|
||
|
|
*/
|
||
|
|
|
||
|
|
-#define KPROP_DEFAULT_FILE "@LOCALSTATEDIR/krb5kdc/slave_datatrans"
|
||
|
|
-#define KPROPD_DEFAULT_FILE "@LOCALSTATEDIR/krb5kdc/from_master"
|
||
|
|
+#define KPROP_DEFAULT_FILE "/etc/krb5kdc/slave_datatrans"
|
||
|
|
+#define KPROPD_DEFAULT_FILE "/etc/krb5kdc/from_master"
|
||
|
|
#define KPROPD_DEFAULT_KDB5_UTIL "@SBINDIR/kdb5_util"
|
||
|
|
#define KPROPD_DEFAULT_KDB5_EDIT "@SBINDIR/kdb5_edit"
|
||
|
|
#define KPROPD_DEFAULT_KPROP "@SBINDIR/kprop"
|
||
|
|
#define KPROPD_DEFAULT_KRB_DB DEFAULT_KDB_FILE
|
||
|
|
-#define KPROPD_ACL_FILE "@LOCALSTATEDIR/krb5kdc/kpropd.acl"
|
||
|
|
+#define KPROPD_ACL_FILE "/etc/krb5kdc/kpropd.acl"
|
||
|
|
|
||
|
|
/*
|
||
|
|
* GSS mechglue
|