git://git.onelab.eu
/
iptables.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to iptables-1.3.5
[iptables.git]
/
iptables-standalone.c
diff --git
a/iptables-standalone.c
b/iptables-standalone.c
index
8a4c90e
..
257b677
100644
(file)
--- a/
iptables-standalone.c
+++ b/
iptables-standalone.c
@@
-37,8
+37,13
@@
#include <string.h>
#include <iptables.h>
#include <string.h>
#include <iptables.h>
+#ifdef IPTABLES_MULTI
+int
+iptables_main(int argc, char *argv[])
+#else
int
main(int argc, char *argv[])
int
main(int argc, char *argv[])
+#endif
{
int ret;
char *table = "filter";
{
int ret;
char *table = "filter";
@@
-47,6
+52,10
@@
main(int argc, char *argv[])
program_name = "iptables";
program_version = IPTABLES_VERSION;
program_name = "iptables";
program_version = IPTABLES_VERSION;
+ lib_dir = getenv("IPTABLES_LIB_DIR");
+ if (!lib_dir)
+ lib_dir = IPT_LIB_DIR;
+
#ifdef NO_SHARED_LIBS
init_extensions();
#endif
#ifdef NO_SHARED_LIBS
init_extensions();
#endif