ipset: update to 5.3

This commit is contained in:
Jan Engelhardt
2011-01-19 02:55:23 +01:00
parent 980a53348f
commit 3141b2ff86
25 changed files with 391 additions and 336 deletions

View File

@@ -431,13 +431,8 @@ parse_commandline(int argc, char *argv[])
const struct ipset_commands *command;
const struct ipset_type *type;
/* Initialize session */
if (session == NULL) {
session = ipset_session_init(printf);
if (session == NULL)
return exit_error(OTHER_PROBLEM,
"Cannot initialize ipset session, aborting.");
}
/* Set session lineno to report parser errors correctly */
ipset_session_lineno(session, restore_line);
/* Commandline parsing, somewhat similar to that of 'ip' */
@@ -743,5 +738,11 @@ main(int argc, char *argv[])
ipset_type_add(&ipset_hash_ipportnet0);
ipset_type_add(&ipset_list_set0);
/* Initialize session */
session = ipset_session_init(printf);
if (session == NULL)
return exit_error(OTHER_PROBLEM,
"Cannot initialize ipset session, aborting.");
return parse_commandline(argc, argv);
}