diff options
| author |  Karl Ramm <kcr@1ts.org> | 2009-03-31 15:35:01 +0000 |
|---|---|---|
| committer | Karl Ramm <kcr@1ts.org> | 2009-03-31 15:35:01 +0000 |
| commit | 3ce81669187e97cef584f4475047d93c581673c8 (patch) | |
| tree | a454a366fd54b5f3d5ffafbe48cf905e4e00fc39 | |
| parent | b78725faf30453e112e87a3b1a6de8ac3d125d47 (diff) | |
keep zephyrd's ticket files in /var/run, not under /etc
| -rw-r--r-- | server/main.c | 4 | ||||
| -rw-r--r-- | server/zsrv_conf.h | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/server/main.c b/server/main.c index 27b33c1..deac8dd 100644 --- a/server/main.c +++ b/server/main.c @@ -163,11 +163,11 @@ main(int argc, sprintf(list_file, "%s/zephyr/%s", SYSCONFDIR, SERVER_LIST_FILE); #ifdef HAVE_KRB4 sprintf(srvtab_file, "%s/zephyr/%s", SYSCONFDIR, ZEPHYR_SRVTAB); - sprintf(tkt_file, "%s/zephyr/%s", SYSCONFDIR, ZEPHYR_TKFILE); + strcpy(tkt_file, ZEPHYR_TKFILE); #endif #ifdef HAVE_KRB5 sprintf(keytab_file, "%s/zephyr/%s", SYSCONFDIR, ZEPHYR_KEYTAB); - sprintf(tkt5_file, "FILE:%s/zephyr/%s", SYSCONFDIR, ZEPHYR_TK5FILE); + strcpy(tkt5_file, ZEPHYR_TK5FILE); #endif sprintf(acl_dir, "%s/zephyr/%s", SYSCONFDIR, ZEPHYR_ACL_DIR); sprintf(subs_file, "%s/zephyr/%s", SYSCONFDIR, DEFAULT_SUBS_FILE); diff --git a/server/zsrv_conf.h b/server/zsrv_conf.h index 5508e3a..9c2f674 100644 --- a/server/zsrv_conf.h +++ b/server/zsrv_conf.h @@ -14,17 +14,18 @@ #define __ZSRV_CONF_H__ #include <zephyr/mit-copyright.h> -/* Path names are relative to CONFDIR, except for the class registry. */ +/* Path names are relative to CONFDIR, except for the class registry and + ticket files. */ #define SERVER_LIST_FILE "server.list" #define REALM_LIST_FILE "realm.list" #ifdef HAVE_KRB5 #define ZEPHYR_KEYTAB "krb5.keytab" -#define ZEPHYR_TK5FILE "z5tkts" +#define ZEPHYR_TK5FILE "/var/run/zephyrd.tkt" #endif #ifdef HAVE_KRB4 #define ZEPHYR_SRVTAB "srvtab" -#define ZEPHYR_TKFILE "ztkts" +#define ZEPHYR_TKFILE "/var/run/zephyrd.tkt4" #endif #define ZEPHYR_ACL_DIR "acl/" #define ZEPHYR_CLASS_REGISTRY "class-registry.acl" |