alternate directories for control files

-----BEGIN PGP SIGNED MESSAGE-----


FreeS/WAN has bits in several directories, and needs to know the paths
to them.  From the top of freeswan/programs/ipsec/ipsec.in:


    # where the private directory and the config files are
    IPSEC_EXECDIR=@IPSEC_EXECDIR@
    IPSEC_LIBDIR=@IPSEC_LIBDIR@
    IPSEC_SBINDIR=@IPSEC_SBINDIR@
    IPSEC_CONFS=@IPSEC_CONFS@

    IPSEC_DIR=$IPSEC_LIBDIR
    export IPSEC_DIR IPSEC_CONFS IPSEC_LIBDIR IPSEC_EXECDIR

		typical value:			what lives here
IPSEC_EXECDIR	/usr/local/libexec/ipsec	published commands live
IPSEC_LIBDIR	/usr/local/lib/ipsec		internal executables
IPSEC_SBINDIR	/usr/local/sbin			includes "ipsec" command itself
IPSEC_CONFS	/etc				ipsec.conf


These same variables are set, if needed, in "ipsec setup"

    # where the private directory and the config files are
    IPSEC_EXECDIR=${IPSEC_EXECDIR-@IPSEC_EXECDIR@}
    IPSEC_LIBDIR=${IPSEC_LIBDIR-@IPSEC_LIBDIR@}
    IPSEC_SBINDIR=${IPSEC_SBINDIR-@IPSEC_SBINDIR@}
    IPSEC_CONFS=${IPSEC_CONFS-@IPSEC_CONFS@}

It would be good if the ipsec command only set these if needed.  This
would allow convenient debugging of scripts.  Perhaps it could lead to
disaster if the wrong values were inherited, but I think that will
only happen if the sysadmin screws up.

There is an additional fly in the ointment: how Pluto accesses files:

    Pluto uses /etc/ipsec.secrets unless it is invoked with a
    --secretsfile parameter.

    Pluto uses /etc/ipsec.d/policies/* unless it is invoked with a
    --policygroupsdir file.

I think that _plutorun should be changed to invoke pluto with
appropriate settings of these flags.

I recommend these changes.  Any objection?  Refinements?

Hugh Redelmeier
[email protected]  voice: +1 416 482-8253

-----BEGIN PGP SIGNATURE-----
Version: 2.6.3ia
Charset: noconv

iQCVAwUBPlU0C8FAuQPManGZAQFI9AP+LaRZNcjbjCbE/8ejVBjJXXkyLcFWeJAZ
zz25bU/Ogd95gbLl/hhB+zcEoDOldn/XOFf5D+HfNqCkSL7JI8D/g2EJoLUrHpD9
pd4xl32fjnLZhTkf6aomxVKt3LdIDl0DxLgX0h71QhoXbu9E4UdhwqC7ea6ROgYX
Ykj8jqnwR6U=
=QUeP
-----END PGP SIGNATURE-----