/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to network-hooks.d/openvpn.conf

  • Committer: Teddy Hogeborn
  • Date: 2009-02-09 05:48:04 UTC
  • mfrom: (24.1.134 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20090209054804-6phrjjrzjlpvuz7u
Merge from Björn:

* plugin-runner.c (main): Bug fix: For the "--options-for" option, do
                          not mangle arguments with colon characters.
                          Also support adding empty arguments.

* plugins.d/mandos-client.c: (mc): New global variable; moved from
                                   "main".
  (init_gpgme, pgp_packet_decrypt, init_gnutls_global,
  init_gnutls_session, start_mandos_communication): Removed "mc"
                                                    argument.  All
                                                    callers changed.

  (resolve_callback, browse_callback): Ignore "userdata" argument.
                                       All callers changed.
  (handle_sigterm): New function.
  (main): Add "handle_sigterm" as signal handler for SIGTERM before
          starting the main loop.

Show diffs side-by-side

added added

removed removed

Lines of Context:
network-hooks.d/openvpn.conf
1
 
# Sample OpenVPN configuration file
2
 
# Uncomment and change - see openvpn(8)
3
 
 
4
 
# Network device.
5
 
#dev tun
6
 
 
7
 
# Our remote peer
8
 
#remote 192.0.2.3
9
 
#float 192.0.2.3
10
 
#port 1194
11
 
 
12
 
# VPN endpoints
13
 
#ifconfig 10.1.0.1 10.1.0.2
14
 
 
15
 
# A pre-shared static key
16
 
#secret openvpn.key
17
 
 
18
 
# Cipher
19
 
#cipher AES-128-CBC