Skip to content

Commit fdcb375

Browse files
authored
Merge pull request #5760 from victormlg/ppkeys
CFE-2822: Added keydir sys variable
2 parents af10546 + e974758 commit fdcb375

File tree

2 files changed

+23
-0
lines changed

2 files changed

+23
-0
lines changed

configure.ac

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@ AS_IF([test x"$enable_fhs" = xyes], [
215215
MASTERDIR='default'
216216
INPUTDIR='default'
217217
DATADIR='default'
218+
KEYDIR='default'
218219
LOGDIR='${localstatedir}/log/${PACKAGE}'
219220
MODULEDIR='default'
220221
PIDDIR='${runstatedir:-${localstatedir}/run}/${PACKAGE}'
@@ -228,6 +229,7 @@ AS_IF([test x"$enable_fhs" = xyes], [
228229
MASTERDIR=default
229230
INPUTDIR=default
230231
DATADIR=default
232+
KEYDIR=default
231233
LOGDIR=$(cmd /c "echo %PROGRAMFILES%\\Cfengine" | sed 's/\\/\\\\/g')
232234
MODULEDIR=default
233235
PIDDIR=$(cmd /c "echo %PROGRAMFILES%\\Cfengine" | sed 's/\\/\\\\/g')
@@ -238,6 +240,7 @@ AS_IF([test x"$enable_fhs" = xyes], [
238240
MASTERDIR=default
239241
INPUTDIR=default
240242
DATADIR=default
243+
KEYDIR=default
241244
LOGDIR=/var/cfengine
242245
MODULEDIR=default
243246
PIDDIR=/var/cfengine
@@ -249,6 +252,7 @@ AS_IF([test x"$enable_fhs" = xyes], [
249252
MASTERDIR="default"
250253
INPUTDIR="default"
251254
DATADIR="default"
255+
KEYDIR="default"
252256
LOGDIR="${localstatedir}/${PACKAGE}"
253257
MODULEDIR="default"
254258
PIDDIR="${localstatedir}/${PACKAGE}"
@@ -1520,6 +1524,22 @@ dnl There's a conflict on mingw where they have a type called DATADIR!
15201524
AC_DEFINE_UNQUOTED(CF_DATADIR, "${DATADIR}", [Datadir location])
15211525
AC_SUBST(datadir, "${DATADIR}")
15221526

1527+
AC_ARG_WITH(keydir,
1528+
[ --with-keydir=KEYDIR default for internal log directory ],
1529+
[
1530+
if test "x$withval" != x ; then
1531+
KEYDIR="$withval"
1532+
fi
1533+
],
1534+
)
1535+
1536+
dnl Expand ${prefix} and whatnot in KEYDIR
1537+
1538+
adl_RECURSIVE_EVAL("${KEYDIR}", KEYDIR)
1539+
1540+
AC_DEFINE_UNQUOTED(KEYDIR, "${KEYDIR}", [Keydir location])
1541+
AC_SUBST(keydir, "${KEYDIR}")
1542+
15231543
AC_ARG_WITH(logdir,
15241544
[ --with-logdir=LOGDIR default for internal log directory ],
15251545
[
@@ -1940,6 +1960,7 @@ AC_MSG_RESULT([-> Workdir: $WORKDIR])
19401960
AC_MSG_RESULT([-> Masterdir: $MASTERDIR])
19411961
AC_MSG_RESULT([-> Inputdir: $INPUTDIR])
19421962
AC_MSG_RESULT([-> Datadir: $DATADIR])
1963+
AC_MSG_RESULT([-> KeyDir: $KEYDIR])
19431964
AC_MSG_RESULT([-> Logdir: $LOGDIR])
19441965
AC_MSG_RESULT([-> Piddir: $PIDDIR])
19451966
AC_MSG_RESULT([-> Statedir: $STATEDIR])

libenv/sysinfo.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,7 @@ static void GetNameInfo3(EvalContext *ctx)
460460
const char* const workdir = GetWorkDir();
461461
const char* const bindir = GetBinDir();
462462
const char* const moduledir = GetModuleDir();
463+
const char* const keydir = GetKeyDir();
463464

464465
#ifdef _AIX
465466
char real_version[_SYS_NMLN];
@@ -619,6 +620,7 @@ static void GetNameInfo3(EvalContext *ctx)
619620
EvalContextVariablePutSpecial(ctx, SPECIAL_SCOPE_SYS, "statedir", GetStateDir(), CF_DATA_TYPE_STRING, "source=agent");
620621
EvalContextVariablePutSpecial(ctx, SPECIAL_SCOPE_SYS, "masterdir", GetMasterDir(), CF_DATA_TYPE_STRING, "source=agent");
621622
EvalContextVariablePutSpecial(ctx, SPECIAL_SCOPE_SYS, "inputdir", GetInputDir(), CF_DATA_TYPE_STRING, "source=agent");
623+
EvalContextVariablePutSpecial(ctx, SPECIAL_SCOPE_SYS, "keydir", keydir, CF_DATA_TYPE_STRING, "source=agent");
622624

623625
snprintf(workbuf, CF_BUFSIZE, "%s", bindir);
624626
EvalContextVariablePutSpecial(ctx, SPECIAL_SCOPE_SYS, "bindir", workbuf, CF_DATA_TYPE_STRING, "source=agent");

0 commit comments

Comments
 (0)