1 Index: heimdal-0.7.2.dfsg.1/lib/hdb/hdb.h
2 ===================================================================
3 --- heimdal-0.7.2.dfsg.1.orig/lib/hdb/hdb.h 2006-05-13 16:42:53.000000000 +1000
4 +++ heimdal-0.7.2.dfsg.1/lib/hdb/hdb.h 2006-05-13 16:42:58.000000000 +1000
6 krb5_error_code (*create)(krb5_context, HDB **, const char *filename);
9 -#define HDB_DB_DIR "/var/heimdal"
10 +#define HDB_DB_DIR "/var/lib/heimdal-kdc"
11 #define HDB_DEFAULT_DB HDB_DB_DIR "/heimdal"
12 #define HDB_DB_FORMAT_ENTRY "hdb/db-format"
14 Index: heimdal-0.7.2.dfsg.1/appl/telnet/telnetd/telnetd.h
15 ===================================================================
16 --- heimdal-0.7.2.dfsg.1.orig/appl/telnet/telnetd/telnetd.h 2006-05-13 16:42:53.000000000 +1000
17 +++ heimdal-0.7.2.dfsg.1/appl/telnet/telnetd/telnetd.h 2006-05-13 16:42:58.000000000 +1000
22 -#define _PATH_LOGIN BINDIR "/login"
23 +#define _PATH_LOGIN "/bin/login"
27 Index: heimdal-0.7.2.dfsg.1/kdc/kdc.8
28 ===================================================================
29 --- heimdal-0.7.2.dfsg.1.orig/kdc/kdc.8 2006-05-13 16:42:53.000000000 +1000
30 +++ heimdal-0.7.2.dfsg.1/kdc/kdc.8 2006-05-13 16:42:58.000000000 +1000
32 .Fl -config-file= Ns Ar file
34 Specifies the location of the config file, the default is
35 -.Pa /var/heimdal/kdc.conf .
36 +.Pa /etc/heimdal-kdc/kdc.conf .
37 This is the only value that can't be specified in the config file.
40 Index: heimdal-0.7.2.dfsg.1/doc/setup.texi
41 ===================================================================
42 --- heimdal-0.7.2.dfsg.1.orig/doc/setup.texi 2006-05-13 16:42:53.000000000 +1000
43 +++ heimdal-0.7.2.dfsg.1/doc/setup.texi 2006-05-13 16:42:58.000000000 +1000
47 Access to the administration server is controlled by an ACL file, (default
48 -@file{/var/heimdal/kadmind.acl}.) The lines in the access file, have the
49 +@file{/etc/heimdal-kdc/kadmind.acl}.) The lines in the access file, have the
52 principal [priv1,priv2,...] [glob-pattern]
53 Index: heimdal-0.7.2.dfsg.1/kdc/kdc_locl.h
54 ===================================================================
55 --- heimdal-0.7.2.dfsg.1.orig/kdc/kdc_locl.h 2006-05-13 16:42:53.000000000 +1000
56 +++ heimdal-0.7.2.dfsg.1/kdc/kdc_locl.h 2006-05-13 16:42:58.000000000 +1000
58 extern int enable_pkinit_princ_in_cert;
61 -#define _PATH_KDC_CONF HDB_DB_DIR "/kdc.conf"
62 +#define _PATH_KDC_CONF "/etc/heimdal-kdc/kdc.conf"
63 #define DEFAULT_LOG_DEST "0-1/FILE:" HDB_DB_DIR "/kdc.log"
65 extern struct timeval now;
66 Index: heimdal-0.7.2.dfsg.1/lib/kadm5/context_s.c
67 ===================================================================
68 --- heimdal-0.7.2.dfsg.1.orig/lib/kadm5/context_s.c 2006-05-13 16:42:53.000000000 +1000
69 +++ heimdal-0.7.2.dfsg.1/lib/kadm5/context_s.c 2006-05-13 16:42:58.000000000 +1000
71 set_config(ctx, default_binding);
73 ctx->config.dbname = strdup(HDB_DEFAULT_DB);
74 - ctx->config.acl_file = strdup(HDB_DB_DIR "/kadmind.acl");
75 + ctx->config.acl_file = strdup("/etc/heimdal-kdc/kadmind.acl");
76 ctx->config.stash_file = strdup(HDB_DB_DIR "/m-key");
77 ctx->log_context.log_file = strdup(HDB_DB_DIR "/log");
78 memset(&ctx->log_context.socket_name, 0,
79 Index: heimdal-0.7.2.dfsg.1/kadmin/kadmind.8
80 ===================================================================
81 --- heimdal-0.7.2.dfsg.1.orig/kadmin/kadmind.8 2006-05-13 16:42:53.000000000 +1000
82 +++ heimdal-0.7.2.dfsg.1/kadmin/kadmind.8 2006-05-13 16:42:58.000000000 +1000
84 Principals are always allowed to change their own password and list
85 their own principal. Apart from that, doing any operation requires
86 permission explicitly added in the ACL file
87 -.Pa /var/heimdal/kadmind.acl .
88 +.Pa /etc/heimdal-kdc/kadmind.acl .
89 The format of this file is:
96 -.Pa /var/heimdal/kadmind.acl
97 +.Pa /etc/heimdal-kdc/kadmind.acl
101 Index: heimdal-0.7.2.dfsg.1/lib/kadm5/truncate_log.c
102 ===================================================================
103 --- heimdal-0.7.2.dfsg.1.orig/lib/kadm5/truncate_log.c 2003-11-19 10:19:26.000000000 +1100
104 +++ heimdal-0.7.2.dfsg.1/lib/kadm5/truncate_log.c 2006-05-14 10:33:39.054471619 +1000
108 if (config_file == NULL)
109 - config_file = HDB_DB_DIR "/kdc.conf";
110 + config_file = "/etc/heimdal-kdc/kdc.conf";
112 ret = krb5_prepend_config_files_default(config_file, &files);
114 Index: heimdal-0.7.2.dfsg.1/lib/kadm5/dump_log.c
115 ===================================================================
116 --- heimdal-0.7.2.dfsg.1.orig/lib/kadm5/dump_log.c 2005-04-26 04:17:51.000000000 +1000
117 +++ heimdal-0.7.2.dfsg.1/lib/kadm5/dump_log.c 2006-05-14 10:33:13.743359875 +1000
121 if (config_file == NULL)
122 - config_file = HDB_DB_DIR "/kdc.conf";
123 + config_file = "/etc/heimdal-kdc/kdc.conf";
125 ret = krb5_prepend_config_files_default(config_file, &files);
127 Index: heimdal-0.7.2.dfsg.1/kadmin/kadmind.c
128 ===================================================================
129 --- heimdal-0.7.2.dfsg.1.orig/kadmin/kadmind.c 2005-04-15 21:16:32.000000000 +1000
130 +++ heimdal-0.7.2.dfsg.1/kadmin/kadmind.c 2006-05-14 10:27:22.837834789 +1000
134 if (config_file == NULL)
135 - config_file = HDB_DB_DIR "/kdc.conf";
136 + config_file = "/etc/heimdal-kdc/kdc.conf";
138 ret = krb5_prepend_config_files_default(config_file, &files);
140 Index: heimdal-0.7.2.dfsg.1/kadmin/kadmin.c
141 ===================================================================
142 --- heimdal-0.7.2.dfsg.1.orig/kadmin/kadmin.c 2005-05-10 01:35:22.000000000 +1000
143 +++ heimdal-0.7.2.dfsg.1/kadmin/kadmin.c 2006-05-14 10:27:03.969138000 +1000
147 if (config_file == NULL)
148 - config_file = HDB_DB_DIR "/kdc.conf";
149 + config_file = "/etc/heimdal-kdc/kdc.conf";
151 ret = krb5_prepend_config_files_default(config_file, &files);
153 Index: heimdal-0.7.2.dfsg.1/lib/kadm5/replay_log.c
154 ===================================================================
155 --- heimdal-0.7.2.dfsg.1.orig/lib/kadm5/replay_log.c 2003-11-19 10:19:22.000000000 +1100
156 +++ heimdal-0.7.2.dfsg.1/lib/kadm5/replay_log.c 2006-05-14 10:33:28.976621605 +1000
160 if (config_file == NULL)
161 - config_file = HDB_DB_DIR "/kdc.conf";
162 + config_file = "/etc/heimdal-kdc/kdc.conf";
164 ret = krb5_prepend_config_files_default(config_file, &files);
166 Index: heimdal-0.7.2.dfsg.1/lib/kadm5/ipropd_slave.c
167 ===================================================================
168 --- heimdal-0.7.2.dfsg.1.orig/lib/kadm5/ipropd_slave.c 2005-05-24 03:39:35.000000000 +1000
169 +++ heimdal-0.7.2.dfsg.1/lib/kadm5/ipropd_slave.c 2006-05-14 10:31:34.812853916 +1000
173 if (config_file == NULL)
174 - config_file = HDB_DB_DIR "/kdc.conf";
175 + config_file = "/etc/heimdal-kdc/kdc.conf";
177 ret = krb5_prepend_config_files_default(config_file, &files);
179 Index: heimdal-0.7.2.dfsg.1/lib/kadm5/ipropd_master.c
180 ===================================================================
181 --- heimdal-0.7.2.dfsg.1.orig/lib/kadm5/ipropd_master.c 2005-05-24 03:38:46.000000000 +1000
182 +++ heimdal-0.7.2.dfsg.1/lib/kadm5/ipropd_master.c 2006-05-14 10:31:17.286905672 +1000
186 if (config_file == NULL)
187 - config_file = HDB_DB_DIR "/kdc.conf";
188 + config_file = "/etc/heimdal-kdc/kdc.conf";
190 ret = krb5_prepend_config_files_default(config_file, &files);
192 Index: heimdal-0.7.2.dfsg.1/kpasswd/kpasswdd.c
193 ===================================================================
194 --- heimdal-0.7.2.dfsg.1.orig/kpasswd/kpasswdd.c 2005-04-22 21:03:11.000000000 +1000
195 +++ heimdal-0.7.2.dfsg.1/kpasswd/kpasswdd.c 2006-05-14 10:27:49.778564590 +1000
199 if (config_file == NULL)
200 - config_file = HDB_DB_DIR "/kdc.conf";
201 + config_file = "/etc/heimdal-kdc/kdc.conf";
203 ret = krb5_prepend_config_files_default(config_file, &files);