summaryrefslogtreecommitdiffstats
path: root/eurephiadm
diff options
context:
space:
mode:
authorDavid Sommerseth <dazo@users.sourceforge.net>2009-03-29 19:50:08 +0200
committerDavid Sommerseth <dazo@users.sourceforge.net>2009-03-29 19:50:08 +0200
commit105fe0cae7f8fb542a69912eb330a37645afd4fa (patch)
treec58ec45588aff8668b590443953ae2c7a14941f4 /eurephiadm
parent7cd16251337f804c42460ecb9783ab50b0a35cd7 (diff)
downloadeurephia-105fe0cae7f8fb542a69912eb330a37645afd4fa.tar.gz
eurephia-105fe0cae7f8fb542a69912eb330a37645afd4fa.tar.xz
eurephia-105fe0cae7f8fb542a69912eb330a37645afd4fa.zip
Fix error setting eurephiadm_xslt_path in eurephiadm
In commit d7a8babb19bcc1107daff0cc5673bc32b0ed785b the check if the configuration value 'eurephiadm_xslt_path' was set in the database looked in the wrong configuration area. Fixed this and it now copies the value over from the database configuration.
Diffstat (limited to 'eurephiadm')
-rw-r--r--eurephiadm/eurephiadm.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/eurephiadm/eurephiadm.c b/eurephiadm/eurephiadm.c
index a4c58dd..d07c46f 100644
--- a/eurephiadm/eurephiadm.c
+++ b/eurephiadm/eurephiadm.c
@@ -340,17 +340,19 @@ int main(int argc, char **argv) {
return 3;
}
- // Check if we have XSLT path available, if not setup a default path
- if( eGet_value(cfg, "eurephiadm_xslt_path") == NULL ) {
- eAdd_value(ctx, cfg, "eurephiadm_xslt_path", EUREPHIADM_XSLT_PATH);
- }
-
// Connect to the database
dbparams = eGet_value(cfg, "database_params");
if( !eurephia_ConnectDB(ctx, dbparams) ) {
return 4;
}
+ // Check if we have XSLT path available, if not setup a default path
+ if( eGet_value(ctx->dbc->config, "eurephiadm_xslt_path") ) {
+ eAdd_value(ctx, cfg, "eurephiadm_xslt_path", eGet_value(ctx->dbc->config, "eurephiadm_xslt_path"));
+ } else {
+ eAdd_value(ctx, cfg, "eurephiadm_xslt_path", EUREPHIADM_XSLT_PATH);
+ }
+
// Load session file, if it exists. (reuse open session)
if( (sesskey_file = read_session_file(ctx)) == NULL ) {
// No session file - go straight to login