colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: Make iptables path configurable

Browse Source 
On some systems, it's located in different path...
This commit is contained in:
Tambet Ingo
2009-10-01 14:31:09 +03:00
parent 66251aedab
commit 715ddd2045
2 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
configure.ac
View File

@@ -369,6 +369,19 @@ if test -n "${RESOLVCONF_PATH}"; then
AC_DEFINE_UNQUOTED(RESOLVCONF_PATH, "$RESOLVCONF_PATH", [Define if you have a resolvconf implementation]) AC_DEFINE_UNQUOTED(RESOLVCONF_PATH, "$RESOLVCONF_PATH", [Define if you have a resolvconf implementation])
fi fi
# iptables path
AC_ARG_WITH(iptables, AC_HELP_STRING([--with-iptables=/path/to/iptables], [path to iptables]))
if test "x${with_iptables}" = x; then
AC_PATH_PROG(IPTABLES_PATH, iptables, [], $PATH:/sbin:/usr/sbin)
if ! test -x "$IPTABLES_PATH"; then
AC_MSG_ERROR(iptables was not installed.)
fi
else
IPTABLES_PATH="$with_iptables"
fi
AC_DEFINE_UNQUOTED(IPTABLES_PATH, "$IPTABLES_PATH", [Define to path of iptables binary])
AC_SUBST(IPTABLES_PATH)
# system CA certificates path # system CA certificates path
AC_ARG_WITH(system-ca-path, AS_HELP_STRING([--with-system-ca-path=/path/to/ssl/certs], [path to system CA certificates])) AC_ARG_WITH(system-ca-path, AS_HELP_STRING([--with-system-ca-path=/path/to/ssl/certs], [path to system CA certificates]))
if test "x${with_system_ca_path}" = x; then if test "x${with_system_ca_path}" = x; then

20
src/nm-activation-request.c
View File

@@ -575,22 +575,24 @@ nm_act_request_set_shared (NMActRequest *req, gboolean shared)
for (iter = list; iter; iter = g_slist_next (iter)) { for (iter = list; iter; iter = g_slist_next (iter)) {
ShareRule *rule = (ShareRule *) iter->data; ShareRule *rule = (ShareRule *) iter->data;
char *envp[1] = { NULL }; char *envp[1] = { NULL };
char **argv; char *argv[6];
char *cmd; char *cmd;
int status; int status;
GError *error = NULL; GError *error = NULL;
argv[0] = IPTABLES_PATH;
argv[1] = "--table";
argv[2] = rule->table;
if (shared) if (shared)
cmd = g_strdup_printf ("/sbin/iptables --table %s --insert %s", rule->table, rule->rule); argv[3] = "--insert";
else else
cmd = g_strdup_printf ("/sbin/iptables --table %s --delete %s", rule->table, rule->rule); argv[3] = "--delete";
argv = g_strsplit (cmd, " ", 0); argv[4] = rule->rule;
if (!argv || !argv[0]) { argv[5] = NULL;
continue;
g_free (cmd);
}
cmd = g_strjoinv (" ", argv);
nm_info ("Executing: %s", cmd); nm_info ("Executing: %s", cmd);
g_free (cmd); g_free (cmd);
@@ -602,8 +604,6 @@ nm_act_request_set_shared (NMActRequest *req, gboolean shared)
g_error_free (error); g_error_free (error);
} else if (WEXITSTATUS (status)) } else if (WEXITSTATUS (status))
nm_info ("** Command returned exit status %d.", WEXITSTATUS (status)); nm_info ("** Command returned exit status %d.", WEXITSTATUS (status));
g_strfreev (argv);
} }
g_slist_free (list); g_slist_free (list);