summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2017-06-07 12:24:52 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2017-06-07 13:30:34 +0200
commit87cd3bcd69d7ada1163a06a48307cd67d2ea216f (patch)
tree01d71728382da55e0261cb64925c8df4c1965813
parent532b515fbb36aac368c308a68b53f4cc3941148d (diff)
src: display default directory for file inclusion in -h/--help
If no explicit relative or absolute path is enforced by the user, nft relies on either -I/--includepath or the default include directory that is set at compile time. Given most of our users will rely on packaged versions of nft, provide a way to display the location of this default includepath directory. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r--doc/nft.xml5
-rw-r--r--src/main.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/doc/nft.xml b/doc/nft.xml
index f93baa03..faf0ffde 100644
--- a/doc/nft.xml
+++ b/doc/nft.xml
@@ -213,6 +213,11 @@ vi:ts=4 sw=4
as an absolute path.
</para>
<para>
+ If -I/--includepath is not specified, then nft relies on the default directory
+ that is specified at compile time. You can retrieve this default directory via
+ -h/--help option.
+ </para>
+ <para>
If the <literal>filename</literal> parameter is a directory, then all files in
the directory are loaded in alphabetical order.
</para>
diff --git a/src/main.c b/src/main.c
index 6dae817a..5089ff24 100644
--- a/src/main.c
+++ b/src/main.c
@@ -125,12 +125,12 @@ static void show_help(const char *name)
" -s, --stateless Omit stateful information of ruleset.\n"
" -N Translate IP addresses to names.\n"
" -a, --handle Output rule handle.\n"
-" -I, --includepath <directory> Add <directory> to the paths searched for include files.\n"
+" -I, --includepath <directory> Add <directory> to the paths searched for include files. Default is: %s\n"
#ifdef DEBUG
" --debug <level [,level...]> Specify debugging level (scanner, parser, eval, netlink, mnl, proto-ctx, segtree, all)\n"
#endif
"\n",
- name);
+ name, DEFAULT_INCLUDE_PATH);
}
#ifdef DEBUG