1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950 |
- --- krb5-1.7.orig/src/include/osconf.hin 2009-01-31 04:57:20.000000000 +0100
- +++ krb5-1.7/src/include/osconf.hin 2009-11-01 11:41:43.171362928 +0100
- @@ -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 "@SYSCONFDIR/krb5kdc/principal"
- +#define DEFAULT_KEYFILE_STUB "@SYSCONFDIR/krb5kdc/.k5."
- +#define KRB5_DEFAULT_ADMIN_ACL "@SYSCONFDIR/krb5kdc/krb5_adm.acl"
- /* Used by old admin server */
- -#define DEFAULT_ADMIN_ACL "@LOCALSTATEDIR/krb5kdc/kadm_old.acl"
- +#define DEFAULT_ADMIN_ACL "@SYSCONFDIR/krb5kdc/kadm_old.acl"
-
- /* Location of KDC profile */
- -#define DEFAULT_KDC_PROFILE "@LOCALSTATEDIR/krb5kdc/kdc.conf"
- +#define DEFAULT_KDC_PROFILE "@SYSCONFDIR/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 "@SYSCONFDIR/krb5kdc/kadm5.keytab"
- +#define DEFAULT_KADM5_ACL_FILE "@SYSCONFDIR/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 "@SYSCONFDIR/krb5kdc/slave_datatrans"
- +#define KPROPD_DEFAULT_FILE "@SYSCONFDIR/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 "@SYSCONFDIR/krb5kdc/kpropd.acl"
-
- /*
- * GSS mechglue
|