Re: [RFC]: Move CTLDIR to cipe.h

[Olaf Titz <olaf,AT,bigred,DOT,inka,DOT,de>]

> Wouldn'd it be a good idea to move #define CTLDIR "/etc/cipe" to
> cipe.h since this will be included by ciped.c (via ciped.h)? I
> have to maintain an own distro where I don't have the /etc/cipe

One of my goals for 1.6 is to remove all the hardcoded paths where
possible. This is especially a concern for PKCIPE which currently
can't cope with more than one ciped. So your idea comes just right :-)

The CTLDIR should best be handled with a configure argument, like in
the following patch. Theoretically that should be handled with
--sysconfdir, but (a) using that breaks existing configurations and
(b) it would need a /cipe suffix. I'm not sure how to handle that, so
another argument of --with-ctldir is justified.

(I'm rather busy with exam preparations just now, but that will change
soon :-)

Olaf

Index: configure.in
===================================================================
RCS file: /home/olaf/common-home/CVSrepos/security/cipe-linux/configure.in,v
retrieving revision 1.36
diff -u -r1.36 configure.in
--- configure.in        2001/03/18 18:52:38     1.36
+++ configure.in        2001/03/20 12:24:26
@@ -230,6 +230,10 @@
 AC_SUBST(CIPED)
 CIPED=ciped-$verl$crypt

+AC_ARG_WITH(ctldir,
+[  --with-ctldir=DIR       Directory for config files [/etc/cipe]],
+AC_DEFINE_UNQUOTED(CTLDIR, "$withval"))
+
 AC_ARG_ENABLE(debug,
 [  --disable-debug         Disable debugging code in kernel module],
 test "$enableval" = "no" && e=0, e=1)
Index: cipe/ciped.c
===================================================================
RCS file: /home/olaf/common-home/CVSrepos/security/cipe-linux/cipe/ciped.c,v
retrieving revision 1.50
diff -u -r1.50 ciped.c
--- cipe/ciped.c        2001/02/12 00:25:14     1.50
+++ cipe/ciped.c        2001/03/20 12:24:27
@@ -12,7 +12,9 @@
 */
 /* $Id: ciped.c,v 1.50 2001/02/12 00:25:14 olaf Exp $ */

+#ifndef CTLDIR
 #define CTLDIR "/etc/cipe"
+#endif

 #define _GNU_SOURCE
 #include <ctype.h>
Index: conf/config.h.in
===================================================================
RCS file: 
/home/olaf/common-home/CVSrepos/security/cipe-linux/conf/config.h.in,v
retrieving revision 1.15
diff -u -r1.15 config.h.in
--- conf/config.h.in    2001/03/18 18:52:41     1.15
+++ conf/config.h.in    2001/03/20 12:24:27
@@ -41,6 +41,9 @@
 /* Dynamic device allocation @api */
 #undef NO_DYNDEV

+/* Location of config files */
+#undef CTLDIR
+
 /* Syslog facility */
 #undef LOGFAC

=== end of patch ===