diff options
-rw-r--r-- | server/Makefile.in | 9 | ||||
-rw-r--r-- | server/main.c | 10 | ||||
-rw-r--r-- | server/realm.c | 4 |
3 files changed, 12 insertions, 11 deletions
diff --git a/server/Makefile.in b/server/Makefile.in index 369144e..56de299 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -51,10 +51,11 @@ check: install: ${INSTALL} -m 755 -s zephyrd ${DESTDIR}${sbindir} ${INSTALL} -m 644 ${srcdir}/zephyrd.8 ${DESTDIR}${mandir}/man8 - ${INSTALL} -m 644 ${srcdir}/default.subscriptions ${DESTDIR}${sysconfdir} - rm -f ${DESTDIR}${sysconfdir}/acl/?*.acl - cp ${srcdir}/acl/?*.acl ${DESTDIR}${sysconfdir}/acl - chmod 644 ${DESTDIR}${sysconfdir}/acl/* + ${INSTALL} -m 644 ${srcdir}/default.subscriptions \ + ${DESTDIR}${sysconfdir}/zephyr + rm -f ${DESTDIR}${sysconfdir}/zephyr/acl/?*.acl + cp ${srcdir}/acl/?*.acl ${DESTDIR}${sysconfdir}/zephyr/acl + chmod 644 ${DESTDIR}${sysconfdir}/zephyr/acl/* clean: rm -f ${OBJS} zephyrd zsrv_err.[ch] diff --git a/server/main.c b/server/main.c index 56714e2..ae9d550 100644 --- a/server/main.c +++ b/server/main.c @@ -140,14 +140,14 @@ main(argc, argv) extern int optind; #ifndef HAVE_HESIOD - sprintf(list_file, "%s/%s", SYSCONFDIR, SERVER_LIST_FILE); + sprintf(list_file, "%s/zephyr/%s", SYSCONFDIR, SERVER_LIST_FILE); #endif #ifdef HAVE_KRB4 - sprintf(srvtab_file, "%s/%s", SYSCONFDIR, ZEPHYR_SRVTAB); - sprintf(tkt_file, "%s/%s", SYSCONFDIR, ZEPHYR_TKFILE); + sprintf(srvtab_file, "%s/zephyr/%s", SYSCONFDIR, ZEPHYR_SRVTAB); + sprintf(tkt_file, "%s/zephyr/%s", SYSCONFDIR, ZEPHYR_TKFILE); #endif - sprintf(acl_dir, "%s/%s", SYSCONFDIR, ZEPHYR_ACL_DIR); - sprintf(subs_file, "%s/%s", SYSCONFDIR, DEFAULT_SUBS_FILE); + sprintf(acl_dir, "%s/zephyr/%s", SYSCONFDIR, ZEPHYR_ACL_DIR); + sprintf(subs_file, "%s/zephyr/%s", SYSCONFDIR, DEFAULT_SUBS_FILE); /* set name */ programname = strrchr(argv[0],'/'); diff --git a/server/realm.c b/server/realm.c index 3ef71db..537f49a 100644 --- a/server/realm.c +++ b/server/realm.c @@ -40,7 +40,7 @@ char *realmname; } *cp1 = '\0'; - sprintf(list_file, "%s/%s", SYSCONFDIR, REALM_LIST_FILE); + sprintf(list_file, "%s/zephyr/%s", SYSCONFDIR, REALM_LIST_FILE); if ((rlm_file = fopen(list_file, "r")) == (FILE *) 0) { return(expand); @@ -390,7 +390,7 @@ realm_init() char list_file[128]; char rlmprinc[ANAME_SZ+INST_SZ+REALM_SZ+3]; - sprintf(list_file, "%s/%s", SYSCONFDIR, REALM_LIST_FILE); + sprintf(list_file, "%s/zephyr/%s", SYSCONFDIR, REALM_LIST_FILE); rlmnames = get_realm_lists(list_file); if (!rlmnames) { zdbug((LOG_DEBUG, "No other realms")); |