~ubuntu-branches/ubuntu/trusty/openvpn/trusty-security

« back to all changes in this revision

Viewing changes to occ.c

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-05-05 03:06:19 UTC
  • mfrom: (10.2.6 sid)
  • Revision ID: james.westby@ubuntu.com-20100505030619-cwre0snhgx1mql53
Tags: 2.1.0-2ubuntu1
* Merge from debian unstable.  Remaining changes:
  + debian/openvpn.init.d:
    - Do not use start-stop-daemon and use </dev/null to avoid blocking boot
    - Show per-VPN result messages
    - Add "--script-security 2" by default for backwards compatablitiy
   + debian/control: Add lsb-base >= 3.2-14 to allow status_of_proc() 

Show diffs side-by-side

added added

removed removed

Lines of Context:
369
369
               c->c2.max_send_size_remote,
370
370
               c->c2.max_recv_size_local);
371
371
          if (!c->options.fragment
372
 
              && c->options.ce.proto == PROTO_UDPv4
 
372
              && (proto_is_dgram(c->options.ce.proto))
373
373
              && c->c2.max_send_size_local > TUN_MTU_MIN
374
374
              && (c->c2.max_recv_size_remote < c->c2.max_send_size_local
375
375
                  || c->c2.max_recv_size_local < c->c2.max_send_size_remote))