From c8f06769e1e769d8d2d1ec08587c04346c82ab96 Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Wed, 6 Jan 2010 23:56:08 +0000 Subject: [PATCH] see #1049 --- build_num | 2 +- src/pflib/CompilerDriver_pf.cpp | 7 ++++++- test/pf/objects-for-regression-tests.fwb | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/build_num b/build_num index b49702905..070252ad3 100644 --- a/build_num +++ b/build_num @@ -1 +1 @@ -#define BUILD_NUM 2312 +#define BUILD_NUM 2314 diff --git a/src/pflib/CompilerDriver_pf.cpp b/src/pflib/CompilerDriver_pf.cpp index 5baf1f7a8..07876493d 100644 --- a/src/pflib/CompilerDriver_pf.cpp +++ b/src/pflib/CompilerDriver_pf.cpp @@ -113,7 +113,12 @@ string CompilerDriver_pf::getRemoteConfFileName(const string &ruleset_name, if (remote_conf_name.empty() && remote_fw_name.empty()) - return local_conf_name; + { + // local_conf_name may be a relative or absolute path. Return + // just the file name + QFileInfo fi(local_conf_name.c_str()); + return fi.fileName().toStdString(); + } QFileInfo fi; diff --git a/test/pf/objects-for-regression-tests.fwb b/test/pf/objects-for-regression-tests.fwb index 5ce3ae405..60fe78509 100644 --- a/test/pf/objects-for-regression-tests.fwb +++ b/test/pf/objects-for-regression-tests.fwb @@ -18141,7 +18141,7 @@ - +