From 2a9246030c0aa2d1b9d9a245a2e312c0b8fe5da6 Mon Sep 17 00:00:00 2001 From: Assar Westerlund Date: Mon, 10 Sep 2001 16:08:17 +0000 Subject: [PATCH] look for configuration files in /etc/arla (the location in debian's arla package) git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10682 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/kafs/common.c | 5 ++++- lib/kafs/kafs.h | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/kafs/common.c b/lib/kafs/common.c index bc52e386c..80fe019ae 100644 --- a/lib/kafs/common.c +++ b/lib/kafs/common.c @@ -243,6 +243,8 @@ _kafs_afslog_all_local_cells(kafs_data *data, uid_t uid, const char *homedir) find_cells(_PATH_ARLA_THISCELL, &cells, &index); find_cells(_PATH_OPENAFS_DEBIAN_THESECELLS, &cells, &index); find_cells(_PATH_OPENAFS_DEBIAN_THISCELL, &cells, &index); + find_cells(_PATH_ARLA_DEBIAN_THESECELLS, &cells, &index); + find_cells(_PATH_ARLA_DEBIAN_THISCELL, &cells, &index); ret = afslog_cells(data, cells, index, uid, homedir); while(index > 0) @@ -262,7 +264,8 @@ file_find_cell(kafs_data *data, const char *cell, char **realm, int exact) if ((F = fopen(_PATH_CELLSERVDB, "r")) || (F = fopen(_PATH_ARLA_CELLSERVDB, "r")) - || (F = fopen(_PATH_OPENAFS_DEBIAN_CELLSERVDB, "r"))) { + || (F = fopen(_PATH_OPENAFS_DEBIAN_CELLSERVDB, "r")) + || (F = fopen(_PATH_ARLA_DEBIAN_CELLSERVDB, "r"))) { while (fgets(buf, sizeof(buf), F)) { int cmp; diff --git a/lib/kafs/kafs.h b/lib/kafs/kafs.h index 0e0f69110..2cb3623fd 100644 --- a/lib/kafs/kafs.h +++ b/lib/kafs/kafs.h @@ -191,6 +191,11 @@ krb5_error_code krb5_realm_of_cell __P((const char *cell, char **realm)); #define _PATH_OPENAFS_DEBIAN_CELLSERVDB _PATH_OPENAFS_DEBIAN_VICE "CellServDB" #define _PATH_OPENAFS_DEBIAN_THESECELLS _PATH_OPENAFS_DEBIAN_VICE "TheseCells" +#define _PATH_ARLA_DEBIAN_VICE "/etc/arla/" +#define _PATH_ARLA_DEBIAN_THISCELL _PATH_ARLA_DEBIAN_VICE "ThisCell" +#define _PATH_ARLA_DEBIAN_CELLSERVDB _PATH_ARLA_DEBIAN_VICE "CellServDB" +#define _PATH_ARLA_DEBIAN_THESECELLS _PATH_ARLA_DEBIAN_VICE "TheseCells" + extern int _kafs_debug; #endif /* __KAFS_H */