patch-src_include_osconf_hin 2.1 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950
  1. --- krb5-1.7.orig/src/include/osconf.hin 2009-01-31 04:57:20.000000000 +0100
  2. +++ krb5-1.7/src/include/osconf.hin 2009-11-01 11:41:43.171362928 +0100
  3. @@ -61,14 +61,14 @@
  4. #define DEFAULT_LNAME_FILENAME "@PREFIX/lib/krb5.aname"
  5. #endif /* _WINDOWS */
  6. -#define DEFAULT_KDB_FILE "@LOCALSTATEDIR/krb5kdc/principal"
  7. -#define DEFAULT_KEYFILE_STUB "@LOCALSTATEDIR/krb5kdc/.k5."
  8. -#define KRB5_DEFAULT_ADMIN_ACL "@LOCALSTATEDIR/krb5kdc/krb5_adm.acl"
  9. +#define DEFAULT_KDB_FILE "@SYSCONFDIR/krb5kdc/principal"
  10. +#define DEFAULT_KEYFILE_STUB "@SYSCONFDIR/krb5kdc/.k5."
  11. +#define KRB5_DEFAULT_ADMIN_ACL "@SYSCONFDIR/krb5kdc/krb5_adm.acl"
  12. /* Used by old admin server */
  13. -#define DEFAULT_ADMIN_ACL "@LOCALSTATEDIR/krb5kdc/kadm_old.acl"
  14. +#define DEFAULT_ADMIN_ACL "@SYSCONFDIR/krb5kdc/kadm_old.acl"
  15. /* Location of KDC profile */
  16. -#define DEFAULT_KDC_PROFILE "@LOCALSTATEDIR/krb5kdc/kdc.conf"
  17. +#define DEFAULT_KDC_PROFILE "@SYSCONFDIR/krb5kdc/kdc.conf"
  18. #define KDC_PROFILE_ENV "KRB5_KDC_PROFILE"
  19. #if TARGET_OS_MAC
  20. @@ -97,8 +97,8 @@
  21. /*
  22. * Defaults for the KADM5 admin system.
  23. */
  24. -#define DEFAULT_KADM5_KEYTAB "@LOCALSTATEDIR/krb5kdc/kadm5.keytab"
  25. -#define DEFAULT_KADM5_ACL_FILE "@LOCALSTATEDIR/krb5kdc/kadm5.acl"
  26. +#define DEFAULT_KADM5_KEYTAB "@SYSCONFDIR/krb5kdc/kadm5.keytab"
  27. +#define DEFAULT_KADM5_ACL_FILE "@SYSCONFDIR/krb5kdc/kadm5.acl"
  28. #define DEFAULT_KADM5_PORT 749 /* assigned by IANA */
  29. #define KRB5_DEFAULT_SUPPORTED_ENCTYPES \
  30. @@ -123,13 +123,13 @@
  31. * krb5 slave support follows
  32. */
  33. -#define KPROP_DEFAULT_FILE "@LOCALSTATEDIR/krb5kdc/slave_datatrans"
  34. -#define KPROPD_DEFAULT_FILE "@LOCALSTATEDIR/krb5kdc/from_master"
  35. +#define KPROP_DEFAULT_FILE "@SYSCONFDIR/krb5kdc/slave_datatrans"
  36. +#define KPROPD_DEFAULT_FILE "@SYSCONFDIR/krb5kdc/from_master"
  37. #define KPROPD_DEFAULT_KDB5_UTIL "@SBINDIR/kdb5_util"
  38. #define KPROPD_DEFAULT_KDB5_EDIT "@SBINDIR/kdb5_edit"
  39. #define KPROPD_DEFAULT_KPROP "@SBINDIR/kprop"
  40. #define KPROPD_DEFAULT_KRB_DB DEFAULT_KDB_FILE
  41. -#define KPROPD_ACL_FILE "@LOCALSTATEDIR/krb5kdc/kpropd.acl"
  42. +#define KPROPD_ACL_FILE "@SYSCONFDIR/krb5kdc/kpropd.acl"
  43. /*
  44. * GSS mechglue