diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2009-06-13 16:03:08 +0200 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2009-06-13 16:03:08 +0200 |
| commit | ebde1a7ddd13cc2764daec440c9befaa5fe9669e (patch) | |
| tree | 1aa4f03aed4b4fe66e07d62a8c501f438f9ff851 /src/pluto/plutomain.c | |
| parent | 2b92fc98802930c6c801afdc4986c6f8520d8631 (diff) | |
| download | strongswan-ebde1a7ddd13cc2764daec440c9befaa5fe9669e.tar.bz2 strongswan-ebde1a7ddd13cc2764daec440c9befaa5fe9669e.tar.xz | |
consistent display of strongSwan version
Diffstat (limited to 'src/pluto/plutomain.c')
| -rw-r--r-- | src/pluto/plutomain.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/pluto/plutomain.c b/src/pluto/plutomain.c index a53c777a8..39367cafa 100644 --- a/src/pluto/plutomain.c +++ b/src/pluto/plutomain.c @@ -137,11 +137,10 @@ static void usage(const char *mess) "[--nat_traversal] [--keep_alive <delay_sec>]" " \\\n\t" "[--force_keepalive] [--disable_port_floating]" - " \\\n\t" - "[--virtual_private <network_list>]" + " \\\n\t" + "[--virtual_private <network_list>]" "\n" - "strongSwan %s\n" - , ipsec_version_code()); + "strongSwan "VERSION"\n"); exit_pluto(mess == NULL? 0 : 1); } @@ -359,8 +358,7 @@ int main(int argc, char **argv) { const char **sp = ipsec_copyright_notice(); - printf("%s%s\n", ipsec_version_string(), - compile_time_interop_options); + printf("strongSwan "VERSION"%s\n", compile_time_interop_options); for (; *sp != NULL; sp++) puts(*sp); } @@ -636,9 +634,8 @@ int main(int argc, char **argv) /* Note: some scripts may look for this exact message -- don't change * ipsec barf was one, but it no longer does. */ - plog("Starting Pluto (strongSwan Version %s%s)" - , ipsec_version_code() - , compile_time_interop_options); + plog("Starting IKEv1 pluto daemon (strongSwan "VERSION")%s", + compile_time_interop_options); /* load plugins, further infrastructure may need it */ lib->plugins->load(lib->plugins, IPSEC_PLUGINDIR, |