onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-09-13 08:29:32 +02:00
Code Issues Releases Wiki Activity

fixed bug 1997475 ] Adding Interface via fwbedit breaks .fwb file

Browse Source
This commit is contained in:
Vadim Kurland
2008-07-31 04:26:29 +00:00
parent 9fda26cbc0
commit 652debdd4a
4 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build_num
+1 -1
View File
@@ -1 +1 @@
#define BUILD_NUM 426 #define BUILD_NUM 427
doc/ChangeLog
+5
View File
@@ -1,3 +1,8 @@
2008-07-30 vadim <vadim@vk.crocodile.org>
* fwbedit.cpp (main): fixed bug #1997475: "Adding Interface via
fwbedit breaks .fwb file"
2008-07-28 <vadim@vk.crocodile.org> 2008-07-28 <vadim@vk.crocodile.org>
* ObjectManipulator.cpp (ObjectManipulator::removeLib): fixed * ObjectManipulator.cpp (ObjectManipulator::removeLib): fixed
qmake.inc
+13 -13
View File
@@ -11,15 +11,15 @@ SO_VERSION = @LIBFWBUILDER_SOLIB_VERSION@
DEFINES += $$(DEFINES) DEFINES += $$(DEFINES)
LANGUAGE = C++ LANGUAGE = C++
UI_DIR = ui UI_DIR = ui
MANDIR = /home/vadim/src/fwb3-branch-v3/install_root/share/man/ MANDIR = /Users/vadim/src/fwb3-branch-v3/install_root/share/man/
DOCDIR = /home/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.0 DOCDIR = /Users/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.0
HAVE_ANTLR_RUNTIME = 1 HAVE_ANTLR_RUNTIME = 1
HAVE_EXTERNAL_ANTLR = 0 HAVE_EXTERNAL_ANTLR = 0
unix { unix {
ANTLR_INCLUDEPATH = /home/vadim/src/fwb3-branch-v3/source/fwbuilder/src/ ANTLR_INCLUDEPATH = /Users/vadim/src/fwb3-branch-v3/source/fwbuilder/src/
ANTLR_LIBS = /home/vadim/src/fwb3-branch-v3/source/fwbuilder/src/antlr/libantlr.a ANTLR_LIBS = /Users/vadim/src/fwb3-branch-v3/source/fwbuilder/src/antlr/libantlr.a
FWBPARSER_LIB = ../parsers/libfwbparser.a FWBPARSER_LIB = ../parsers/libfwbparser.a
} }
@@ -30,36 +30,36 @@ unix {
MOC_DIR = .moc MOC_DIR = .moc
OBJECTS_DIR = .obj OBJECTS_DIR = .obj
PREFIX = /home/vadim/src/fwb3-branch-v3/install_root PREFIX = /Users/vadim/src/fwb3-branch-v3/install_root
exec_prefix = @EXEC_PREFIX@ exec_prefix = @EXEC_PREFIX@
DESTDIR = DESTDIR =
INCLUDEPATH += .. ../.. $$(INCLUDEPATH) /home/vadim/src/fwb3-branch-v3/install_root/include/ /home/vadim/src/fwb3-branch-v3/install_root/include/fwb-3 /usr/include/libxml2 INCLUDEPATH += .. ../.. $$(INCLUDEPATH) /Users/vadim/src/fwb3-branch-v3/install_root/include/ /Users/vadim/src/fwb3-branch-v3/install_root/include/fwb-3 /usr/include/libxml2
LIBS_FWCOMPILER = -L/home/vadim/src/fwb3-branch-v3/install_root/lib -pthread -lfwcompiler -lfwbuilder -lxslt -lxml2 -lnetsnmp -lm -lwrap LIBS_FWCOMPILER = -L/Users/vadim/src/fwb3-branch-v3/install_root/lib -lfwcompiler -lfwbuilder -lxslt -lxml2 -lz -lpthread -licucore -lm -lnetsnmp
LIBS_FWBUILDER = -L/home/vadim/src/fwb3-branch-v3/install_root/lib -pthread -lfwbuilder -lxslt -lxml2 -lnetsnmp -lm -lwrap LIBS_FWBUILDER = -L/Users/vadim/src/fwb3-branch-v3/install_root/lib -lfwbuilder -lxslt -lxml2 -lz -lpthread -licucore -lm -lnetsnmp
target.path = $$PREFIX/bin target.path = $$PREFIX/bin
dtd.path = @TEMPLATE_DIR@/ dtd.path = @TEMPLATE_DIR@/
migration.path = @TEMPLATE_DIR@/migration migration.path = @TEMPLATE_DIR@/migration
doc.path = /home/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.0 doc.path = /Users/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.0
# win32:target.path = $$PREFIX/ # win32:target.path = $$PREFIX/
# unix:target.path = $$PREFIX/share/fwbuilder/ # unix:target.path = $$PREFIX/share/fwbuilder/
# macx:target.path = $$PREFIX/ # macx:target.path = $$PREFIX/
res.files = src/res/objects_init.xml src/res/templates.xml src/res/resources.xml res.files = src/res/objects_init.xml src/res/templates.xml src/res/resources.xml
res.path = /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.0 res.path = ../Resources
res_os.files = src/res/os/*.xml res_os.files = src/res/os/*.xml
res_os.path = /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.0/os/ res_os.path = ../Resources/os/
res_platform.files = src/res/platform/*.xml res_platform.files = src/res/platform/*.xml
res_platform.path = /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.0/platform/ res_platform.path = ../Resources/platform/
INSTALLS += res INSTALLS += res
INSTALLS += res_os INSTALLS += res_os
INSTALLS += res_platform INSTALLS += res_platform
# INSTALLS += icns # INSTALLS += icns
LIBS += $$LIBS_FWBUILDER -lutil LIBS += $$LIBS_FWBUILDER -L/sw/lib -lpoll
PKGLOCALEDIR = $$res.path/locale PKGLOCALEDIR = $$res.path/locale
src/fwbedit/fwbedit.cpp
-7
View File
@@ -88,7 +88,6 @@
#include "fwbuilder/ServiceGroup.h" #include "fwbuilder/ServiceGroup.h"
#include "fwbuilder/Interval.h" #include "fwbuilder/Interval.h"
#include "fwbuilder/IntervalGroup.h" #include "fwbuilder/IntervalGroup.h"
#include "fwbuilder/InterfacePolicy.h"
#include "../common/init.cpp" #include "../common/init.cpp"
#include <assert.h> #include <assert.h>
@@ -846,13 +845,7 @@ int main(int argc, char * const *argv)
o->setDyn(addrtype=="dynamic"); o->setDyn(addrtype=="dynamic");
o->setUnnumbered(addrtype=="unnumbered"); o->setUnnumbered(addrtype=="unnumbered");
o->setManagement(getBool(management)); o->setManagement(getBool(management));
target->add(o); target->add(o);
if (Firewall::isA(target))
{
o->add(new InterfacePolicy());
}
} }
else else
{ {