| … | |
… | |
| 16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 17 | GNU General Public License for more details. |
17 | GNU General Public License for more details. |
| 18 | |
18 | |
| 19 | You should have received a copy of the GNU General Public License |
19 | You should have received a copy of the GNU General Public License |
| 20 | along with gvpe; if not, write to the Free Software |
20 | along with gvpe; if not, write to the Free Software |
| 21 | Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
21 | Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 22 | */ |
22 | */ |
| 23 | |
23 | |
| 24 | #include "config.h" |
24 | #include "config.h" |
| 25 | |
25 | |
| 26 | #include <cstdio> |
26 | #include <cstdio> |
| … | |
… | |
| 87 | " -k, --kill[=SIGNAL] Attempt to kill a running gvpe and exit.\n" |
87 | " -k, --kill[=SIGNAL] Attempt to kill a running gvpe and exit.\n" |
| 88 | " -g, --generate-keys Generate public/private RSA keypair.\n" |
88 | " -g, --generate-keys Generate public/private RSA keypair.\n" |
| 89 | " -s, --show-config Display the configuration information.\n" |
89 | " -s, --show-config Display the configuration information.\n" |
| 90 | " --help Display this help and exit.\n" |
90 | " --help Display this help and exit.\n" |
| 91 | " --version Output version information and exit.\n\n")); |
91 | " --version Output version information and exit.\n\n")); |
| 92 | printf (_("Report bugs to <vpe@plan9.de>.\n")); |
92 | printf (_("Report bugs to <gvpe@schmorp.de>.\n")); |
| 93 | } |
93 | } |
| 94 | |
94 | |
| 95 | exit (status); |
95 | exit (status); |
| 96 | } |
96 | } |
| 97 | |
97 | |
| … | |
… | |
| 298 | { |
298 | { |
| 299 | printf (_("%s version %s (built %s %s, protocol %d.%d)\n"), get_identity (), |
299 | printf (_("%s version %s (built %s %s, protocol %d.%d)\n"), get_identity (), |
| 300 | VERSION, __DATE__, __TIME__, PROTOCOL_MAJOR, PROTOCOL_MINOR); |
300 | VERSION, __DATE__, __TIME__, PROTOCOL_MAJOR, PROTOCOL_MINOR); |
| 301 | printf (_("Built with kernel interface %s/%s.\n"), IFTYPE, IFSUBTYPE); |
301 | printf (_("Built with kernel interface %s/%s.\n"), IFTYPE, IFSUBTYPE); |
| 302 | printf (_ |
302 | printf (_ |
| 303 | ("Copyright (C) 2003 Marc Lehmann <vpe@plan9.de> and others.\n" |
303 | ("Copyright (C) 2003 Marc Lehmann <gvpe@schmorp.de> and others.\n" |
| 304 | "See the AUTHORS file for a complete list.\n\n" |
304 | "See the AUTHORS file for a complete list.\n\n" |
| 305 | "vpe comes with ABSOLUTELY NO WARRANTY. This is free software,\n" |
305 | "vpe comes with ABSOLUTELY NO WARRANTY. This is free software,\n" |
| 306 | "and you are welcome to redistribute it under certain conditions;\n" |
306 | "and you are welcome to redistribute it under certain conditions;\n" |
| 307 | "see the file COPYING for details.\n")); |
307 | "see the file COPYING for details.\n")); |
| 308 | |
308 | |
| … | |
… | |
| 310 | } |
310 | } |
| 311 | |
311 | |
| 312 | if (show_help) |
312 | if (show_help) |
| 313 | usage (0); |
313 | usage (0); |
| 314 | |
314 | |
| 315 | conf.read_config (false); |
315 | { |
|
|
316 | configuration_parser (conf, false, 0, 0); |
|
|
317 | } |
| 316 | |
318 | |
| 317 | if (generate_keys) |
319 | if (generate_keys) |
| 318 | { |
320 | { |
| 319 | RAND_load_file ("/dev/urandom", 1024); |
321 | RAND_load_file ("/dev/urandom", 1024); |
| 320 | exit (keygen (generate_keys)); |
322 | exit (keygen (generate_keys)); |
