17f4504fcd41a142b6c40b36428e2b2895b08dbc
[openwrt/svn-archive/archive.git] / net / krb5 / patches / 002-krb5kdc-dir-to-etc.patch
1 diff -u --recursive krb5-1.7-vanilla/src/include/osconf.hin krb5-1.7/src/include/osconf.hin
2 --- krb5-1.7-vanilla/src/include/osconf.hin 2010-01-08 21:37:20.940046728 -0500
3 +++ krb5-1.7/src/include/osconf.hin 2010-01-08 21:38:54.152350440 -0500
4 @@ -61,14 +61,14 @@
5 #define DEFAULT_LNAME_FILENAME "@PREFIX/lib/krb5.aname"
6 #endif /* _WINDOWS */
7
8 -#define DEFAULT_KDB_FILE "@LOCALSTATEDIR/krb5kdc/principal"
9 -#define DEFAULT_KEYFILE_STUB "@LOCALSTATEDIR/krb5kdc/.k5."
10 -#define KRB5_DEFAULT_ADMIN_ACL "@LOCALSTATEDIR/krb5kdc/krb5_adm.acl"
11 +#define DEFAULT_KDB_FILE "/etc/krb5kdc/principal"
12 +#define DEFAULT_KEYFILE_STUB "/etc/krb5kdc/.k5."
13 +#define KRB5_DEFAULT_ADMIN_ACL "/etc/krb5kdc/krb5_adm.acl"
14 /* Used by old admin server */
15 -#define DEFAULT_ADMIN_ACL "@LOCALSTATEDIR/krb5kdc/kadm_old.acl"
16 +#define DEFAULT_ADMIN_ACL "/etc/krb5kdc/kadm_old.acl"
17
18 /* Location of KDC profile */
19 -#define DEFAULT_KDC_PROFILE "@LOCALSTATEDIR/krb5kdc/kdc.conf"
20 +#define DEFAULT_KDC_PROFILE "/etc/krb5kdc/kdc.conf"
21 #define KDC_PROFILE_ENV "KRB5_KDC_PROFILE"
22
23 #if TARGET_OS_MAC
24 @@ -97,8 +97,8 @@
25 /*
26 * Defaults for the KADM5 admin system.
27 */
28 -#define DEFAULT_KADM5_KEYTAB "@LOCALSTATEDIR/krb5kdc/kadm5.keytab"
29 -#define DEFAULT_KADM5_ACL_FILE "@LOCALSTATEDIR/krb5kdc/kadm5.acl"
30 +#define DEFAULT_KADM5_KEYTAB "/etc/krb5kdc/kadm5.keytab"
31 +#define DEFAULT_KADM5_ACL_FILE "/etc/krb5kdc/kadm5.acl"
32 #define DEFAULT_KADM5_PORT 749 /* assigned by IANA */
33
34 #define KRB5_DEFAULT_SUPPORTED_ENCTYPES \
35 @@ -123,13 +123,13 @@
36 * krb5 slave support follows
37 */
38
39 -#define KPROP_DEFAULT_FILE "@LOCALSTATEDIR/krb5kdc/slave_datatrans"
40 -#define KPROPD_DEFAULT_FILE "@LOCALSTATEDIR/krb5kdc/from_master"
41 +#define KPROP_DEFAULT_FILE "/etc/krb5kdc/slave_datatrans"
42 +#define KPROPD_DEFAULT_FILE "/etc/krb5kdc/from_master"
43 #define KPROPD_DEFAULT_KDB5_UTIL "@SBINDIR/kdb5_util"
44 #define KPROPD_DEFAULT_KDB5_EDIT "@SBINDIR/kdb5_edit"
45 #define KPROPD_DEFAULT_KPROP "@SBINDIR/kprop"
46 #define KPROPD_DEFAULT_KRB_DB DEFAULT_KDB_FILE
47 -#define KPROPD_ACL_FILE "@LOCALSTATEDIR/krb5kdc/kpropd.acl"
48 +#define KPROPD_ACL_FILE "/etc/krb5kdc/kpropd.acl"
49
50 /*
51 * GSS mechglue