[feature] privileged bitmask helper

This is still quite untested, and a bit hacky, but the main idea behind let us have a daemonized bitmask helper, that should be installed by the Bitmask installer. Its responsibilities are to launch the vpn process as a privileged user, and start/stop the firewall.
author: Kali Kaneko <kali@leap.se> 2016-01-29 13:18:36 -0800
committer: Kali Kaneko <kali@leap.se> 2016-04-18 16:15:21 -0400
commit: e9e9abc4ec26be29b3a6b09e6a0b67786269183b (patch)
tree: 698ffd51104e6d391957ba25e31e88a2bbced38a
parent: 0bd65c1d3e6c5ee1d861122ec2cd617ad026de43 (diff)
27 files changed, 4390 insertions, 972 deletions
diff --git a/Makefile b/Makefile
index 7bf5d273..fdfb0381 100644
--- a/Makefile
+++ b/Makefile
@@ -153,8 +153,18 @@ include pkg/branding/branding.mk
 pyinst_osx: pyinst
 	mv dist/Bitmask.app/Contents/MacOS/bitmask dist/Bitmask.app/Contents/MacOS/bitmask-app
 	cp pkg/osx/bitmask-wrapper dist/Bitmask.app/Contents/MacOS/bitmask
+	mkdir -p dist/Bitmask.app/Contents/Resources/bitmask-helper
+	cp pkg/osx/client.up.sh dist/Bitmask.app/Contents/Resources/
+	cp pkg/osx/client.down.sh dist/Bitmask.app/Contents/Resources/
+	cp pkg/osx/bitmask-helper dist/Bitmask.app/Contents/Resources/bitmask-helper/
+	cp pkg/osx/bitmask.pf.conf dist/Bitmask.app/Contents/Resources/bitmask-helper/
+	cp pkg/osx/se.leap.bitmask-helper.plist dist/Bitmask.app/Contents/Resources/bitmask-helper/	
+	cp pkg/osx/post-inst.sh dist/Bitmask.app/Contents/Resources/bitmask-helper/	
+	cp pkg/osx/daemon.py dist/Bitmask.app/Contents/Resources/bitmask-helper/	
 	# XXX hack... this contains the gpg binary (brew), but we need to build it from sources.
 	cp -r src/leap/bitmask/util/apps dist/Bitmask.app/Contents/MacOS/
+	# XXX hack... this contains the openvpn binary (brew), but we need to build it from sources.
+	cp -r src/leap/bitmask/util/openvpn.leap dist/Bitmask.app/Contents/Resources/
 	# XXX this should be taken care of by pyinstaller data collector
 	cp $(VIRTUAL_ENV)/lib/python2.7/site-packages/leap/common/cacert.pem dist/Bitmask.app/Contents/MacOS/
 
diff --git a/pkg/osx/Bitmask.pkgproj b/pkg/osx/Bitmask.pkgproj
index 5a21dc35..bf882850 100755
--- a/pkg/osx/Bitmask.pkgproj
+++ b/pkg/osx/Bitmask.pkgproj
@@ -486,8 +486,39 @@
 		</dict>
 		<key>PACKAGE_SCRIPTS</key>
 		<dict>
+			<key>POSTINSTALL_PATH</key>
+			<dict>
+				<key>PATH</key>
+				<string>../pkg/osx/post-inst.sh</string>
+				<key>PATH_TYPE</key>
+				<integer>3</integer>
+			</dict>
+			<key>PREINSTALL_PATH</key>
+			<dict>
+				<key>PATH</key>
+				<string>/Users/user/leap/bitmask_client/pkg/osx/pre-inst.sh</string>
+				<key>PATH_TYPE</key>
+				<integer>0</integer>
+			</dict>
 			<key>RESOURCES</key>
-			<array/>
+			<array>
+				<dict>
+					<key>CHILDREN</key>
+					<array/>
+					<key>GID</key>
+					<integer>0</integer>
+					<key>PATH</key>
+					<string>../pkg/osx/se.leap.bitmask-helper.plist</string>
+					<key>PATH_TYPE</key>
+					<integer>3</integer>
+					<key>PERMISSIONS</key>
+					<integer>420</integer>
+					<key>TYPE</key>
+					<integer>3</integer>
+					<key>UID</key>
+					<integer>0</integer>
+				</dict>
+			</array>
 		</dict>
 		<key>PACKAGE_SETTINGS</key>
 		<dict>
@@ -502,7 +533,7 @@
 			<key>RELOCATABLE</key>
 			<true/>
 			<key>VERSION</key>
-			<string>0.9.0rc2</string>
+			<string>0.9.0rc4</string>
 		</dict>
 		<key>PROJECT_COMMENTS</key>
 		<dict>
diff --git a/pkg/osx/__init__.py b/pkg/osx/__init__.py
new file mode 100644
index 00000000..4731a6ef
--- /dev/null
+++ b/pkg/osx/__init__.py
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+
+# daemon/__init__.py
+# Part of ‘python-daemon’, an implementation of PEP 3143.
+#
+# Copyright © 2009–2015 Ben Finney <ben+python@benfinney.id.au>
+# Copyright © 2006 Robert Niederreiter
+#
+# This is free software: you may copy, modify, and/or distribute this work
+# under the terms of the Apache License, version 2.0 as published by the
+# Apache Software Foundation.
+# No warranty expressed or implied. See the file ‘LICENSE.ASF-2’ for details.
+
+""" Library to implement a well-behaved Unix daemon process.
+
+    This library implements the well-behaved daemon specification of
+    :pep:`3143`, “Standard daemon process library”.
+
+    A well-behaved Unix daemon process is tricky to get right, but the
+    required steps are much the same for every daemon program. A
+    `DaemonContext` instance holds the behaviour and configured
+    process environment for the program; use the instance as a context
+    manager to enter a daemon state.
+
+    Simple example of usage::
+
+        import daemon
+
+        from spam import do_main_program
+
+        with daemon.DaemonContext():
+            do_main_program()
+
+    Customisation of the steps to become a daemon is available by
+    setting options on the `DaemonContext` instance; see the
+    documentation for that class for each option.
+
+    """
+
+from __future__ import (absolute_import, unicode_literals)
+
+from .daemon import DaemonContext
+
+
+# Local variables:
+# coding: utf-8
+# mode: python
+# End:
+# vim: fileencoding=utf-8 filetype=python :
diff --git a/pkg/osx/_metadata.py b/pkg/osx/_metadata.py
new file mode 100644
index 00000000..6d22a2b7
--- /dev/null
+++ b/pkg/osx/_metadata.py
@@ -0,0 +1,152 @@
+# -*- coding: utf-8 -*-
+
+# daemon/_metadata.py
+# Part of ‘python-daemon’, an implementation of PEP 3143.
+#
+# Copyright © 2008–2015 Ben Finney <ben+python@benfinney.id.au>
+#
+# This is free software: you may copy, modify, and/or distribute this work
+# under the terms of the Apache License, version 2.0 as published by the
+# Apache Software Foundation.
+# No warranty expressed or implied. See the file ‘LICENSE.ASF-2’ for details.
+
+""" Package metadata for the ‘python-daemon’ distribution. """
+
+from __future__ import (absolute_import, unicode_literals)
+
+import json
+import re
+import collections
+import datetime
+
+import pkg_resources
+
+
+distribution_name = "python-daemon"
+version_info_filename = "version_info.json"
+
+def get_distribution_version_info(filename=version_info_filename):
+    """ Get the version info from the installed distribution.
+
+        :param filename: Base filename of the version info resource.
+        :return: The version info as a mapping of fields. If the
+            distribution is not available, the mapping is empty.
+
+        The version info is stored as a metadata file in the
+        distribution.
+
+        """
+    version_info = {
+            'release_date': "UNKNOWN",
+            'version': "UNKNOWN",
+            'maintainer': "UNKNOWN",
+            }
+
+    try:
+        distribution = pkg_resources.get_distribution(distribution_name)
+    except pkg_resources.DistributionNotFound:
+        distribution = None
+
+    if distribution is not None:
+        if distribution.has_metadata(version_info_filename):
+            content = distribution.get_metadata(version_info_filename)
+            version_info = json.loads(content)
+
+    return version_info
+
+version_info = get_distribution_version_info()
+
+version_installed = version_info['version']
+
+
+rfc822_person_regex = re.compile(
+        "^(?P<name>[^<]+) <(?P<email>[^>]+)>$")
+
+ParsedPerson = collections.namedtuple('ParsedPerson', ['name', 'email'])
+
+def parse_person_field(value):
+    """ Parse a person field into name and email address.
+
+        :param value: The text value specifying a person.
+        :return: A 2-tuple (name, email) for the person's details.
+
+        If the `value` does not match a standard person with email
+        address, the `email` item is ``None``.
+
+        """
+    result = (None, None)
+
+    match = rfc822_person_regex.match(value)
+    if len(value):
+        if match is not None:
+            result = ParsedPerson(
+                    name=match.group('name'),
+                    email=match.group('email'))
+        else:
+            result = ParsedPerson(name=value, email=None)
+
+    return result    
+
+author_name = "Ben Finney"
+author_email = "ben+python@benfinney.id.au"
+author = "{name} <{email}>".format(name=author_name, email=author_email)
+
+
+class YearRange:
+    """ A range of years spanning a period. """
+
+    def __init__(self, begin, end=None):
+        self.begin = begin
+        self.end = end
+
+    def __unicode__(self):
+        text = "{range.begin:04d}".format(range=self)
+        if self.end is not None:
+            if self.end > self.begin:
+                text = "{range.begin:04d}–{range.end:04d}".format(range=self)
+        return text
+
+    __str__ = __unicode__
+
+
+def make_year_range(begin_year, end_date=None):
+    """ Construct the year range given a start and possible end date.
+
+        :param begin_date: The beginning year (text) for the range.
+        :param end_date: The end date (text, ISO-8601 format) for the
+            range, or a non-date token string.
+        :return: The range of years as a `YearRange` instance.
+
+        If the `end_date` is not a valid ISO-8601 date string, the
+        range has ``None`` for the end year.
+
+        """
+    begin_year = int(begin_year)
+
+    try:
+        end_date = datetime.datetime.strptime(end_date, "%Y-%m-%d")
+    except (TypeError, ValueError):
+        # Specified end_date value is not a valid date.
+        end_year = None
+    else:
+        end_year = end_date.year
+
+    year_range = YearRange(begin=begin_year, end=end_year)
+
+    return year_range
+
+copyright_year_begin = "2001"
+build_date = version_info['release_date']
+copyright_year_range = make_year_range(copyright_year_begin, build_date)
+
+copyright = "Copyright © {year_range} {author} and others".format(
+        year_range=copyright_year_range, author=author)
+license = "Apache-2"
+url = "https://alioth.debian.org/projects/python-daemon/"
+
+
+# Local variables:
+# coding: utf-8
+# mode: python
+# End:
+# vim: fileencoding=utf-8 filetype=python :
diff --git a/pkg/osx/bitmask-helper b/pkg/osx/bitmask-helper
new file mode 100755
index 00000000..c22d33d9
--- /dev/null
+++ b/pkg/osx/bitmask-helper
@@ -0,0 +1,429 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# Author: Kali Kaneko
+# Copyright (C) 2015-2016 LEAP Encryption Access Project
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""
+This is a privileged helper script for safely running certain commands as root
+under OSX.
+
+It should be run by launchd, and it exposes a Unix Domain Socket to where
+the following commmands can be written by the Bitmask application:
+
+  firewall_start [restart] GATEWAY1 GATEWAY2 ...
+  firewall_stop
+  openvpn_start CONFIG1 CONFIG1 ...
+  openvpn_stop
+  fw_email_start uid
+  fw_email_stop
+
+To load it manually:
+
+  sudo launchctl load /Library/LaunchDaemons/se.leap.bitmask-helper
+
+To see the loaded rules:
+
+  sudo pfctl -s rules -a bitmask
+
+"""
+import os
+import socket
+import signal
+import subprocess
+import syslog
+import threading
+
+from commands import getoutput as exec_cmd
+from functools import partial
+
+import daemon
+
+VERSION = "1"
+SCRIPT = "bitmask-helper"
+NAMESERVER = "10.42.0.1"
+BITMASK_ANCHOR = "com.apple/250.BitmaskFirewall"
+BITMASK_ANCHOR_EMAIL = "bitmask_email"
+
+OPENVPN_USER = 'nobody'
+OPENVPN_GROUP = 'nogroup'
+LEAPOPENVPN = 'LEAPOPENVPN'
+APP_PATH = '/Applications/Bitmask.app/'
+RESOURCES_PATH = APP_PATH + 'Contents/Resources/'
+OPENVPN_LEAP_BIN = RESOURCES_PATH + 'openvpn.leap'
+
+FIXED_FLAGS = [
+    "--setenv", "LEAPOPENVPN", "1",
+    "--nobind",
+    "--client",
+    "--dev", "tun",
+    "--tls-client",
+    "--remote-cert-tls", "server",
+    "--management-signal",
+    "--script-security", "1",
+    "--user", "nobody",
+    "--remap-usr1", "SIGTERM",
+    "--group", OPENVPN_GROUP,
+]
+
+ALLOWED_FLAGS = {
+    "--remote": ["IP", "NUMBER", "PROTO"],
+    "--tls-cipher": ["CIPHER"],
+    "--cipher": ["CIPHER"],
+    "--auth": ["CIPHER"],
+    "--management": ["DIR", "UNIXSOCKET"],
+    "--management-client-user": ["USER"],
+    "--cert": ["FILE"],
+    "--key": ["FILE"],
+    "--ca": ["FILE"],
+    "--fragment": ["NUMBER"]
+}
+
+PARAM_FORMATS = {
+    "NUMBER": lambda s: re.match("^\d+$", s),
+    "PROTO": lambda s: re.match("^(tcp|udp)$", s),
+    "IP": lambda s: is_valid_address(s),
+    "CIPHER": lambda s: re.match("^[A-Z0-9-]+$", s),
+    "USER": lambda s: re.match(
+        "^[a-zA-Z0-9_\.\@][a-zA-Z0-9_\-\.\@]*\$?$", s),  # IEEE Std 1003.1-2001
+    "FILE": lambda s: os.path.isfile(s),
+    "DIR": lambda s: os.path.isdir(os.path.split(s)[0]),
+    "UNIXSOCKET": lambda s: s == "unix",
+    "UID": lambda s: re.match("^[a-zA-Z0-9]+$", s)
+}
+
+#
+# paths (must use absolute paths, since this script is run as root)
+#
+
+PFCTL = '/sbin/pfctl'
+ROUTE = '/sbin/route'
+AWK = '/usr/bin/awk'
+GREP = '/usr/bin/grep'
+CAT = '/bin/cat'
+
+UID = os.getuid()
+SERVER_ADDRESS = '/tmp/bitmask-helper.socket'
+
+
+#
+# COMMAND DISPATCH
+#
+
+def serve_forever():
+    try:
+        os.unlink(SERVER_ADDRESS)
+    except OSError:
+        if os.path.exists(SERVER_ADDRESS):
+            raise
+
+    syslog.syslog(syslog.LOG_WARNING, "serving forever")
+    # XXX should check permissions on the socket file
+    sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+    sock.bind(SERVER_ADDRESS)
+    sock.listen(1)
+    syslog.syslog(syslog.LOG_WARNING, "Binded to %s" % SERVER_ADDRESS)
+
+    while True:
+        connection, client_address = sock.accept()
+        thread = threading.Thread(target=handle_command, args=[connection])
+        thread.daemon = True
+        thread.start()
+    
+def recv_until_marker(sock):
+    end = '/CMD'
+    total_data=[]
+    data=''
+    while True:
+        data=sock.recv(8192)
+        if end in data:
+            total_data.append(data[:data.find(end)])
+            break
+        total_data.append(data)
+        if len(total_data)>1:
+            #check if end_of_data was split
+            last_pair=total_data[-2]+total_data[-1]
+            if end in last_pair:
+                total_data[-2] = last_pair[:last_pair.find(end)]
+                total_data.pop()
+                break
+    return ''.join(total_data)
+
+
+def handle_command(sock):
+    syslog.syslog(syslog.LOG_WARNING, "handle")
+
+    received = recv_until_marker(sock)
+    syslog.syslog(syslog.LOG_WARNING, "GOT -----> %s" % received)
+    line = received.replace('\n', '').split(' ')
+
+    command, args = line[0], line[1:]
+    syslog.syslog(syslog.LOG_WARNING, 'command %s' % (command))
+
+    cmd_dict = {
+        'firewall_start': (firewall_start, args),
+        'firewall_stop': (firewall_stop, []),
+        'firewall_isup': (firewall_isup, []),
+        'openvpn_start': (openvpn_start, args),
+        'openvpn_stop': (openvpn_stop, []),
+        'openvpn_force_stop': (openvpn_stop, ['KILL']),
+        'openvpn_set_watcher': (openvpn_set_watcher, args)
+    }
+
+    cmd_call = cmd_dict.get(command, None)
+    syslog.syslog(syslog.LOG_WARNING, 'call: %s' % (str(cmd_call)))
+    try:
+        if cmd_call:
+            syslog.syslog(
+                syslog.LOG_WARNING, 'GOT "%s"' % (command))
+            cmd, args = cmd_call
+            if args:
+                cmd = partial(cmd, *args)
+
+            # TODO Use a MUTEX in here
+            result = cmd()
+            syslog.syslog(syslog.LOG_WARNING, "Executed")
+            syslog.syslog(syslog.LOG_WARNING, "Result: %s" % (str(result)))
+            if result == 'YES':
+                sock.sendall("%s: YES\n" % command)
+            elif result == 'NO':
+                sock.sendall("%s: NO\n" % command)
+            else:
+                sock.sendall("%s: OK\n" % command)
+
+        else:
+            syslog.syslog(syslog.LOG_WARNING, 'invalid command: %s' % (command,))
+            sock.sendall("%s: ERROR\n" % command)
+    except Exception as exc:
+        syslog.syslog(syslog.LOG_WARNING, "error executing function %r" % (exc))
+    finally:
+        sock.close()
+
+
+
+#
+# OPENVPN
+#
+
+
+openvpn_proc = None
+openvpn_watcher_pid = None
+
+
+def openvpn_start(*args):
+    """
+    Sanitize input and run openvpn as a subprocess of this long-running daemon.
+    Keeps a reference to the subprocess Popen class instance.
+
+    :param args: arguments to be passed to openvpn
+    :type args: list
+    """
+    syslog.syslog(syslog.LOG_WARNING, "OPENVPN START")
+    opts = list(args[1:])
+
+    opts += ['--dhcp-option', 'DNS', '10.42.0.1',
+             '--up', RESOURCES_PATH + 'client.up.sh',
+             '--down', RESOURCES_PATH + 'client.down.sh']
+    binary = [RESOURCES_PATH + 'openvpn.leap']
+
+    syslog.syslog(syslog.LOG_WARNING, ' '.join(binary + opts))
+
+    # TODO sanitize options
+    global openvpn_proc
+    openvpn_proc = subprocess.Popen(binary + opts, shell=False)
+    syslog.syslog(syslog.LOG_WARNING, "OpenVPN PID: %s" % str(openvpn_proc.pid))
+
+
+def openvpn_stop(sig='TERM'):
+    """
+    Stop the openvpn that has been launched by this privileged helper.
+
+    :param args: arguments to openvpn
+    :type args: list
+    """
+    global openvpn_proc
+    
+    if openvpn_proc:
+        syslog.syslog(syslog.LOG_WARNING, "OVPN PROC: %s" % str(openvpn_proc.pid))
+
+        if sig == 'KILL':
+            stop_signal = signal.SIGKILL
+            openvpn_proc.kill()
+        elif sig == 'TERM':
+            stop_signal = signal.SIGTERM
+            openvpn_proc.terminate()
+    
+        returncode = openvpn_proc.wait()
+        syslog.syslog(syslog.LOG_WARNING, "openvpn return code: %s" % str(returncode))
+        syslog.syslog(syslog.LOG_WARNING, "openvpn_watcher_pid: %s" % str(openvpn_watcher_pid))
+        if openvpn_watcher_pid:
+            os.kill(openvpn_watcher_pid, stop_signal)
+
+
+def openvpn_set_watcher(pid, *args):
+    global openvpn_watcher_pid
+    openvpn_watcher_pid = int(pid)
+    syslog.syslog(syslog.LOG_WARNING, "Watcher PID: %s" % pid)
+
+
+#
+# FIREWALL
+#
+
+
+def firewall_start(*gateways):
+    """
+    Bring up the firewall.
+
+    :param gws: list of gateways, to be sanitized.
+    :type gws: list
+    """
+
+    gateways = get_gateways(gateways)
+
+    if not gateways:
+        return False
+
+    _enable_pf()
+    _reset_bitmask_gateways_table(gateways)
+
+    default_device = _get_default_device()
+    _load_bitmask_anchor(default_device)
+
+
+def firewall_stop():
+    """
+    Flush everything from anchor bitmask
+    """
+    cmd = '{pfctl} -a {anchor} -F all'.format(
+        pfctl=PFCTL, anchor=BITMASK_ANCHOR)
+    return exec_cmd(cmd)
+
+
+def firewall_isup():
+    """
+    Return YES if anchor bitmask is loaded with rules
+    """
+    syslog.syslog(syslog.LOG_WARNING, 'PID---->%s' % os.getpid())
+    cmd = '{pfctl} -s rules -a {anchor} | wc -l'.format(
+        pfctl=PFCTL, anchor=BITMASK_ANCHOR)
+    output = exec_cmd(cmd)
+    rules = output[-1]
+    if int(rules) > 0:
+        return 'YES'
+    else:
+        return 'NO'
+
+
+def _enable_pf():
+    exec_cmd('{pfctl} -e'.format(pfctl=PFCTL))
+
+
+def _reset_bitmask_gateways_table(gateways):
+    cmd = '{pfctl} -a {anchor} -t bitmask_gateways -T delete'.format(
+        pfctl=PFCTL, anchor=BITMASK_ANCHOR)
+    output = exec_cmd(cmd)
+
+    for gateway in gateways:
+        cmd = '{pfctl} -a {anchor} -t bitmask_gateways -T add {gw}'.format(
+            pfctl=PFCTL, anchor=BITMASK_ANCHOR, gw=gateway)
+        output = exec_cmd(cmd)
+        syslog.syslog(syslog.LOG_WARNING, "adding gw %s" % gateway)
+
+    #cmd = '{pfctl} -a {anchor} -t bitmask_nameservers -T delete'.format(
+    #    pfctl=PFCTL, anchor=BITMASK_ANCHOR)
+    #output = exec_cmd(cmd)
+
+    cmd = '{pfctl} -a {anchor} -t bitmask_gateways -T add {ns}'.format(
+        pfctl=PFCTL, anchor=BITMASK_ANCHOR, ns=NAMESERVER)
+    output = exec_cmd(cmd)
+    syslog.syslog(syslog.LOG_WARNING, "adding ns %s" % NAMESERVER)
+
+def _load_bitmask_anchor(default_device):
+    cmd = ('{pfctl} -D default_device={defaultdevice} '
+          '-a {anchor} -f {rulefile}').format(
+        pfctl=PFCTL, defaultdevice=default_device,
+        anchor=BITMASK_ANCHOR,
+        rulefile=RESOURCES_PATH + 'bitmask-helper/bitmask.pf.conf')
+    syslog.syslog(syslog.LOG_WARNING, "LOADING CMD: %s" % cmd)
+    return exec_cmd(cmd)
+
+
+def _get_default_device():
+    """
+    Retrieve the current default network device.
+
+    :rtype: str
+    """
+    cmd_def_device = (
+        '{route} -n get -net default | '
+        '{grep} interface | {awk} "{{print $2}}"').format(
+            route=ROUTE, grep=GREP, awk=AWK)
+    iface = exec_cmd(cmd_def_device)
+    iface = iface.replace("interface: ", "").strip()
+    syslog.syslog(syslog.LOG_WARNING, "default device %s" % iface)
+    return iface
+
+
+
+#
+# UTILITY
+#
+
+
+def is_valid_address(value):
+    """
+    Validate that the passed ip is a valid IP address.
+
+    :param value: the value to be validated
+    :type value: str
+    :rtype: bool
+    """
+    try:
+        socket.inet_aton(value)
+        return True
+    except Exception:
+        syslog.syslog(syslog.LOG_WARNING, 'MALFORMED IP: %s!' % (value))
+        return False
+
+
+#
+# FIREWALL
+#
+
+
+def get_gateways(gateways):
+    """
+    Filter a passed sequence of gateways, returning only the valid ones.
+
+    :param gateways: a sequence of gateways to filter.
+    :type gateways: iterable
+    :rtype: iterable
+    """
+    syslog.syslog(syslog.LOG_WARNING, 'Filtering %s' % str(gateways))
+    result = filter(is_valid_address, gateways)
+    if not result:
+        syslog.syslog(syslog.LOG_ERR, 'No valid gateways specified')
+        return False
+    else:
+        return result
+
+
+
+if __name__ == "__main__":
+    with daemon.DaemonContext():
+        syslog.syslog(syslog.LOG_WARNING, "Serving...") 
+        serve_forever()
diff --git a/pkg/osx/bitmask.pf.conf b/pkg/osx/bitmask.pf.conf
new file mode 100644
index 00000000..eb0e858f
--- /dev/null
+++ b/pkg/osx/bitmask.pf.conf
@@ -0,0 +1,17 @@
+default_device = "en99"
+
+set block-policy drop
+set skip on lo0
+
+# block all traffic on default device
+block out on $default_device all
+
+# allow traffic to gateways
+pass out on $default_device to <bitmask_gateways>
+
+# allow traffic to local networks over the default device
+pass out on $default_device to $default_device:network
+
+# block all DNS, except to the gateways
+block out proto udp to any port 53
+pass out proto udp to <bitmask_gateways> port 53
diff --git a/pkg/osx/client.down.sh b/pkg/osx/client.down.sh
new file mode 100755
index 00000000..1e173bba
--- /dev/null
+++ b/pkg/osx/client.down.sh
@@ -0,0 +1,426 @@
+#!/bin/bash -e
+# Note: must be bash; uses bash-specific tricks
+#
+# ******************************************************************************************************************
+# Copyright By Tunnelblick. Redistributed with Bitmask under the GPL.
+# This Tunnelblick script does everything! It handles TUN and TAP interfaces, 
+# pushed configurations and DHCP leases. :)
+# 
+# This is the "Down" version of the script, executed after the connection is 
+# closed.
+#
+# Created by: Nick Williams (using original code and parts of old Tblk scripts)
+# 
+# ******************************************************************************************************************
+
+# @param String message - The message to log
+logMessage()
+{
+	echo "${@}"
+}
+
+# @param String message - The message to log
+logDebugMessage()
+{
+	echo "${@}" > /dev/null
+}
+
+trim()
+{
+echo ${@}
+}
+
+# @param String list - list of network service names, output from disable_ipv6()
+restore_ipv6() {
+
+    # Undoes the actions performed by the disable_ipv6() routine in client.up.tunnelblick.sh by restoring the IPv6
+    # 'automatic' setting for each network service for which that routine disabled IPv6.
+    #
+    # $1 must contain the output from disable_ipv6() -- the list of network services.
+    #
+    # This routine outputs log messages describing its activities.
+
+    if [ "$1" = "" ] ; then
+        exit
+    fi
+
+    printf %s "$1
+" | \
+    while IFS= read -r ripv6_service ; do
+        networksetup -setv6automatic "$ripv6_service"
+        logMessage "Re-enabled IPv6 (automatic) for '$ripv6_service'"
+    done
+}
+
+##########################################################################################
+flushDNSCache()
+{
+    if ${ARG_FLUSH_DNS_CACHE} ; then
+        set +e # "grep" will return error status (1) if no matches are found, so don't fail on individual errors
+        readonly OSVER="$(sw_vers | grep 'ProductVersion:' | grep -o '10\.[0-9]*')"
+        set -e # We instruct bash that it CAN again fail on errors
+	    if [ "${OSVER}" = "10.4" ] ; then
+
+			if [ -f /usr/sbin/lookupd ] ; then
+				set +e # we will catch errors from lookupd
+				/usr/sbin/lookupd -flushcache
+				if [ $? != 0 ] ; then
+					logMessage "WARNING: Unable to flush the DNS cache via lookupd"
+				else
+					logMessage "Flushed the DNS cache via lookupd"
+				fi
+				set -e # bash should again fail on errors
+			else
+				logMessage "WARNING: /usr/sbin/lookupd not present. Not flushing the DNS cache"
+			fi
+
+		else
+
+			if [ -f /usr/bin/dscacheutil ] ; then
+				set +e # we will catch errors from dscacheutil
+				/usr/bin/dscacheutil -flushcache
+				if [ $? != 0 ] ; then
+					logMessage "WARNING: Unable to flush the DNS cache via dscacheutil"
+				else
+					logMessage "Flushed the DNS cache via dscacheutil"
+				fi
+				set -e # bash should again fail on errors
+			else
+				logMessage "WARNING: /usr/bin/dscacheutil not present. Not flushing the DNS cache via dscacheutil"
+			fi
+		
+			if [ -f /usr/sbin/discoveryutil ] ; then
+				set +e # we will catch errors from discoveryutil
+				/usr/sbin/discoveryutil udnsflushcaches
+				if [ $? != 0 ] ; then
+					logMessage "WARNING: Unable to flush the DNS cache via discoveryutil udnsflushcaches"
+				else
+					logMessage "Flushed the DNS cache via discoveryutil udnsflushcaches"
+				fi
+				/usr/sbin/discoveryutil mdnsflushcache
+				if [ $? != 0 ] ; then
+					logMessage "WARNING: Unable to flush the DNS cache via discoveryutil mdnsflushcache"
+				else
+					logMessage "Flushed the DNS cache via discoveryutil mdnsflushcache"
+				fi
+				set -e # bash should again fail on errors
+			else
+				logMessage "/usr/sbin/discoveryutil not present. Not flushing the DNS cache via discoveryutil"
+			fi
+			
+			set +e # "grep" will return error status (1) if no matches are found, so don't fail on individual errors
+			hands_off_ps="$( ps -ax | grep HandsOffDaemon | grep -v grep.HandsOffDaemon )"
+			set -e # We instruct bash that it CAN again fail on errors
+			if [ "${hands_off_ps}" = "" ] ; then
+				if [ -f /usr/bin/killall ] ; then
+					set +e # ignore errors if mDNSResponder isn't currently running
+					/usr/bin/killall -HUP mDNSResponder
+					if [ $? != 0 ] ; then
+						logMessage "mDNSResponder not running. Not notifying it that the DNS cache was flushed"
+					else
+						logMessage "Notified mDNSResponder that the DNS cache was flushed"
+					fi
+					set -e # bash should again fail on errors
+				else
+					logMessage "WARNING: /usr/bin/killall not present. Not notifying mDNSResponder that the DNS cache was flushed"
+				fi
+			else
+				logMessage "WARNING: Hands Off is running.  Not notifying mDNSResponder that the DNS cache was flushed"
+			fi
+		
+		fi
+    fi
+}
+
+##########################################################################################
+resetPrimaryInterface()
+{
+	set +e # "grep" will return error status (1) if no matches are found, so don't fail on individual errors
+	WIFI_INTERFACE="$(networksetup -listallhardwareports | awk '$3=="Wi-Fi" {getline; print $2}')"
+	if [ "${WIFI_INTERFACE}" == "" ] ; then
+		WIFI_INTERFACE="$(networksetup -listallhardwareports | awk '$3=="AirPort" {getline; print $2}')"
+    fi
+	PINTERFACE="$( scutil <<-EOF |
+        open
+        show State:/Network/Global/IPv4
+        quit
+EOF
+    grep PrimaryInterface | sed -e 's/.*PrimaryInterface : //'
+    )"
+    set -e # resume abort on error
+
+    if [ "${PINTERFACE}" != "" ] ; then
+	    if [ "${PINTERFACE}" == "${WIFI_INTERFACE}" -a "${OSVER}" != "10.4" -a -f /usr/sbin/networksetup ] ; then
+		    if [ "${OSVER}" == "10.5" ] ; then
+			    logMessage "Resetting primary interface '${PINTERFACE}' via networksetup -setairportpower off/on..."
+				/usr/sbin/networksetup -setairportpower off
+				sleep 2
+				/usr/sbin/networksetup -setairportpower on
+			else
+				logMessage "Resetting primary interface '${PINTERFACE}' via networksetup -setairportpower ${PINTERFACE} off/on..."
+				/usr/sbin/networksetup -setairportpower "${PINTERFACE}" off
+				sleep 2
+				/usr/sbin/networksetup -setairportpower "${PINTERFACE}" on
+			fi
+		else
+		    if [ -f /sbin/ifconfig ] ; then
+			    logMessage "Resetting primary interface '${PINTERFACE}' via ifconfig ${PINTERFACE} down/up..."
+                /sbin/ifconfig "${PINTERFACE}" down
+                sleep 2
+			    /sbin/ifconfig "${PINTERFACE}" up
+			else
+				logMessage "WARNING: Not resetting primary interface because /sbin/ifconfig does not exist."
+			fi
+		fi
+    else
+        logMessage "WARNING: Not resetting primary interface because it cannot be found."
+    fi
+}
+
+##########################################################################################
+trap "" TSTP
+trap "" HUP
+trap "" INT
+export PATH="/bin:/sbin:/usr/sbin:/usr/bin"
+
+readonly OUR_NAME=$(basename "${0}")
+
+logMessage "**********************************************"
+logMessage "Start of output from ${OUR_NAME}"
+
+# Remove the flag file that indicates we need to run the down script
+
+if [ -e   "/tmp/bitmask-downscript-needs-to-be-run.txt" ] ; then
+    rm -f "/tmp/bitmask-downscript-needs-to-be-run.txt"
+fi
+
+# Test for the "-r" Bitmask option (Reset primary interface after disconnecting) because we _always_ need its value.
+# Usually we get the value for that option (and the other options) from State:/Network/OpenVPN,
+# but that key may not exist (because, for example, there were no DNS changes).
+# So we get the value from the Bitmask options passed to this script by OpenVPN.
+#
+# We do the same thing for the -f Bitmask option (Flush DNS cache after connecting or disconnecting)
+ARG_RESET_PRIMARY_INTERFACE_ON_DISCONNECT="false"
+ARG_FLUSH_DNS_CACHE="false"
+while [ {$#} ] ; do
+    if [ "${1:0:1}" != "-" ] ; then				# Bitmask arguments start with "-" and come first
+        break                                   # so if this one doesn't start with "-" we are done processing Bitmask arguments
+    fi
+    if [ "$1" = "-r" ] ; then
+        ARG_RESET_PRIMARY_INTERFACE_ON_DISCONNECT="true"
+    else
+	    if [ "$1" = "-f" ] ; then
+            ARG_FLUSH_DNS_CACHE="true"
+        fi
+    fi
+    shift                                       # Shift arguments to examine the next option (if there is one)
+done
+
+# Quick check - is the configuration there?
+if ! scutil -w State:/Network/OpenVPN &>/dev/null -t 1 ; then
+	# Configuration isn't there
+    logMessage "WARNING: Not restoring DNS settings because no saved Bitmask DNS information was found."
+	
+	flushDNSCache
+    
+	if ${ARG_RESET_PRIMARY_INTERFACE_ON_DISCONNECT} ; then
+        resetPrimaryInterface
+    fi
+    logMessage "End of output from ${OUR_NAME}"
+    logMessage "**********************************************"
+	exit 0
+fi
+
+# Get info saved by the up script
+TUNNELBLICK_CONFIG="$( scutil <<-EOF
+	open
+	show State:/Network/OpenVPN
+	quit
+EOF
+)"
+
+ARG_MONITOR_NETWORK_CONFIGURATION="$(echo "${TUNNELBLICK_CONFIG}" | grep -i '^[[:space:]]*MonitorNetwork :' | sed -e 's/^.*: //g')"
+LEASEWATCHER_PLIST_PATH="$(echo "${TUNNELBLICK_CONFIG}" | grep -i '^[[:space:]]*LeaseWatcherPlistPath :' | sed -e 's/^.*: //g')"
+REMOVE_LEASEWATCHER_PLIST="$(echo "${TUNNELBLICK_CONFIG}" | grep -i '^[[:space:]]*RemoveLeaseWatcherPlist :' | sed -e 's/^.*: //g')"
+PSID="$(echo "${TUNNELBLICK_CONFIG}" | grep -i '^[[:space:]]*Service :' | sed -e 's/^.*: //g')"
+# Don't need: SCRIPT_LOG_FILE="$(echo "${TUNNELBLICK_CONFIG}" | grep -i '^[[:space:]]*ScriptLogFile :' | sed -e 's/^.*: //g')"
+# Don't need: ARG_RESTORE_ON_DNS_RESET="$(echo "${TUNNELBLICK_CONFIG}" | grep -i '^[[:space:]]*RestoreOnDNSReset :' | sed -e 's/^.*: //g')"
+# Don't need: ARG_RESTORE_ON_WINS_RESET="$(echo "${TUNNELBLICK_CONFIG}" | grep -i '^[[:space:]]*RestoreOnWINSReset :' | sed -e 's/^.*: //g')"
+# Don't need: PROCESS="$(echo "${TUNNELBLICK_CONFIG}" | grep -i '^[[:space:]]*PID :' | sed -e 's/^.*: //g')"
+# Don't need: ARG_IGNORE_OPTION_FLAGS="$(echo "${TUNNELBLICK_CONFIG}" | grep -i '^[[:space:]]*IgnoreOptionFlags :' | sed -e 's/^.*: //g')"
+ARG_TAP="$(echo "${TUNNELBLICK_CONFIG}" | grep -i '^[[:space:]]*IsTapInterface :' | sed -e 's/^.*: //g')"
+ARG_FLUSH_DNS_CACHE="$(echo "${TUNNELBLICK_CONFIG}" | grep -i '^[[:space:]]*FlushDNSCache :' | sed -e 's/^.*: //g')"
+ARG_RESET_PRIMARY_INTERFACE_ON_DISCONNECT="$(echo "${TUNNELBLICK_CONFIG}" | grep -i '^[[:space:]]*ResetPrimaryInterface :' | sed -e 's/^.*: //g')"
+bRouteGatewayIsDhcp="$(echo "${TUNNELBLICK_CONFIG}" | grep -i '^[[:space:]]*RouteGatewayIsDhcp :' | sed -e 's/^.*: //g')"
+bTapDeviceHasBeenSetNone="$(echo "${TUNNELBLICK_CONFIG}" | grep -i '^[[:space:]]*TapDeviceHasBeenSetNone :' | sed -e 's/^.*: //g')"
+bAlsoUsingSetupKeys="$(echo "${TUNNELBLICK_CONFIG}" | grep -i '^[[:space:]]*bAlsoUsingSetupKeys :' | sed -e 's/^.*: //g')"
+sTunnelDevice="$(echo "${TUNNELBLICK_CONFIG}" | grep -i '^[[:space:]]*TunnelDevice :' | sed -e 's/^.*: //g')"
+
+# Note: '\n' was translated into '\t', so we translate it back (it was done because grep and sed only work with single lines)
+sRestoreIpv6Services="$(echo "${TUNNELBLICK_CONFIG}" | grep -i '^[[:space:]]*RestoreIpv6Services :' | sed -e 's/^.*: //g' | tr '\t' '\n')"
+
+# Remove leasewatcher
+if ${ARG_MONITOR_NETWORK_CONFIGURATION} ; then
+	launchctl unload "${LEASEWATCHER_PLIST_PATH}"
+    if ${REMOVE_LEASEWATCHER_PLIST} ; then
+        rm -f "${LEASEWATCHER_PLIST_PATH}"
+    fi
+	logMessage "Cancelled monitoring of system configuration changes"
+fi
+
+if ${ARG_TAP} ; then
+	if [ "$bRouteGatewayIsDhcp" == "true" ]; then
+        if [ "$bTapDeviceHasBeenSetNone" == "false" ]; then
+            if [ -z "$dev" ]; then
+                # If $dev is not defined, then use TunnelDevice, which was set from $dev by client.up.tunnelblick.sh
+                # ($def is not defined when this script is called from MenuController to clean up when exiting Bitmask)
+                if [ -n "${sTunnelDevice}" ]; then
+                    logMessage "WARNING: \$dev not defined; using TunnelDevice: ${sTunnelDevice}"
+                    set +e
+                    ipconfig set "${sTunnelDevice}" NONE 2>/dev/null
+                    set -e
+                    logMessage "Released the DHCP lease via ipconfig set ${sTunnelDevice} NONE."
+                else
+                    logMessage "WARNING: Cannot configure TAP interface to NONE without \$dev or State:/Network/OpenVPN/TunnelDevice being defined. Device may not have disconnected properly."
+                fi
+            else
+                set +e
+                ipconfig set "$dev" NONE 2>/dev/null
+                set -e
+                logMessage "Released the DHCP lease via ipconfig set $dev NONE."
+            fi
+        fi
+    fi
+fi
+
+# Issue warning if the primary service ID has changed
+set +e # "grep" will return error status (1) if no matches are found, so don't fail if not found
+PSID_CURRENT="$( scutil <<-EOF |
+	open
+	show State:/Network/OpenVPN
+	quit
+EOF
+grep 'Service : ' | sed -e 's/.*Service : //'
+)"
+set -e # resume abort on error
+if [ "${PSID}" != "${PSID_CURRENT}" ] ; then
+	logMessage "Ignoring change of Network Primary Service from ${PSID} to ${PSID_CURRENT}"
+fi
+
+# Restore configurations
+DNS_OLD="$( scutil <<-EOF
+	open
+	show State:/Network/OpenVPN/OldDNS
+	quit
+EOF
+)"
+SMB_OLD="$( scutil <<-EOF
+	open
+	show State:/Network/OpenVPN/OldSMB
+	quit
+EOF
+)"
+DNS_OLD_SETUP="$( scutil <<-EOF
+	open
+	show State:/Network/OpenVPN/OldDNSSetup
+	quit
+EOF
+)"
+TB_NO_SUCH_KEY="<dictionary> {
+  BitmaskNoSuchKey : true
+}"
+
+if [ "${DNS_OLD}" = "${TB_NO_SUCH_KEY}" ] ; then
+	scutil <<-EOF
+		open
+		remove State:/Network/Service/${PSID}/DNS
+		quit
+EOF
+else
+	scutil <<-EOF
+		open
+		get State:/Network/OpenVPN/OldDNS
+		set State:/Network/Service/${PSID}/DNS
+		quit
+EOF
+fi
+
+if [ "${DNS_OLD_SETUP}" = "${TB_NO_SUCH_KEY}" ] ; then
+	if ${bAlsoUsingSetupKeys} ; then
+		logDebugMessage "DEBUG: Removing 'Setup:' DNS key"
+		scutil <<-EOF
+			open
+			remove Setup:/Network/Service/${PSID}/DNS
+			quit
+EOF
+	else
+		logDebugMessage "DEBUG: Not removing 'Setup:' DNS key"
+	fi
+else
+	if ${bAlsoUsingSetupKeys} ; then
+		logDebugMessage "DEBUG: Restoring 'Setup:' DNS key"
+		scutil <<-EOF
+			open
+			get State:/Network/OpenVPN/OldDNSSetup
+			set Setup:/Network/Service/${PSID}/DNS
+			quit
+EOF
+	else
+		logDebugMessage "DEBUG: Not restoring 'Setup:' DNS key"
+	fi
+fi
+
+if [ "${SMB_OLD}" = "${TB_NO_SUCH_KEY}" ] ; then
+	scutil > /dev/null <<-EOF
+		open
+		remove State:/Network/Service/${PSID}/SMB
+		quit
+EOF
+else
+	scutil > /dev/null <<-EOF
+		open
+		get State:/Network/OpenVPN/OldSMB
+		set State:/Network/Service/${PSID}/SMB
+		quit
+EOF
+fi
+
+logMessage "Restored the DNS and SMB configurations"
+
+set +e # "grep" will return error status (1) if no matches are found, so don't fail if not found
+new_resolver_contents="$( grep -v '#' < /etc/resolv.conf )"
+set -e # resume abort on error
+logDebugMessage "DEBUG:"
+logDebugMessage "DEBUG: /etc/resolve = ${new_resolver_contents}"
+
+set +e # scutil --dns will return error status in case dns is already down, so don't fail if no dns found
+scutil_dns="$( scutil --dns)"
+set -e # resume abort on error
+logDebugMessage "DEBUG:"
+logDebugMessage "DEBUG: scutil --dns = ${scutil_dns}"
+logDebugMessage "DEBUG:"
+
+restore_ipv6 "$sRestoreIpv6Services"
+
+flushDNSCache
+
+# Remove our system configuration data
+scutil <<-EOF
+	open
+	remove State:/Network/OpenVPN/OldDNS
+	remove State:/Network/OpenVPN/OldSMB
+	remove State:/Network/OpenVPN/OldDNSSetup
+	remove State:/Network/OpenVPN/DNS
+	remove State:/Network/OpenVPN/SMB
+	remove State:/Network/OpenVPN
+	quit
+EOF
+
+if ${ARG_RESET_PRIMARY_INTERFACE_ON_DISCONNECT} ; then
+    resetPrimaryInterface
+fi
+
+logMessage "End of output from ${OUR_NAME}"
+logMessage "**********************************************"
+
+exit 0
diff --git a/pkg/osx/client.up.sh b/pkg/osx/client.up.sh
new file mode 100755
index 00000000..a713c10e
--- /dev/null
+++ b/pkg/osx/client.up.sh
@@ -0,0 +1,1521 @@
+#!/bin/bash -e
+# Note: must be bash; uses bash-specific tricks
+#
+# ******************************************************************************************************************
+# Copyright by Tunnelblick. Redistributed under GPL as part of Bitmask.
+# This Tunnelblick script does everything! It handles TUN and TAP interfaces, 
+# pushed configurations, DHCP with DNS and SMB, and renewed DHCP leases. :)
+# 
+# This is the "Up" version of the script, executed after the interface is 
+# initialized.
+#
+# Created by: Nick Williams (using original code and parts of old Tblk scripts)
+# Modifed by: Jonathan K. Bullard for Mountain Lion
+# Adapted to use by Bitmask by: Kali Kaneko
+# 
+# ******************************************************************************************************************
+
+
+##########################################################################################
+# @param String message - The message to log
+logMessage()
+{
+	echo "${@}"
+}
+
+##########################################################################################
+# @param String message - The message to log
+logDebugMessage()
+{
+    if ${ARG_EXTRA_LOGGING} ; then
+        echo "${@}"
+    fi
+}
+
+##########################################################################################
+# log a change to a setting
+# @param String filters - empty, or one or two '#' if not performing the change
+# @param String name of setting that is being changed
+# @param String new value
+# @param String old value
+logChange()
+{
+	if [ "$1" = "" ] ; then
+		if [ "$3" = "$4" ] ; then
+			echo "Did not change $2 setting of '$3' (but re-set it)"
+		else
+			echo "Changed $2 setting from '$4' to '$3'"
+		fi
+	else
+		echo "Did not change $2 setting of '$4'"
+	fi
+}
+
+##########################################################################################
+# @param String string - Content to trim
+trim()
+{
+	echo ${@}
+}
+
+##########################################################################################
+disable_ipv6() {
+
+# Disables IPv6 on each enabled (active) network service on which it is set to the OS X default "IPv6 Automatic".
+#
+# For each such service, outputs a line with the name of the service.
+# (A separate line is output for each name because a name may include spaces.)
+#
+# The 'restore_ipv6' routine in client.down.sh undoes the actions performed by this routine.
+#
+# NOTE: Done only for enabled services because some versions of OS X enable the service if this IPv6 setting is changed.
+#
+# This only works for OS X 10.5 and higher (10.4 does not implement IPv6.)
+
+    if [ "$OSVER" = "10.4" ] ; then
+        exit
+    fi
+
+    # Get list of services and remove the first line which contains a heading
+    dipv6_services="$( networksetup  -listallnetworkservices | sed -e '1,1d')"
+
+    # Go through the list disabling IPv6 for enabled services, and outputting lines with the names of the services
+    printf %s "$dipv6_services
+" | \
+    while IFS= read -r dipv6_service ; do
+
+        # If first character of a line is an asterisk, the service is disabled, so we skip it
+        if [ "${dipv6_service:0:1}" != "*" ] ; then
+            dipv6_ipv6_status="$( networksetup -getinfo "$dipv6_service" | grep 'IPv6: ' | sed -e 's/IPv6: //')"
+            if [ "$dipv6_ipv6_status" = "Automatic" ] ; then
+                networksetup -setv6off "$dipv6_service"
+                echo "$dipv6_service"
+            fi
+        fi
+
+    done
+}
+
+##########################################################################################
+# @param String[] dnsServers - The name servers to use
+# @param String domainName - The domain name to use
+# @param \optional String[] winsServers - The SMB servers to use
+# @param \optional String[] searchDomains - The search domains to use
+#
+# Throughout this routine:
+#            MAN_ is a prefix for manually set parameters
+#            DYN_ is a prefix for dynamically set parameters (by a "push", config file, or command line option)
+#            CUR_ is a prefix for the current parameters (as arbitrated by OS X between manual and DHCP data)
+#            FIN_ is a prefix for the parameters we want to end up with
+#            SKP_ is a prefix for an empty string or a "#" used to control execution of statements that set parameters in scutil
+#
+#            DNS_SA is a suffix for the ServerAddresses value in a System Configuration DNS key
+#            DNS_SD is a suffix for the SearchDomains   value in a System Configuration DNS key
+#            DNS_DN is a suffix for the DomainName      value in a System Configuration DNS key
+#
+#            SMB_NN is a suffix for the NetBIOSName   value in a System Configuration SMB key
+#            SMB_WG is a suffix for the Workgroup     value in a System Configuration SMB key
+#            SMB_WA is a suffix for the WINSAddresses value in a System Configuration SMB key
+#
+# So, for example, MAN_SMB_NN is the manually set NetBIOSName value (or the empty string if not set manually)
+
+setDnsServersAndDomainName()
+{
+	set +e # "grep" will return error status (1) if no matches are found, so don't fail on individual errors
+	
+	PSID="$( scutil <<-EOF |
+		open
+		show State:/Network/Global/IPv4
+		quit
+EOF
+grep PrimaryService | sed -e 's/.*PrimaryService : //'
+)"
+
+	set -e # resume abort on error
+
+	MAN_DNS_CONFIG="$( scutil <<-EOF |
+		open
+		show Setup:/Network/Service/${PSID}/DNS
+		quit
+EOF
+sed -e 's/^[[:space:]]*[[:digit:]]* : //g' | tr '\n' ' '
+)"
+
+	MAN_SMB_CONFIG="$( scutil <<-EOF |
+		open
+		show Setup:/Network/Service/${PSID}/SMB
+		quit
+EOF
+sed -e 's/^[[:space:]]*[[:digit:]]* : //g' | tr '\n' ' '
+)"
+	CUR_DNS_CONFIG="$( scutil <<-EOF |
+		open
+		show State:/Network/Global/DNS
+		quit
+EOF
+sed -e 's/^[[:space:]]*[[:digit:]]* : //g' | tr '\n' ' '
+)"
+
+	CUR_SMB_CONFIG="$( scutil <<-EOF |
+		open
+		show State:/Network/Global/SMB
+		quit
+EOF
+sed -e 's/^[[:space:]]*[[:digit:]]* : //g' | tr '\n' ' '
+)"
+
+# Set up the DYN_... variables to contain what is asked for (dynamically, by a 'push' directive, for example)
+
+	declare -a vDNS=("${!1}")
+	declare -a vSMB=("${!3}")
+	declare -a vSD=("${!4}")
+
+	if [ ${#vDNS[*]} -eq 0 ] ; then
+		readonly DYN_DNS_SA=""
+	else
+		readonly DYN_DNS_SA="${!1}"
+	fi
+	
+	if [ ${#vSMB[*]} -eq 0 ] ; then
+		readonly DYN_SMB_WA=""
+	else
+		readonly DYN_SMB_WA="${!3}"
+	fi
+
+	if [ ${#vSD[*]} -eq 0 ] ; then
+		readonly DYN_DNS_SD=""
+	else
+		readonly DYN_DNS_SD="${!4}"
+	fi
+	
+	DYN_DNS_DN="$2"
+	
+	# The variables
+	#     DYN_SMB_WG
+	#     DYN_SMB_NN
+	# are left empty. There isn't a way for OpenVPN to set them.
+	
+	logDebugMessage "DEBUG:"
+	logDebugMessage "DEBUG: MAN_DNS_CONFIG = ${MAN_DNS_CONFIG}"
+	logDebugMessage "DEBUG: MAN_SMB_CONFIG = ${MAN_SMB_CONFIG}"
+	logDebugMessage "DEBUG:"
+	logDebugMessage "DEBUG: CUR_DNS_CONFIG = ${CUR_DNS_CONFIG}"
+	logDebugMessage "DEBUG: CUR_SMB_CONFIG = ${CUR_SMB_CONFIG}"
+	logDebugMessage "DEBUG:"
+	logDebugMessage "DEBUG:"
+	logDebugMessage "DEBUG: DYN_DNS_DN = ${DYN_DNS_DN}; DYN_DNS_SA = ${DYN_DNS_SA}; DYN_DNS_SD = ${DYN_DNS_SD}"
+	logDebugMessage "DEBUG: DYN_SMB_NN = ${DYN_SMB_NN}; DYN_SMB_WG = ${DYN_SMB_WG}; DYN_SMB_WA = ${DYN_SMB_WA}"
+	
+# Set up the MAN_... variables to contain manual network settings
+
+	set +e # "grep" will return error status (1) if no matches are found, so don't fail on individual errors
+	
+	if echo "${MAN_DNS_CONFIG}" | grep -q "DomainName" ; then
+		readonly MAN_DNS_DN="$( trim "$( echo "${MAN_DNS_CONFIG}" | sed -e 's/^.*DomainName[^{]*{[[:space:]]*\([^}]*\)[[:space:]]*}.*$/\1/g' )" )"
+	else
+		readonly MAN_DNS_DN="";
+	fi
+	if echo "${MAN_DNS_CONFIG}" | grep -q "ServerAddresses" ; then
+		readonly MAN_DNS_SA="$( trim "$( echo "${MAN_DNS_CONFIG}" | sed -e 's/^.*ServerAddresses[^{]*{[[:space:]]*\([^}]*\)[[:space:]]*}.*$/\1/g' )" )"
+	else
+		readonly MAN_DNS_SA="";
+	fi
+	if echo "${MAN_DNS_CONFIG}" | grep -q "SearchDomains" ; then
+		readonly MAN_DNS_SD="$( trim "$( echo "${MAN_DNS_CONFIG}" | sed -e 's/^.*SearchDomains[^{]*{[[:space:]]*\([^}]*\)[[:space:]]*}.*$/\1/g' )" )"
+	else
+		readonly MAN_DNS_SD="";
+	fi
+    if echo "${MAN_SMB_CONFIG}" | grep -q "NetBIOSName" ; then
+        readonly MAN_SMB_NN="$( trim "$( echo "${MAN_SMB_CONFIG}" | sed -e 's/^.*NetBIOSName : \([^[:space:]]*\).*$/\1/g' )" )"
+	else
+		readonly MAN_SMB_NN="";
+    fi
+    if echo "${MAN_SMB_CONFIG}" | grep -q "Workgroup" ; then
+        readonly MAN_SMB_WG="$( trim "$( echo "${MAN_SMB_CONFIG}" | sed -e 's/^.*Workgroup : \([^[:space:]]*\).*$/\1/g' )" )"
+	else
+		readonly MAN_SMB_WG="";
+    fi
+    if echo "${MAN_SMB_CONFIG}" | grep -q "WINSAddresses" ; then
+        readonly MAN_SMB_WA="$( trim "$( echo "${MAN_SMB_CONFIG}" | sed -e 's/^.*WINSAddresses[^{]*{[[:space:]]*\([^}]*\)[[:space:]]*}.*$/\1/g' )" )"
+	else
+		readonly MAN_SMB_WA="";
+    fi
+
+	set -e # resume abort on error
+
+	logDebugMessage "DEBUG:"
+	logDebugMessage "DEBUG: MAN_DNS_DN = ${MAN_DNS_DN}; MAN_DNS_SA = ${MAN_DNS_SA}; MAN_DNS_SD = ${MAN_DNS_SD}"
+	logDebugMessage "DEBUG: MAN_SMB_NN = ${MAN_SMB_NN}; MAN_SMB_WG = ${MAN_SMB_WG}; MAN_SMB_WA = ${MAN_SMB_WA}"
+	
+# Set up the CUR_... variables to contain the current network settings (from manual or DHCP, as arbitrated by OS X
+
+	set +e # "grep" will return error status (1) if no matches are found, so don't fail on individual errors
+	
+	if echo "${CUR_DNS_CONFIG}" | grep -q "DomainName" ; then
+		readonly CUR_DNS_DN="$(trim "$( echo "${CUR_DNS_CONFIG}" | sed -e 's/^.*DomainName : \([^[:space:]]*\).*$/\1/g' )")"
+	else
+		readonly CUR_DNS_DN="";
+	fi
+	if echo "${CUR_DNS_CONFIG}" | grep -q "ServerAddresses" ; then
+		readonly CUR_DNS_SA="$(trim "$( echo "${CUR_DNS_CONFIG}" | sed -e 's/^.*ServerAddresses[^{]*{[[:space:]]*\([^}]*\)[[:space:]]*}.*$/\1/g' )")"
+	else
+		readonly CUR_DNS_SA="";
+	fi
+	if echo "${CUR_DNS_CONFIG}" | grep -q "SearchDomains" ; then
+		readonly CUR_DNS_SD="$(trim "$( echo "${CUR_DNS_CONFIG}" | sed -e 's/^.*SearchDomains[^{]*{[[:space:]]*\([^}]*\)[[:space:]]*}.*$/\1/g' )")"
+	else
+		readonly CUR_DNS_SD="";
+	fi
+    if echo "${CUR_SMB_CONFIG}" | grep -q "NetBIOSName" ; then
+        readonly CUR_SMB_NN="$(trim "$( echo "${CUR_SMB_CONFIG}" | sed -e 's/^.*NetBIOSName : \([^[:space:]]*\).*$/\1/g' )")"
+	else
+		readonly CUR_SMB_NN="";
+    fi
+    if echo "${CUR_SMB_CONFIG}" | grep -q "Workgroup" ; then
+        readonly CUR_SMB_WG="$(trim "$( echo "${CUR_SMB_CONFIG}" | sed -e 's/^.*Workgroup : \([^[:space:]]*\).*$/\1/g' )")"
+	else
+		readonly CUR_SMB_WG="";
+    fi
+    if echo "${CUR_SMB_CONFIG}" | grep -q "WINSAddresses" ; then
+        readonly CUR_SMB_WA="$(trim "$( echo "${CUR_SMB_CONFIG}" | sed -e 's/^.*WINSAddresses[^{]*{[[:space:]]*\([^}]*\)[[:space:]]*}.*$/\1/g' )")"
+	else
+		readonly CUR_SMB_WA="";
+    fi
+
+	set -e # resume abort on error
+
+	logDebugMessage "DEBUG:"
+	logDebugMessage "DEBUG: CUR_DNS_DN = ${CUR_DNS_DN}; CUR_DNS_SA = ${CUR_DNS_SA}; CUR_DNS_SD = ${CUR_DNS_SD}"
+	logDebugMessage "DEBUG: CUR_SMB_NN = ${CUR_SMB_NN}; CUR_SMB_WG = ${CUR_SMB_WG}; CUR_SMB_WA = ${CUR_SMB_WA}"
+
+# set up the FIN_... variables with what we want to set things to
+
+	# Three FIN_... variables are simple -- no aggregation is done for them
+
+	if [ "${DYN_DNS_DN}" != "" ] ; then
+		if [ "${MAN_DNS_DN}" != "" ] ; then
+			logMessage "WARNING: Ignoring DomainName '$DYN_DNS_DN' because DomainName was set manually"
+			readonly FIN_DNS_DN="${MAN_DNS_DN}"
+		else
+			readonly FIN_DNS_DN="${DYN_DNS_DN}"
+		fi
+	else
+		readonly FIN_DNS_DN="${CUR_DNS_DN}"
+	fi
+	
+	if [ "${DYN_SMB_NN}" != "" ] ; then
+		if [ "${MAN_SMB_NN}" != "" ] ; then
+			logMessage "WARNING: Ignoring NetBIOSName '$DYN_SMB_NN' because NetBIOSName was set manually"
+			readonly FIN_SMB_NN="${MAN_SMB_NN}"
+		else
+			readonly FIN_SMB_NN="${DYN_SMB_NN}"
+		fi
+	else
+		readonly FIN_SMB_NN="${CUR_SMB_NN}"
+	fi
+	
+	if [ "${DYN_SMB_WG}" != "" ] ; then
+		if [ "${MAN_SMB_WG}" != "" ] ; then
+			logMessage "WARNING: Ignoring Workgroup '$DYN_SMB_WG' because Workgroup was set manually"
+			readonly FIN_SMB_WG="${MAN_SMB_WG}"
+		else
+			readonly FIN_SMB_WG="${DYN_SMB_WG}"
+		fi
+	else
+		readonly FIN_SMB_WG="${CUR_SMB_WG}"
+	fi
+
+	# DNS ServerAddresses (FIN_DNS_SA) are aggregated for 10.4 and 10.5
+	if [ ${#vDNS[*]} -eq 0 ] ; then
+		readonly FIN_DNS_SA="${CUR_DNS_SA}"
+	else
+		if [ "${MAN_DNS_SA}" != "" ] ; then
+			logMessage "WARNING: Ignoring ServerAddresses '$DYN_DNS_SA' because ServerAddresses was set manually"
+			readonly FIN_DNS_SA="${CUR_DNS_SA}"
+		else
+			case "${OSVER}" in
+				10.4 | 10.5 )
+					# We need to remove duplicate DNS entries, so that our reference list matches MacOSX's
+					SDNS="$( echo "${DYN_DNS_SA}" | tr ' ' '\n' )"
+					(( i=0 ))
+					for n in "${vDNS[@]}" ; do
+						if echo "${SDNS}" | grep -q "${n}" ; then
+							unset vDNS[${i}]
+						fi
+						(( i++ ))
+					done
+					if [ ${#vDNS[*]} -gt 0 ] ; then
+						readonly FIN_DNS_SA="$( trim "${DYN_DNS_SA}" "${vDNS[*]}" )"
+					else
+						readonly FIN_DNS_SA="${DYN_DNS_SA}"
+					fi
+					logMessage "Aggregating ServerAddresses because running on OS X 10.4 or 10.5"
+					;;
+				* )
+					# Do nothing - in 10.6 and higher -- we don't aggregate our configurations, apparently
+					readonly FIN_DNS_SA="${DYN_DNS_SA}"
+					logMessage "Not aggregating ServerAddresses because running on OS X 10.6 or higher"
+					;;
+			esac
+		fi
+	fi
+
+	# SMB WINSAddresses (FIN_SMB_WA) are aggregated for 10.4 and 10.5
+	if [ ${#vSMB[*]} -eq 0 ] ; then
+		readonly FIN_SMB_WA="${CUR_SMB_WA}"
+	else
+		if [ "${MAN_SMB_WA}" != "" ] ; then
+			logMessage "WARNING: Ignoring WINSAddresses '$DYN_SMB_WA' because WINSAddresses was set manually"
+			readonly FIN_SMB_WA="${MAN_SMB_WA}"
+		else
+		case "${OSVER}" in
+			10.4 | 10.5 )
+				# We need to remove duplicate SMB entries, so that our reference list matches MacOSX's
+				SSMB="$( echo "${DYN_SMB_WA}" | tr ' ' '\n' )"
+				(( i=0 ))
+				for n in "${vSMB[@]}" ; do
+					if echo "${SSMB}" | grep -q "${n}" ; then
+						unset vSMB[${i}]
+					fi
+					(( i++ ))
+				done
+				if [ ${#vSMB[*]} -gt 0 ] ; then
+					readonly FIN_SMB_WA="$( trim "${DYN_SMB_WA}" "${vSMB[*]}" )"
+				else
+					readonly FIN_SMB_WA="${DYN_SMB_WA}"
+				fi
+				logMessage "Aggregating WINSAddresses because running on OS X 10.4 or 10.5"
+				;;
+			* )
+				# Do nothing - in 10.6 and higher -- we don't aggregate our configurations, apparently
+				readonly FIN_SMB_WA="${DYN_SMB_WA}"
+				logMessage "Not aggregating WINSAddresses because running on OS X 10.6 or higher"
+				;;
+		esac
+		fi
+	fi
+
+	# DNS SearchDomains (FIN_DNS_SD) is treated specially
+	#
+	# OLD BEHAVIOR:
+	#     if SearchDomains was not set manually, we set SearchDomains to the DomainName
+	#     else
+	#          In OS X 10.4-10.5, we add the DomainName to the end of any manual SearchDomains (unless it is already there)
+	#          In OS X 10.6+, if SearchDomains was entered manually, we ignore the DomainName 
+	#                         else we set SearchDomains to the DomainName
+	#
+	# NEW BEHAVIOR (done if ARG_PREPEND_DOMAIN_NAME is "true"):
+	#
+	#     if SearchDomains was entered manually, we do nothing
+	#     else we  PREpend new SearchDomains (if any) to the existing SearchDomains (NOT replacing them)
+	#          and PREpend DomainName to that
+	#
+	#              (done if ARG_PREPEND_DOMAIN_NAME is "false" and there are new SearchDomains from DOMAIN-SEARCH):
+	#
+	#     if SearchDomains was entered manually, we do nothing
+	#     else we  PREpend any new SearchDomains to the existing SearchDomains (NOT replacing them)
+	#
+	#     This behavior is meant to behave like Linux with Network Manager and Windows
+	
+	if "${ARG_PREPEND_DOMAIN_NAME}" ; then
+		if [ "${MAN_DNS_SD}" = "" ] ; then
+			if [ "${DYN_DNS_SD}" != "" ] ; then
+                if ! echo "${CUR_DNS_SD}" | tr ' ' '\n' | grep -q "${DYN_DNS_SD}" ; then
+                    logMessage "Prepending '${DYN_DNS_SD}' to search domains '${CUR_DNS_SD}' because the search domains were not set manually and 'Prepend domain name to search domains' was selected"
+                    readonly TMP_DNS_SD="$( trim "${DYN_DNS_SD}" "${CUR_DNS_SD}" )"
+                else
+                    logMessage "Not prepending '${DYN_DNS_SD}' to search domains '${CUR_DNS_SD}' because it is already there"
+                    readonly TMP_DNS_SD="${CUR_DNS_SD}"
+                fi
+            else
+				readonly TMP_DNS_SD="${CUR_DNS_SD}"
+			fi
+			if [ "${FIN_DNS_DN}" != "" -a  "${FIN_DNS_DN}" != "localdomain" ] ; then
+                if ! echo "${TMP_DNS_SD}" | tr ' ' '\n' | grep -q "${FIN_DNS_DN}" ; then
+                    logMessage "Prepending '${FIN_DNS_DN}' to search domains '${TMP_DNS_SD}' because the search domains were not set manually and 'Prepend domain name to search domains' was selected"
+                    readonly FIN_DNS_SD="$( trim "${FIN_DNS_DN}" "${TMP_DNS_SD}" )"
+                else
+                    logMessage "Not prepending '${FIN_DNS_DN}' to search domains '${TMP_DNS_SD}' because it is already there"
+                    readonly FIN_DNS_SD="${TMP_DNS_SD}"
+                fi
+            else
+				readonly FIN_DNS_SD="${TMP_DNS_SD}"
+			fi
+		else
+			if [ "${DYN_DNS_SD}" != "" ] ; then
+				logMessage "WARNING: Not prepending '${DYN_DNS_SD}' to search domains '${CUR_DNS_SD}' because the search domains were set manually"
+			fi
+            if [ "${FIN_DNS_DN}" != "" ] ; then
+                logMessage "WARNING: Not prepending domain '${FIN_DNS_DN}' to search domains '${CUR_DNS_SD}' because the search domains were set manually"
+            fi
+			readonly FIN_DNS_SD="${CUR_DNS_SD}"
+		fi
+	else
+		if [ "${DYN_DNS_SD}" != "" ] ; then
+			if [ "${MAN_DNS_SD}" = "" ] ; then
+				logMessage "Prepending '${DYN_DNS_SD}' to search domains '${CUR_DNS_SD}' because the search domains were not set manually but were set via OpenVPN and 'Prepend domain name to search domains' was not selected"
+				readonly FIN_DNS_SD="$( trim "${DYN_DNS_SD}" "${CUR_DNS_SD}" )"
+            else
+                logMessage "WARNING: Not prepending '${DYN_DNS_SD}' to search domains '${CUR_DNS_SD}' because the search domains were set manually"
+                readonly FIN_DNS_SD="${CUR_DNS_SD}"
+			fi
+		else
+            if [ "${FIN_DNS_DN}" != "" -a "${FIN_DNS_DN}" != "localdomain" ] ; then
+                case "${OSVER}" in
+                    10.4 | 10.5 )
+                        if ! echo "${MAN_DNS_SD}" | tr ' ' '\n' | grep -q "${FIN_DNS_DN}" ; then
+                            logMessage "Appending '${FIN_DNS_DN}' to search domains '${CUR_DNS_SD}' that were set manually because running under OS X 10.4 or 10.5 and 'Prepend domain name to search domains' was not selected"
+                            readonly FIN_DNS_SD="$( trim "${MAN_DNS_SD}" "${FIN_DNS_DN}" )"
+                        else
+                            logMessage "Not appending '${FIN_DNS_DN}' to search domains '${CUR_DNS_SD}' because it is already in the search domains that were set manually and 'Prepend domain name to search domains' was not selected"
+                            readonly FIN_DNS_SD="${CUR_DNS_SD}"
+                        fi
+                        ;;
+                    * )
+                        if [ "${MAN_DNS_SD}" = "" ] ; then
+                            logMessage "Setting search domains to '${FIN_DNS_DN}' because running under OS X 10.6 or higher and the search domains were not set manually and 'Prepend domain name to search domains' was not selected"
+                            readonly FIN_DNS_SD="${FIN_DNS_DN}"
+                        else
+                            logMessage "Not replacing search domains '${CUR_DNS_SD}' with '${FIN_DNS_DN}' because the search domains were set manually and 'Prepend domain name to search domains' was not selected"
+                            readonly FIN_DNS_SD="${CUR_DNS_SD}"
+                        fi
+                        ;;
+                esac
+            else
+                readonly FIN_DNS_SD="${CUR_DNS_SD}"
+            fi
+		fi
+	fi
+		
+	logDebugMessage "DEBUG:"
+	logDebugMessage "DEBUG: FIN_DNS_DN = ${FIN_DNS_DN}; FIN_DNS_SA = ${FIN_DNS_SA}; FIN_DNS_SD = ${FIN_DNS_SD}"
+	logDebugMessage "DEBUG: FIN_SMB_NN = ${FIN_SMB_NN}; FIN_SMB_WG = ${FIN_SMB_WG}; FIN_SMB_WA = ${FIN_SMB_WA}"
+
+# Set up SKP_... variables to inhibit scutil from making some changes
+	
+	# SKP_DNS_... and SKP_SMB_... are used to comment out individual items that are not being set
+	if [ "${FIN_DNS_DN}" = "" -o "${FIN_DNS_DN}" = "${CUR_DNS_DN}" ] ; then
+		SKP_DNS_DN="#"
+	else
+		SKP_DNS_DN=""
+	fi
+	if [ "${FIN_DNS_SA}" = "" -o "${FIN_DNS_SA}" = "${CUR_DNS_SA}" ] ; then
+		SKP_DNS_SA="#"
+	else
+		SKP_DNS_SA=""
+	fi
+	if [ "${FIN_DNS_SD}" = "" -o "${FIN_DNS_SD}" = "${CUR_DNS_SD}" ] ; then
+		SKP_DNS_SD="#"
+	else
+		SKP_DNS_SD=""
+	fi
+	if [ "${FIN_SMB_NN}" = "" -o "${FIN_SMB_NN}" = "${CUR_SMB_NN}" ] ; then
+		SKP_SMB_NN="#"
+	else
+		SKP_SMB_NN=""
+	fi
+	if [ "${FIN_SMB_WG}" = "" -o "${FIN_SMB_WG}" = "${CUR_SMB_WG}" ] ; then
+		SKP_SMB_WG="#"
+	else
+		SKP_SMB_WG=""
+	fi
+	if [ "${FIN_SMB_WA}" = "" -o "${FIN_SMB_WA}" = "${CUR_SMB_WA}" ] ; then
+		SKP_SMB_WA="#"
+	else
+		SKP_SMB_WA=""
+	fi
+	
+	# if any DNS items should be set, set all that have values
+	if [ "${SKP_DNS_DN}${SKP_DNS_SA}${SKP_DNS_SD}" = "###" ] ; then
+		readonly SKP_DNS="#"
+	else
+		readonly SKP_DNS=""
+		if [ "${FIN_DNS_DN}" != "" ] ; then
+			SKP_DNS_DN=""
+		fi
+		if [ "${FIN_DNS_SA}" != "" ] ; then
+			SKP_DNS_SA=""
+		fi
+		if [ "${FIN_DNS_SD}" != "" ] ; then
+			SKP_DNS_SD=""
+		fi
+	fi
+
+	# if any SMB items should be set, set all that have values
+	if [ "${SKP_SMB_NN}${SKP_SMB_WG}${SKP_SMB_WA}" = "###" ] ; then
+		readonly SKP_SMB="#"
+	else
+		readonly SKP_SMB=""
+		if [ "${FIN_SMB_NN}" != "" ] ; then
+			SKP_SMB_NN=""
+		fi
+		if [ "${FIN_SMB_WG}" != "" ] ; then
+			SKP_SMB_WG=""
+		fi
+		if [ "${FIN_SMB_WA}" != "" ] ; then
+			SKP_SMB_WA=""
+		fi
+	fi
+
+	readonly SKP_DNS_SA SKP_DNS_SD SKP_DNS_DN
+	readonly SKP_SMB_NN SKP_SMB_WG SKP_SMB_WA
+	
+# special-case fiddling:
+	
+	# in 10.8 and higher, ServerAddresses and SearchDomains must be set via the Setup: key in addition to the State: key
+	# in 10.7 if ServerAddresses or SearchDomains are manually set, ServerAddresses and SearchDomains must be similarly set with the Setup: key in addition to the State: key
+	#
+	# we pass a flag indicating whether we've done that to the other scripts in 'bAlsoUsingSetupKeys'
+
+	case "${OSVER}" in
+		10.4 | 10.5 | 10.6 )
+			logDebugMessage "DEBUG: OS X 10.4-10.6, so will modify settings using only State:"
+			readonly SKP_SETUP_DNS="#"
+			readonly bAlsoUsingSetupKeys="false"
+			;;
+		10.7 )
+			if [ "${MAN_DNS_SA}" = "" -a  "${MAN_DNS_SD}" = "" ] ; then
+				logDebugMessage "DEBUG: OS X 10.7 and neither ServerAddresses nor SearchDomains were set manually, so will modify DNS settings using only State:"
+				readonly SKP_SETUP_DNS="#"
+				readonly bAlsoUsingSetupKeys="false"
+			else
+				logDebugMessage "DEBUG: OS X 10.7 and ServerAddresses or SearchDomains were set manually, so will modify DNS settings using Setup: in addition to State:"
+				readonly SKP_SETUP_DNS=""
+				readonly bAlsoUsingSetupKeys="true"
+			fi
+			;;
+		* )
+			logDebugMessage "DEBUG: OS X 10.8 or higher, so will modify DNS settings using Setup: in addition to State:"
+			readonly SKP_SETUP_DNS=""
+			readonly bAlsoUsingSetupKeys="true"
+			;;
+	esac
+	
+	logDebugMessage "DEBUG:"
+	logDebugMessage "DEBUG: SKP_DNS = ${SKP_DNS}; SKP_DNS_SA = ${SKP_DNS_SA}; SKP_DNS_SD = ${SKP_DNS_SD}; SKP_DNS_DN = ${SKP_DNS_DN}"
+	logDebugMessage "DEBUG: SKP_SETUP_DNS = ${SKP_SETUP_DNS}"
+	logDebugMessage "DEBUG: SKP_SMB = ${SKP_SMB}; SKP_SMB_NN = ${SKP_SMB_NN}; SKP_SMB_WG = ${SKP_SMB_WG}; SKP_SMB_WA = ${SKP_SMB_WA}"
+
+    set +e # "grep" will return error status (1) if no matches are found, so don't fail if not found
+    original_resolver_contents="$( grep -v '#' < /etc/resolv.conf )"
+    set -e # resume abort on error
+    logDebugMessage "DEBUG:"
+    logDebugMessage "DEBUG: /etc/resolve = ${original_resolver_contents}"
+    logDebugMessage "DEBUG:"
+
+	set +e # scutil --dns will return error status in case dns is already down, so don't fail if no dns found
+	scutil_dns="$( scutil --dns)"
+	set -e # resume abort on error
+	logDebugMessage "DEBUG:"
+	logDebugMessage "DEBUG: scutil --dns BEFORE CHANGES = ${scutil_dns}"
+	logDebugMessage "DEBUG:"
+
+	logDebugMessage "DEBUG:"
+	logDebugMessage "DEBUG: Configuration changes:"
+	logDebugMessage "DEBUG: ${SKP_DNS}${SKP_DNS_SA}ADD State: ServerAddresses  ${FIN_DNS_SA}"
+	logDebugMessage "DEBUG: ${SKP_DNS}${SKP_DNS_SD}ADD State: SearchDomains    ${FIN_DNS_SD}"
+	logDebugMessage "DEBUG: ${SKP_DNS}${SKP_DNS_DN}ADD State: DomainName       ${FIN_DNS_DN}"
+	logDebugMessage "DEBUG:"
+	logDebugMessage "DEBUG: ${SKP_SETUP_DNS}${SKP_DNS}${SKP_DNS_SA}ADD Setup: ServerAddresses  ${FIN_DNS_SA}"
+	logDebugMessage "DEBUG: ${SKP_SETUP_DNS}${SKP_DNS}${SKP_DNS_SD}ADD Setup: SearchDomains    ${FIN_DNS_SD}"
+	logDebugMessage "DEBUG: ${SKP_SETUP_DNS}${SKP_DNS}${SKP_DNS_DN}ADD Setup: DomainName       ${FIN_DNS_DN}"
+	logDebugMessage "DEBUG:"
+	logDebugMessage "DEBUG: ${SKP_SMB}${SKP_SMB_NN}ADD State: NetBIOSName    ${FIN_SMB_NN}"
+	logDebugMessage "DEBUG: ${SKP_SMB}${SKP_SMB_WG}ADD State: Workgroup      ${FIN_SMB_WG}"
+	logDebugMessage "DEBUG: ${SKP_SMB}${SKP_SMB_WA}ADD State: WINSAddresses  ${FIN_SMB_WA}"
+
+	# Save the openvpn process ID and the Network Primary Service ID, leasewather.plist path, logfile path, and optional arguments from Bitmask,
+	# then save old and new DNS and SMB settings
+	# PPID is a script variable (defined by bash itself) that contains the process ID of the parent of the process running the script (i.e., OpenVPN's process ID)
+	# config is an environmental variable set to the configuration path by OpenVPN prior to running this up script
+
+	scutil <<-EOF > /dev/null
+		open
+
+		# Store our variables for the other scripts (leasewatch, down, etc.) to use
+		d.init
+		# The '#' in the next line does NOT start a comment; it indicates to scutil that a number follows it (as opposed to a string or an array)
+		d.add PID # ${PPID}
+		d.add Service ${PSID}
+		d.add LeaseWatcherPlistPath "${LEASEWATCHER_PLIST_PATH}"
+		d.add RemoveLeaseWatcherPlist "${REMOVE_LEASEWATCHER_PLIST}"
+		d.add ScriptLogFile         "${SCRIPT_LOG_FILE}"
+		d.add MonitorNetwork        "${ARG_MONITOR_NETWORK_CONFIGURATION}"
+		d.add RestoreOnDNSReset     "${ARG_RESTORE_ON_DNS_RESET}"
+		d.add RestoreOnWINSReset    "${ARG_RESTORE_ON_WINS_RESET}"
+		d.add IgnoreOptionFlags     "${ARG_IGNORE_OPTION_FLAGS}"
+        d.add IsTapInterface        "${ARG_TAP}"
+        d.add FlushDNSCache         "${ARG_FLUSH_DNS_CACHE}"
+        d.add ResetPrimaryInterface "${ARG_RESET_PRIMARY_INTERFACE_ON_DISCONNECT}"
+        d.add RouteGatewayIsDhcp    "${bRouteGatewayIsDhcp}"
+		d.add bAlsoUsingSetupKeys   "${bAlsoUsingSetupKeys}"
+        d.add TapDeviceHasBeenSetNone "false"
+        d.add TunnelDevice          "$dev"
+        d.add RestoreIpv6Services   "$ipv6_disabled_services_encoded"
+		set State:/Network/OpenVPN
+		
+		# Back up the device's current DNS and SMB configurations,
+		# Indicate 'no such key' by a dictionary with a single entry: "BitmaskNoSuchKey : true"
+		# If there isn't a key, "BitmaskNoSuchKey : true" won't be removed.
+		# If there is a key, "BitmaskNoSuchKey : true" will be removed and the key's contents will be used
+		
+		d.init
+		d.add BitmaskNoSuchKey true
+		get State:/Network/Service/${PSID}/DNS
+		set State:/Network/OpenVPN/OldDNS
+		
+		d.init
+		d.add BitmaskNoSuchKey true
+		get Setup:/Network/Service/${PSID}/DNS
+		set State:/Network/OpenVPN/OldDNSSetup
+		
+		d.init
+		d.add BitmaskNoSuchKey true
+		get State:/Network/Service/${PSID}/SMB
+		set State:/Network/OpenVPN/OldSMB
+		
+		# Initialize the new DNS map via State:
+		${SKP_DNS}d.init
+		${SKP_DNS}${SKP_DNS_SA}d.add ServerAddresses * ${FIN_DNS_SA}
+		${SKP_DNS}${SKP_DNS_SD}d.add SearchDomains   * ${FIN_DNS_SD}
+		${SKP_DNS}${SKP_DNS_DN}d.add DomainName        ${FIN_DNS_DN}
+		${SKP_DNS}set State:/Network/Service/${PSID}/DNS
+
+		# If necessary, initialize the new DNS map via Setup: also
+		${SKP_SETUP_DNS}${SKP_DNS}d.init
+		${SKP_SETUP_DNS}${SKP_DNS}${SKP_DNS_SA}d.add ServerAddresses * ${FIN_DNS_SA}
+		${SKP_SETUP_DNS}${SKP_DNS}${SKP_DNS_SD}d.add SearchDomains   * ${FIN_DNS_SD}
+		${SKP_SETUP_DNS}${SKP_DNS}${SKP_DNS_DN}d.add DomainName        ${FIN_DNS_DN}
+		${SKP_SETUP_DNS}${SKP_DNS}set Setup:/Network/Service/${PSID}/DNS
+
+		# Initialize the SMB map
+		${SKP_SMB}d.init
+		${SKP_SMB}${SKP_SMB_NN}d.add NetBIOSName     ${FIN_SMB_NN}
+		${SKP_SMB}${SKP_SMB_WG}d.add Workgroup       ${FIN_SMB_WG}
+		${SKP_SMB}${SKP_SMB_WA}d.add WINSAddresses * ${FIN_SMB_WA}
+		${SKP_SMB}set State:/Network/Service/${PSID}/SMB
+
+		quit
+EOF
+
+	logDebugMessage "DEBUG:"
+	logDebugMessage "DEBUG: Pause for configuration changes to be propagated to State:/Network/Global/DNS and .../SMB"
+	sleep 1
+	
+	scutil <<-EOF > /dev/null
+		open
+
+		# Initialize the maps that will be compared when a configuration change occurs
+		d.init
+		d.add BitmaskNoSuchKey true
+		get State:/Network/Global/DNS
+		set State:/Network/OpenVPN/DNS
+		
+		d.init
+		d.add BitmaskNoSuchKey true
+		get State:/Network/Global/SMB
+		set State:/Network/OpenVPN/SMB
+		
+		quit
+EOF
+	
+	readonly NEW_DNS_SETUP_CONFIG="$( scutil <<-EOF |
+		open
+		show Setup:/Network/Service/${PSID}/DNS
+		quit
+EOF
+sed -e 's/^[[:space:]]*[[:digit:]]* : //g' | tr '\n' ' '
+)"
+	readonly NEW_SMB_SETUP_CONFIG="$( scutil <<-EOF |
+		open
+		show Setup:/Network/Service/${PSID}/SMB
+		quit
+EOF
+sed -e 's/^[[:space:]]*[[:digit:]]* : //g' | tr '\n' ' '
+)"
+	readonly NEW_DNS_STATE_CONFIG="$( scutil <<-EOF |
+		open
+		show State:/Network/Service/${PSID}/DNS
+		quit
+EOF
+sed -e 's/^[[:space:]]*[[:digit:]]* : //g' | tr '\n' ' '
+)"
+	readonly NEW_SMB_STATE_CONFIG="$( scutil <<-EOF |
+		open
+		show State:/Network/Service/${PSID}/SMB
+		quit
+EOF
+sed -e 's/^[[:space:]]*[[:digit:]]* : //g' | tr '\n' ' '
+)"
+	readonly NEW_DNS_GLOBAL_CONFIG="$( scutil <<-EOF |
+		open
+		show State:/Network/Global/DNS
+		quit
+EOF
+sed -e 's/^[[:space:]]*[[:digit:]]* : //g' | tr '\n' ' '
+)"
+	readonly NEW_SMB_GLOBAL_CONFIG="$( scutil <<-EOF |
+		open
+		show State:/Network/Global/SMB
+		quit
+EOF
+sed -e 's/^[[:space:]]*[[:digit:]]* : //g' | tr '\n' ' '
+)"
+	readonly EXPECTED_NEW_DNS_GLOBAL_CONFIG="$( scutil <<-EOF |
+		open
+		show State:/Network/OpenVPN/DNS
+		quit
+EOF
+sed -e 's/^[[:space:]]*[[:digit:]]* : //g' | tr '\n' ' '
+)"
+	readonly EXPECTED_NEW_SMB_GLOBAL_CONFIG="$( scutil <<-EOF |
+		open
+		show State:/Network/OpenVPN/SMB
+		quit
+EOF
+sed -e 's/^[[:space:]]*[[:digit:]]* : //g' | tr '\n' ' '
+)"
+
+
+	logDebugMessage "DEBUG:"
+	logDebugMessage "DEBUG: Configurations as read back after changes:"
+	logDebugMessage "DEBUG: State:/.../DNS = ${NEW_DNS_STATE_CONFIG}"
+	logDebugMessage "DEBUG: State:/.../SMB = ${NEW_SMB_STATE_CONFIG}"
+	logDebugMessage "DEBUG:"
+	logDebugMessage "DEBUG: Setup:/.../DNS = ${NEW_DNS_SETUP_CONFIG}"
+	logDebugMessage "DEBUG: Setup:/.../SMB = ${NEW_SMB_SETUP_CONFIG}"
+	logDebugMessage "DEBUG:"
+    logDebugMessage "DEBUG: State:/Network/Global/DNS = ${NEW_DNS_GLOBAL_CONFIG}"
+    logDebugMessage "DEBUG: State:/Network/Global/SMB = ${NEW_SMB_GLOBAL_CONFIG}"
+	logDebugMessage "DEBUG:"
+	logDebugMessage "DEBUG: Expected by process-network-changes:"
+    logDebugMessage "DEBUG: State:/Network/OpenVPN/DNS = ${EXPECTED_NEW_DNS_GLOBAL_CONFIG}"
+    logDebugMessage "DEBUG: State:/Network/OpenVPN/SMB = ${EXPECTED_NEW_SMB_GLOBAL_CONFIG}"
+
+    set +e # "grep" will return error status (1) if no matches are found, so don't fail if not found
+    new_resolver_contents="$( grep -v '#' < /etc/resolv.conf )"
+    set -e # resume abort on error
+    logDebugMessage "DEBUG:"
+    logDebugMessage "DEBUG: /etc/resolve = ${new_resolver_contents}"
+    logDebugMessage "DEBUG:"
+
+	set +e # scutil --dns will return error status in case dns is already down, so don't fail if no dns found
+	scutil_dns="$( scutil --dns )"
+	set -e # resume abort on error
+	logDebugMessage "DEBUG:"
+	logDebugMessage "DEBUG: scutil --dns AFTER CHANGES = ${scutil_dns}"
+	logDebugMessage "DEBUG:"
+	
+	logMessage "Saved the DNS and SMB configurations so they can be restored"
+	
+    logChange "${SKP_DNS}${SKP_DNS_SA}" "DNS ServerAddresses"   "${FIN_DNS_SA}"   "${CUR_DNS_SA}"
+    logChange "${SKP_DNS}${SKP_DNS_SD}" "DNS SearchDomains"     "${FIN_DNS_SD}"   "${CUR_DNS_SD}"
+    logChange "${SKP_DNS}${SKP_DNS_DN}" "DNS DomainName"        "${FIN_DNS_DN}"   "${CUR_DNS_DN}"
+    logChange "${SKP_SMB}${SKP_SMB_NN}" "SMB NetBIOSName"       "${FIN_SMB_SA}"   "${CUR_SMB_SA}"
+    logChange "${SKP_SMB}${SKP_SMB_WG}" "SMB Workgroup"         "${FIN_SMB_WG}"   "${CUR_SMB_WG}"
+    logChange "${SKP_SMB}${SKP_SMB_WA}" "SMB WINSAddresses"     "${FIN_SMB_WA}"   "${CUR_SMB_WA}"
+
+	logDnsInfo "${MAN_DNS_SA}" "${FIN_DNS_SA}"
+	
+	flushDNSCache
+
+	if ${ARG_MONITOR_NETWORK_CONFIGURATION} ; then
+        if [ "${ARG_IGNORE_OPTION_FLAGS:0:2}" = "-p" ] ; then
+            logMessage "Setting up to monitor system configuration with process-network-changes"
+        else
+            logMessage "Setting up to monitor system configuration with leasewatch"
+        fi
+        if [ "${LEASEWATCHER_TEMPLATE_PATH}" != "" ] ; then
+            sed -e "s|/Applications/Bitmask/.app/Contents/Resources|${TB_RESOURCES_PATH}|g" "${LEASEWATCHER_TEMPLATE_PATH}" > "${LEASEWATCHER_PLIST_PATH}"
+		fi
+        launchctl load "${LEASEWATCHER_PLIST_PATH}"
+	fi
+}
+
+##########################################################################################
+# Used for TAP device which does DHCP
+configureDhcpDns()
+{
+	# whilst ipconfig will have created the neccessary Network Service keys, the DNS
+	# settings won't actually be used by OS X unless the SupplementalMatchDomains key
+	# is added
+	# ref. <http://lists.apple.com/archives/Macnetworkprog/2005/Jun/msg00011.html>
+	# - is there a way to extract the domains from the SC dictionary and re-insert
+	#   as SupplementalMatchDomains? i.e. not requiring the ipconfig domain_name call?
+	
+	# - wait until we get a lease before extracting the DNS domain name and merging into SC
+	# - despite it's name, ipconfig waitall doesn't (but maybe one day it will :-)
+	logDebugMessage "DEBUG: About to 'ipconfig waitall'"
+	ipconfig waitall
+	logDebugMessage "DEBUG: Completed 'ipconfig waitall'"
+	
+	unset test_domain_name
+	unset test_name_server
+	
+	set +e # We instruct bash NOT to exit on individual command errors, because if we need to wait longer these commands will fail
+	
+	# usually takes at least a few seconds to get a DHCP lease
+	sleep 3
+	n=0
+	while [ -z "$test_domain_name" -a -z "$test_name_server" -a $n -lt 5 ]
+	do
+		logMessage "Sleeping for $n seconds to wait for DHCP to finish setup."
+		sleep $n
+		n="$( expr $n + 1 )"
+		
+		if [ -z "$test_domain_name" ]; then
+			test_domain_name="$( ipconfig getoption "$dev" domain_name 2>/dev/null )"
+		fi
+		
+		if [ -z "$test_name_server" ]; then
+			test_name_server="$( ipconfig getoption "$dev" domain_name_server 2>/dev/null )"
+		fi
+	done
+
+    logDebugMessage "DEBUG: Finished waiting for DHCP lease: test_domain_name = '$test_domain_name', test_name_server = '$test_name_server'"
+    
+    logDebugMessage "DEBUG: About to 'ipconfig getpacket $dev'"
+	sGetPacketOutput="$( ipconfig getpacket "$dev" )"
+    logDebugMessage "DEBUG: Completed 'ipconfig getpacket $dev'; sGetPacketOutput = $sGetPacketOutput"
+
+	set -e # We instruct bash that it CAN again fail on individual errors
+	
+	unset aNameServers
+	unset aWinsServers
+	unset aSearchDomains
+	
+	nNameServerIndex=1
+	nWinsServerIndex=1
+	nSearchDomainIndex=1
+	
+	if [ "$sGetPacketOutput" ]; then
+		sGetPacketOutput_FirstLine="$( echo "$sGetPacketOutput" | head -n 1 )"
+		logDebugMessage "DEBUG: sGetPacketOutput_FirstLine = $sGetPacketOutput_FirstLine"
+		
+		if [ "$sGetPacketOutput_FirstLine" == "op = BOOTREPLY" ]; then
+			set +e # "grep" will return error status (1) if no matches are found, so don't fail on individual errors
+			
+			for tNameServer in $( echo "$sGetPacketOutput" | grep "domain_name_server" | grep -Eo "\{([0-9\.]+)(, [0-9\.]+)*\}" | grep -Eo "([0-9\.]+)" ); do
+				aNameServers[nNameServerIndex-1]="$( trim "$tNameServer" )"
+				let nNameServerIndex++
+			done
+			
+			for tWINSServer in $( echo "$sGetPacketOutput" | grep "nb_over_tcpip_name_server" | grep -Eo "\{([0-9\.]+)(, [0-9\.]+)*\}" | grep -Eo "([0-9\.]+)" ); do
+				aWinsServers[nWinsServerIndex-1]="$( trim "$tWINSServer" )"
+				let nWinsServerIndex++
+			done
+			
+			for tSearchDomain in $( echo "$sGetPacketOutput" | grep "search_domain" | grep -Eo "\{([-A-Za-z0-9\-\.]+)(, [-A-Za-z0-9\-\.]+)*\}" | grep -Eo "([-A-Za-z0-9\-\.]+)" ); do
+				aSearchDomains[nSearchDomainIndex-1]="$( trim "$tSearchDomain" )"
+				let nSearchDomainIndex++
+			done
+			
+			sDomainName="$( echo "$sGetPacketOutput" | grep "domain_name " | grep -Eo ": [-A-Za-z0-9\-\.]+" | grep -Eo "[-A-Za-z0-9\-\.]+" )"
+			sDomainName="$( trim "$sDomainName" )"
+			
+			if [ ${#aNameServers[*]} -gt 0 -a "$sDomainName" ]; then
+				logMessage "Retrieved from DHCP/BOOTP packet: name server(s) [ ${aNameServers[@]} ], domain name [ $sDomainName ], search domain(s) [ ${aSearchDomains[@]} ] and SMB server(s) [ ${aWinsServers[@]} ]"
+				setDnsServersAndDomainName aNameServers[@] "$sDomainName" aWinsServers[@] aSearchDomains[@]
+				return 0
+			elif [ ${#aNameServers[*]} -gt 0 ]; then
+				logMessage "Retrieved from DHCP/BOOTP packet: name server(s) [ ${aNameServers[@]} ], search domain(s) [ ${aSearchDomains[@]} ] and SMB server(s) [ ${aWinsServers[@]} ] and using default domain name [ $DEFAULT_DOMAIN_NAME ]"
+				setDnsServersAndDomainName aNameServers[@] "$DEFAULT_DOMAIN_NAME" aWinsServers[@] aSearchDomains[@]
+				return 0
+			else
+				# Should we return 1 here and indicate an error, or attempt the old method?
+				logMessage "No useful information extracted from DHCP/BOOTP packet. Attempting legacy configuration."
+			fi
+			
+			set -e # We instruct bash that it CAN again fail on errors
+		else
+			# Should we return 1 here and indicate an error, or attempt the old method?
+			logMessage "No DHCP/BOOTP packet found on interface. Attempting legacy configuration."
+		fi
+	fi
+	
+	unset sDomainName
+	unset sNameServer
+	unset aNameServers
+	
+    set +e # We instruct bash NOT to exit on individual command errors, because if we need to wait longer these commands will fail
+	
+	logDebugMessage "DEBUG: About to 'ipconfig getoption $dev domain_name'"
+	sDomainName="$( ipconfig getoption "$dev" domain_name 2>/dev/null )"
+	logDebugMessage "DEBUG: Completed 'ipconfig getoption $dev domain_name'"
+	logDebugMessage "DEBUG: About to 'ipconfig getoption $dev domain_name_server'"
+	sNameServer="$( ipconfig getoption "$dev" domain_name_server 2>/dev/null )"
+	logDebugMessage "DEBUG: Completed 'ipconfig getoption $dev domain_name_server'"
+    
+	set -e # We instruct bash that it CAN again fail on individual errors
+
+	sDomainName="$( trim "$sDomainName" )"
+	sNameServer="$( trim "$sNameServer" )"
+	
+	declare -a aWinsServers=( )   # Declare empty WINSServers   array to avoid any useless error messages
+	declare -a aSearchDomains=( ) # Declare empty SearchDomains array to avoid any useless error messages
+	
+	if [ "$sDomainName" -a "$sNameServer" ]; then
+		aNameServers[0]=$sNameServer
+		logMessage "Retrieved OpenVPN (DHCP): name server [ $sNameServer ], domain name [ $sDomainName ], and no SMB servers or search domains"
+		setDnsServersAndDomainName aNameServers[@] "$sDomainName" aWinsServers[@] aSearchDomains[@]
+	elif [ "$sNameServer" ]; then
+		aNameServers[0]=$sNameServer
+		logMessage "Retrieved OpenVPN (DHCP): name server [ $sNameServer ] and no SMB servers or search domains, and using default domain name [ $DEFAULT_DOMAIN_NAME ]"
+		setDnsServersAndDomainName aNameServers[@] "$DEFAULT_DOMAIN_NAME" aWinsServers[@] aSearchDomains[@]
+	elif [ "$sDomainName" ]; then
+		logMessage "WARNING: Retrieved domain name [ $sDomainName ] but no name servers from OpenVPN via DHCP, which is not sufficient to make network/DNS configuration changes."
+		if ${ARG_MONITOR_NETWORK_CONFIGURATION} ; then
+			logMessage "WARNING: Will NOT monitor for other network configuration changes."
+		fi
+        logDnsInfoNoChanges
+        flushDNSCache
+	else
+		logMessage "WARNING: No DNS information received from OpenVPN via DHCP, so no network/DNS configuration changes need to be made."
+		if ${ARG_MONITOR_NETWORK_CONFIGURATION} ; then
+			logMessage "WARNING: Will NOT monitor for other network configuration changes."
+		fi
+        logDnsInfoNoChanges
+        flushDNSCache
+	fi
+
+	return 0
+}
+
+##########################################################################################
+# Configures using OpenVPN foreign_option_* instead of DHCP
+
+configureOpenVpnDns()
+{
+# Description of foreign_option_ parameters (from OpenVPN 2.3-alpha_2 man page):
+#
+# DOMAIN name -- Set Connection-specific DNS Suffix.
+#
+# DOMAIN-SEARCH name -- Set Connection-specific DNS Search Address. Repeat this option to
+#               set additional search domains. (Bitmask-specific addition.)
+#
+# DNS addr -- Set primary domain name server address.  Repeat  this  option  to  set
+#              secondary DNS server addresses.
+#
+# WINS  addr  --  Set primary WINS server address (NetBIOS over TCP/IP Name Server).
+#              Repeat this option to set secondary WINS server addresses.
+#
+# NBDD addr -- Set primary NBDD server address (NetBIOS over TCP/IP Datagram Distribution Server)
+#              Repeat this option to set secondary NBDD server addresses.
+#
+# NTP  addr  -- Set primary NTP server address (Network Time Protocol).  Repeat this option
+#              to set secondary NTP server addresses.
+#
+# NBT type -- Set NetBIOS over TCP/IP Node  type.   Possible  options:  1  =  b-node
+#              (broadcasts),  2  =  p-node (point-to-point name queries to a WINS server), 4 = m-
+#              node (broadcast then query name server), and 8 = h-node (query name  server,  then
+#              broadcast).
+#
+# NBS  scope-id  --  Set  NetBIOS  over TCP/IP Scope. A NetBIOS Scope ID provides an
+#              extended naming service for the NetBIOS over TCP/IP (Known  as  NBT)  module.  The
+#              primary  purpose  of  a NetBIOS scope ID is to isolate NetBIOS traffic on a single
+#              network to only those nodes with the same NetBIOS scope ID.  The NetBIOS scope  ID
+#              is  a  character string that is appended to the NetBIOS name. The NetBIOS scope ID
+#              on two hosts must match, or the two hosts will not be  able  to  communicate.  The
+#              NetBIOS Scope ID also allows computers to use the same computer name, as they have
+#              different scope IDs. The Scope ID becomes a part of the NetBIOS name,  making  the
+#              name unique.  (This description of NetBIOS scopes courtesy of NeonSurge@abyss.com)
+#
+#DISABLE-NBT -- Disable Netbios-over-TCP/IP.
+
+	unset vForOptions
+	unset vOptions
+	unset aNameServers
+	unset aWinsServers
+	unset aSearchDomains
+	
+	nOptionIndex=1
+	nNameServerIndex=1
+	nWinsServerIndex=1
+	nSearchDomainIndex=1
+
+	while vForOptions=foreign_option_$nOptionIndex; [ -n "${!vForOptions}" ]; do
+		vOptions[nOptionIndex-1]=${!vForOptions}
+		case ${vOptions[nOptionIndex-1]} in
+			*DOMAIN-SEARCH*    )
+				aSearchDomains[nSearchDomainIndex-1]="$( trim "${vOptions[nOptionIndex-1]//dhcp-option DOMAIN-SEARCH /}" )"
+				let nSearchDomainIndex++
+				;;
+			*DOMAIN* )
+				sDomainName="$( trim "${vOptions[nOptionIndex-1]//dhcp-option DOMAIN /}" )"
+				;;
+			*DNS*    )
+				aNameServers[nNameServerIndex-1]="$( trim "${vOptions[nOptionIndex-1]//dhcp-option DNS /}" )"
+				let nNameServerIndex++
+				;;
+			*WINS*   )
+				aWinsServers[nWinsServerIndex-1]="$( trim "${vOptions[nOptionIndex-1]//dhcp-option WINS /}" )"
+				let nWinsServerIndex++
+				;;
+            *   )
+                logMessage "WARNING: 'foreign_option_${nOptionIndex}' = '${vOptions[nOptionIndex-1]}' ignored"
+                ;;
+		esac
+		let nOptionIndex++
+	done
+	
+	if [ ${#aNameServers[*]} -gt 0 -a "$sDomainName" ]; then
+		logMessage "Retrieved from OpenVPN: name server(s) [ ${aNameServers[@]} ], domain name [ $sDomainName ], search domain(s) [ ${aSearchDomains[@]} ], and SMB server(s) [ ${aWinsServers[@]} ]"
+		setDnsServersAndDomainName aNameServers[@] "$sDomainName" aWinsServers[@] aSearchDomains[@]
+	elif [ ${#aNameServers[*]} -gt 0 ]; then
+		logMessage "Retrieved from OpenVPN: name server(s) [ ${aNameServers[@]} ], search domain(s) [ ${aSearchDomains[@]} ] and SMB server(s) [ ${aWinsServers[@]} ] and using default domain name [ $DEFAULT_DOMAIN_NAME ]"
+		setDnsServersAndDomainName aNameServers[@] "$DEFAULT_DOMAIN_NAME" aWinsServers[@] aSearchDomains[@]
+	else
+		logMessage "WARNING: No DNS information received from OpenVPN, so no network configuration changes need to be made."
+		if ${ARG_MONITOR_NETWORK_CONFIGURATION} ; then
+			logMessage "WARNING: Will NOT monitor for other network configuration changes."
+		fi
+        logDnsInfoNoChanges
+        flushDNSCache
+	fi
+
+	return 0
+}
+
+##########################################################################################
+flushDNSCache()
+{
+    if ${ARG_FLUSH_DNS_CACHE} ; then
+	    if [ "${OSVER}" = "10.4" ] ; then
+
+			if [ -f /usr/sbin/lookupd ] ; then
+				set +e # we will catch errors from lookupd
+				/usr/sbin/lookupd -flushcache
+				if [ $? != 0 ] ; then
+					logMessage "WARNING: Unable to flush the DNS cache via lookupd"
+				else
+					logMessage "Flushed the DNS cache via lookupd"
+				fi
+				set -e # bash should again fail on errors
+			else
+				logMessage "WARNING: /usr/sbin/lookupd not present. Not flushing the DNS cache"
+			fi
+
+		else
+
+			if [ -f /usr/bin/dscacheutil ] ; then
+				set +e # we will catch errors from dscacheutil
+				/usr/bin/dscacheutil -flushcache
+				if [ $? != 0 ] ; then
+					logMessage "WARNING: Unable to flush the DNS cache via dscacheutil"
+				else
+					logMessage "Flushed the DNS cache via dscacheutil"
+				fi
+				set -e # bash should again fail on errors
+			else
+				logMessage "WARNING: /usr/bin/dscacheutil not present. Not flushing the DNS cache via dscacheutil"
+			fi
+			
+			if [ -f /usr/sbin/discoveryutil ] ; then
+				set +e # we will catch errors from discoveryutil
+				/usr/sbin/discoveryutil udnsflushcaches
+				if [ $? != 0 ] ; then
+					logMessage "WARNING: Unable to flush the DNS cache via discoveryutil udnsflushcaches"
+				else
+					logMessage "Flushed the DNS cache via discoveryutil udnsflushcaches"
+				fi
+				/usr/sbin/discoveryutil mdnsflushcache
+				if [ $? != 0 ] ; then
+					logMessage "WARNING: Unable to flush the DNS cache via discoveryutil mdnsflushcache"
+				else
+					logMessage "Flushed the DNS cache via discoveryutil mdnsflushcache"
+				fi
+				set -e # bash should again fail on errors
+			else
+				logMessage "/usr/sbin/discoveryutil not present. Not flushing the DNS cache via discoveryutil"
+			fi
+			
+			set +e # "grep" will return error status (1) if no matches are found, so don't fail on individual errors
+			hands_off_ps="$( ps -ax | grep HandsOffDaemon | grep -v grep.HandsOffDaemon )"
+			set -e # We instruct bash that it CAN again fail on errors
+			if [ "${hands_off_ps}" = "" ] ; then
+				if [ -f /usr/bin/killall ] ; then
+					set +e # ignore errors if mDNSResponder isn't currently running
+					/usr/bin/killall -HUP mDNSResponder
+					if [ $? != 0 ] ; then
+						logMessage "mDNSResponder not running. Not notifying it that the DNS cache was flushed"
+					else
+						logMessage "Notified mDNSResponder that the DNS cache was flushed"
+					fi
+					set -e # bash should again fail on errors
+				else
+					logMessage "WARNING: /usr/bin/killall not present. Not notifying mDNSResponder that the DNS cache was flushed"
+				fi
+			else
+				logMessage "WARNING: Hands Off is running.  Not notifying mDNSResponder that the DNS cache was flushed"
+			fi
+		
+		fi
+    fi
+}
+
+
+##########################################################################################
+# log information about the DNS settings
+# @param String Manual DNS_SA
+# @param String New DNS_SA
+logDnsInfo() {
+
+	log_dns_info_manual_dns_sa="$1"
+	log_dns_info_new_dns_sa="$2"
+	
+	if [ "${log_dns_info_manual_dns_sa}" != "" ] ; then
+        logMessage "DNS servers '${log_dns_info_manual_dns_sa}' were set manually"
+        if [ "${log_dns_info_manual_dns_sa}" != "${log_dns_info_new_dns_sa}" ] ; then
+            logMessage "WARNING: that setting is being ignored by OS X; '${log_dns_info_new_dns_sa}' is being used."
+        fi
+    fi
+
+    if [ "${log_dns_info_new_dns_sa}" != "" ] ; then
+        logMessage "DNS servers '${log_dns_info_new_dns_sa}' will be used for DNS queries when the VPN is active"
+		if [ "${log_dns_info_new_dns_sa}" == "127.0.0.1" ] ; then
+			logMessage "NOTE: DNS server 127.0.0.1 often is used inside virtual machines (e.g., 'VirtualBox', 'Parallels', or 'VMWare'). The actual VPN server may be specified by the host machine. This DNS server setting may cause DNS queries to fail or be intercepted or falsified. Specify only known public DNS servers or DNS servers located on the VPN network to avoid such problems."
+		else
+			set +e # "grep" will return error status (1) if no matches are found, so don't fail on individual errors
+			serversContainLoopback="$( echo "${log_dns_info_new_dns_sa}" | grep "127.0.0.1" )"
+			set -e # We instruct bash that it CAN again fail on errors
+			if [ "${serversContainLoopback}" != "" ] ; then
+				logMessage "NOTE: DNS server 127.0.0.1 often is used inside virtual machines (e.g., 'VirtualBox', 'Parallels', or 'VMWare'). The actual VPN server may be specified by the host machine. If used, 127.0.0.1 may cause DNS queries to fail or be intercepted or falsified. Specify only known public DNS servers or DNS servers located on the VPN network to avoid such problems."
+			else
+				readonly knownPublicDnsServers="$( cat "${FREE_PUBLIC_DNS_SERVERS_LIST_PATH}" )"
+				knownDnsServerNotFound="true"
+				unknownDnsServerFound="false"
+				for server in ${log_dns_info_new_dns_sa} ; do
+					set +e # "grep" will return error status (1) if no matches are found, so don't fail on individual errors
+					serverIsKnown="$( echo "${knownPublicDnsServers}" | grep "${server}" )"
+					set -e # We instruct bash that it CAN again fail on errors
+					if [ "${serverIsKnown}" != "" ] ; then
+						knownDnsServerNotFound="false"
+					else
+						unknownDnsServerFound="true"
+					fi
+				done
+				if ${knownDnsServerNotFound} ; then
+					logMessage "NOTE: The DNS servers do not include any free public DNS servers known to Bitmask. This may cause DNS queries to fail or be intercepted or falsified even if they are directed through the VPN. Specify only known public DNS servers or DNS servers located on the VPN network to avoid such problems."
+				else
+					if ${unknownDnsServerFound} ; then
+						logMessage "NOTE: The DNS servers include one or more free public DNS servers known to Bitmask and one or more DNS servers not known to Bitmask. If used, the DNS servers not known to Bitmask may cause DNS queries to fail or be intercepted or falsified even if they are directed through the VPN. Specify only known public DNS servers or DNS servers located on the VPN network to avoid such problems."
+					else
+						logMessage "The DNS servers include only free public DNS servers known to Bitmask."
+					fi
+				fi
+			fi
+		fi
+    else
+        logMessage "WARNING: There are no DNS servers in this computer's new network configuration. This computer or a DHCP server that this computer uses may be configured incorrectly."
+    fi
+}
+
+logDnsInfoNoChanges() {
+# log information about DNS settings if they are not changing
+
+    set +e # "grep" will return error status (1) if no matches are found, so don't fail on individual errors
+
+    PSID="$( scutil <<-EOF |
+        open
+        show State:/Network/Global/IPv4
+        quit
+EOF
+grep PrimaryService | sed -e 's/.*PrimaryService : //'
+)"
+
+    readonly LOGDNSINFO_MAN_DNS_CONFIG="$( scutil <<-EOF |
+        open
+        show Setup:/Network/Service/${PSID}/DNS
+        quit
+EOF
+sed -e 's/^[[:space:]]*[[:digit:]]* : //g' | tr '\n' ' '
+)"
+
+    readonly LOGDNSINFO_CUR_DNS_CONFIG="$( scutil <<-EOF |
+        open
+        show State:/Network/Global/DNS
+        quit
+EOF
+sed -e 's/^[[:space:]]*[[:digit:]]* : //g' | tr '\n' ' '
+)"
+
+	if echo "${LOGDNSINFO_MAN_DNS_CONFIG}" | grep -q "ServerAddresses" ; then
+		readonly LOGDNSINFO_MAN_DNS_SA="$( trim "$( echo "${LOGDNSINFO_MAN_DNS_CONFIG}" | sed -e 's/^.*ServerAddresses[^{]*{[[:space:]]*\([^}]*\)[[:space:]]*}.*$/\1/g' )" )"
+	else
+		readonly LOGDNSINFO_MAN_DNS_SA="";
+	fi
+
+	if echo "${LOGDNSINFO_CUR_DNS_CONFIG}" | grep -q "ServerAddresses" ; then
+		readonly LOGDNSINFO_CUR_DNS_SA="$( trim "$( echo "${LOGDNSINFO_CUR_DNS_CONFIG}" | sed -e 's/^.*ServerAddresses[^{]*{[[:space:]]*\([^}]*\)[[:space:]]*}.*$/\1/g' )" )"
+	else
+		readonly LOGDNSINFO_CUR_DNS_SA="";
+	fi
+
+    set -e # resume abort on error
+
+	logDnsInfo "${LOGDNSINFO_MAN_DNS_SA}" "${LOGDNSINFO_CUR_DNS_SA}"
+}
+
+##########################################################################################
+#
+# START OF SCRIPT
+#
+##########################################################################################
+
+trap "" TSTP
+trap "" HUP
+trap "" INT
+export PATH="/bin:/sbin:/usr/sbin:/usr/bin"
+
+readonly OUR_NAME="$( basename "${0}" )"
+
+logMessage "**********************************************"
+logMessage "Start of output from ${OUR_NAME}"
+
+# Process optional arguments (if any) for the script
+# Each one begins with a "-"
+# They come from Bitmask, and come first, before the OpenVPN arguments
+# So we set ARG_ script variables to their values and shift them out of the argument list
+# When we're done, only the OpenVPN arguments remain for the rest of the script to use
+ARG_TAP="false"
+ARG_WAIT_FOR_DHCP_IF_TAP="false"
+ARG_RESTORE_ON_DNS_RESET="false"
+ARG_FLUSH_DNS_CACHE="false"
+ARG_IGNORE_OPTION_FLAGS=""
+ARG_EXTRA_LOGGING="false"
+ARG_MONITOR_NETWORK_CONFIGURATION="false"
+ARG_DO_NO_USE_DEFAULT_DOMAIN="false"
+ARG_PREPEND_DOMAIN_NAME="false"
+ARG_RESET_PRIMARY_INTERFACE_ON_DISCONNECT="false"
+ARG_TB_PATH="/Applications/Bitmask.app"
+ARG_RESTORE_ON_WINS_RESET="false"
+ARG_DISABLE_IPV6_ON_TUN="false"
+ARG_ENABLE_IPV6_ON_TAP="false"
+
+# Handle the arguments we know about by setting ARG_ script variables to their values, then shift them out
+while [ {$#} ] ; do
+    if [ "$1" = "-6" ] ; then                       # -6 = ARG_ENABLE_IPV6_ON_TAP (for TAP connections only)
+        ARG_ENABLE_IPV6_ON_TAP="true"
+        shift
+    elif [ "$1" = "-9" ] ; then                     # -9 = ARG_DISABLE_IPV6_ON_TUN (for TUN connections only)
+        ARG_DISABLE_IPV6_ON_TUN="true"
+        shift
+	elif [ "$1" = "-a" ] ; then						# -a = ARG_TAP
+		ARG_TAP="true"
+		shift
+    elif [ "$1" = "-b" ] ; then                     # -b = ARG_WAIT_FOR_DHCP_IF_TAP
+        ARG_WAIT_FOR_DHCP_IF_TAP="true"
+        shift
+    elif [ "$1" = "-d" ] ; then                     # -d = ARG_RESTORE_ON_DNS_RESET
+        ARG_RESTORE_ON_DNS_RESET="true"
+        shift
+    elif [ "$1" = "-f" ] ; then                     # -f = ARG_FLUSH_DNS_CACHE
+        ARG_FLUSH_DNS_CACHE="true"
+        shift
+	elif [ "${1:0:2}" = "-i" ] ; then				# -i arguments are for leasewatcher
+		ARG_IGNORE_OPTION_FLAGS="${1}"
+		shift
+   elif [ "$1" = "-l" ] ; then                      # -l = ARG_EXTRA_LOGGING
+        ARG_EXTRA_LOGGING="true"
+        shift
+    elif [ "$1" = "-m" ] ; then                     # -m = ARG_MONITOR_NETWORK_CONFIGURATION
+		ARG_MONITOR_NETWORK_CONFIGURATION="true"
+		shift
+    elif [ "$1" = "-n" ] ; then                     # -n = ARG_DO_NO_USE_DEFAULT_DOMAIN
+        ARG_DO_NO_USE_DEFAULT_DOMAIN="true"
+        shift
+    elif [ "$1" = "-p" ] ; then                     # -p = ARG_PREPEND_DOMAIN_NAME
+		ARG_PREPEND_DOMAIN_NAME="true"
+		shift
+    elif [ "${1:0:2}" = "-p" ] ; then				# -p arguments are for process-network-changes
+		ARG_IGNORE_OPTION_FLAGS="${1}"
+		shift
+    elif [ "$1" = "-r" ] ; then                     # -r = ARG_RESET_PRIMARY_INTERFACE_ON_DISCONNECT
+        ARG_RESET_PRIMARY_INTERFACE_ON_DISCONNECT="true"
+        shift
+    elif [ "${1:0:2}" = "-t" ] ; then
+        ARG_TB_PATH="${1:2}"				        # -t path of Bitmask.app
+        shift
+    elif [ "$1" = "-w" ] ; then                     # -w = ARG_RESTORE_ON_WINS_RESET
+		ARG_RESTORE_ON_WINS_RESET="true"
+		shift
+	else
+		if [ "${1:0:1}" = "-" ] ; then				# Shift out Bitmask arguments (they start with "-") that we don't understand
+			shift									# so the rest of the script sees only the OpenVPN arguments
+		else
+			break
+		fi
+	fi
+done
+
+readonly ARG_MONITOR_NETWORK_CONFIGURATION ARG_RESTORE_ON_DNS_RESET ARG_RESTORE_ON_WINS_RESET ARG_TAP ARG_PREPEND_DOMAIN_NAME ARG_FLUSH_DNS_CACHE ARG_RESET_PRIMARY_INTERFACE_ON_DISCONNECT ARG_IGNORE_OPTION_FLAGS
+
+# Note: The script log path name is constructed from the path of the regular config file, not the shadow copy
+# if the config is shadow copy, e.g. /Library/Application Support/Bitmask/Users/Jonathan/Folder/Subfolder/config.ovpn
+# then convert to regular config     /Users/Jonathan/Library/Application Support/Bitmask/Configurations/Folder/Subfolder/config.ovpn
+#      to get the script log path
+# Note: "/Users/..." works even if the home directory has a different path; it is used in the name of the log file, and is not used as a path to get to anything.
+readonly TBALTPREFIX="/Library/Application Support/Bitmask/Users/"
+readonly TBALTPREFIXLEN="${#TBALTPREFIX}"
+readonly TBCONFIGSTART="${config:0:$TBALTPREFIXLEN}"
+if [ "$TBCONFIGSTART" = "$TBALTPREFIX" ] ; then
+	readonly TBBASE="${config:$TBALTPREFIXLEN}"
+	readonly TBSUFFIX="${TBBASE#*/}"
+	readonly TBUSERNAME="${TBBASE%%/*}"
+	readonly TBCONFIG="/Users/$TBUSERNAME/Library/Application Support/Bitmask/Configurations/$TBSUFFIX"
+else
+    readonly TBCONFIG="${config}"
+fi
+
+readonly CONFIG_PATH_DASHES_SLASHES="$( echo "${TBCONFIG}" | sed -e 's/-/--/g' | sed -e 's/\//-S/g' )"
+readonly SCRIPT_LOG_FILE="/Library/Application Support/Bitmask/Logs/${CONFIG_PATH_DASHES_SLASHES}.script.log"
+
+readonly TB_RESOURCES_PATH="${ARG_TB_PATH}/Contents/Resources"
+readonly FREE_PUBLIC_DNS_SERVERS_LIST_PATH="${TB_RESOURCES_PATH}/FreePublicDnsServersList.txt"
+
+# These scripts use a launchd .plist to set up to monitor the network configuration.
+#
+# If Bitmask.app is located in /Applications, we load the launchd .plist directly from within the .app.
+#
+# If Bitmask.app is not located in /Applications (i.e., we are debugging), we create a modified version of the launchd .plist and use
+# that modified copy in the 'launchctl load' command. (The modification is that the path to process-network-changes or leasewatch program
+# in the .plist is changed to point to the copy of the program that is inside the running Bitmask.)
+#
+# The variables involved in this are set up here:
+#
+#     LEASEWATCHER_PLIST_PATH    is the path of the .plist to use in the 'launchctl load' command
+#     LEASEWATCHER_TEMPLATE_PATH is an empty string if we load the .plist directly from within the .app,
+#                                or it is the path to the original .plist inside the .app which we copy and modify
+#     REMOVE_LEASEWATCHER_PLIST  is "true" if a modified .plist was used and should be deleted after it is unloaded
+#                                or "false' if the plist was loaded directly from the .app
+#
+#     LEASEWATCHER_PLIST_PATH and REMOVE_LEASEWATCHER_PLIST are passed to the other scripts via the scutil State:/Network/OpenVPN mechanism
+
+if [ "${ARG_IGNORE_OPTION_FLAGS:0:2}" = "-p" ] ; then
+    readonly LEASEWATCHER_PLIST="ProcessNetworkChanges.plist"
+else
+    readonly LEASEWATCHER_PLIST="LeaseWatch.plist"
+fi
+if [ "${ARG_TB_PATH}" = "/Applications/Bitmask.app" ] ; then
+    readonly LEASEWATCHER_PLIST_PATH="${TB_RESOURCES_PATH}/${LEASEWATCHER_PLIST}"
+    readonly LEASEWATCHER_TEMPLATE_PATH=""
+    readonly REMOVE_LEASEWATCHER_PLIST="false"
+else
+    readonly LEASEWATCHER_PLIST_PATH="/Library/Application Support/Bitmask/${LEASEWATCHER_PLIST}"
+    readonly LEASEWATCHER_TEMPLATE_PATH="${TB_RESOURCES_PATH}/${LEASEWATCHER_PLIST}"
+    readonly REMOVE_LEASEWATCHER_PLIST="true"
+fi
+
+set +e # "grep" will return error status (1) if no matches are found, so don't fail on individual errors
+readonly OSVER="$( sw_vers | grep 'ProductVersion:' | grep -o '10\.[0-9]*' )"
+set -e # We instruct bash that it CAN again fail on errors
+
+if ${ARG_DO_NO_USE_DEFAULT_DOMAIN} ; then
+    readonly DEFAULT_DOMAIN_NAME=""
+else
+    readonly DEFAULT_DOMAIN_NAME="openvpn"
+fi
+
+bRouteGatewayIsDhcp="false"
+
+# We sleep to allow time for OS X to process network settings
+sleep 2
+
+EXIT_CODE=0
+
+if ${ARG_TAP} ; then
+
+    # IPv6 should be re-enabled only for TUN, not TAP
+    readonly ipv6_disabled_services=""
+    readonly ipv6_disabled_services_encoded=""
+
+	# Still need to do: Look for route-gateway dhcp (TAP isn't always DHCP)
+	bRouteGatewayIsDhcp="false"
+	if [ -z "${route_vpn_gateway}" -o "$route_vpn_gateway" == "dhcp" -o "$route_vpn_gateway" == "DHCP" ]; then
+		bRouteGatewayIsDhcp="true"
+	fi
+	
+	if [ "$bRouteGatewayIsDhcp" == "true" ]; then
+		logDebugMessage "DEBUG: bRouteGatewayIsDhcp is TRUE"
+		if [ -z "$dev" ]; then
+			logMessage "ERROR: Cannot configure TAP interface for DHCP without \$dev being defined. Exiting."
+            # We don't create the "/tmp/bitmask-downscript-needs-to-be-run.txt" file, because the down script does NOT need to be run since we didn't do anything
+            logMessage "End of output from ${OUR_NAME}"
+            logMessage "**********************************************"
+			exit 1
+		fi
+		
+		logDebugMessage "DEBUG: About to 'ipconfig set \"$dev\" DHCP"
+		ipconfig set "$dev" DHCP
+		logMessage "Did 'ipconfig set \"$dev\" DHCP'"
+
+        if ${ARG_ENABLE_IPV6_ON_TAP} ; then
+            ipconfig set "$dev" AUTOMATIC-V6
+            logMessage "Did 'ipconfig set \"$dev\" AUTOMATIC-V6'"
+        fi
+
+        if ${ARG_WAIT_FOR_DHCP_IF_TAP} ; then
+            logMessage "Configuring tap DNS via DHCP synchronously"
+            configureDhcpDns
+        else
+    		logMessage "Configuring tap DNS via DHCP asynchronously"
+		    configureDhcpDns & # This must be run asynchronously; the DHCP lease will not complete until this script exits
+		    EXIT_CODE=0
+        fi
+	elif [ "$foreign_option_1" == "" ]; then
+		logMessage "NOTE: No network configuration changes need to be made."
+		if ${ARG_MONITOR_NETWORK_CONFIGURATION} ; then
+			logMessage "WARNING: Will NOT monitor for other network configuration changes."
+		fi
+        if ${ARG_ENABLE_IPV6_ON_TAP} ; then
+            logMessage "WARNING: Will NOT set up IPv6 on TAP device because it does not use DHCP."
+        fi
+        logDnsInfoNoChanges
+        flushDNSCache
+	else
+        if ${ARG_ENABLE_IPV6_ON_TAP} ; then
+            logMessage "WARNING: Will NOT set up IPv6 on TAP device because it does not use DHCP."
+        fi
+		logMessage "Configuring tap DNS via OpenVPN"
+		configureOpenVpnDns
+		EXIT_CODE=$?
+	fi
+else
+	if [ "$foreign_option_1" == "" ]; then
+		logMessage "NOTE: No network configuration changes need to be made."
+		if ${ARG_MONITOR_NETWORK_CONFIGURATION} ; then
+			logMessage "WARNING: Will NOT monitor for other network configuration changes."
+		fi
+        if ${ARG_DISABLE_IPV6_ON_TUN} ; then
+            logMessage "WARNING: Will NOT disable IPv6 settings."
+        fi
+        logDnsInfoNoChanges
+        flushDNSCache
+	else
+
+        ipv6_disabled_services=""
+        if ${ARG_DISABLE_IPV6_ON_TUN} ; then
+            ipv6_disabled_services="$( disable_ipv6 )"
+			if [ "$ipv6_disabled_services" != "" ] ; then
+                printf %s "$ipv6_disabled_services
+" | \
+                while IFS= read -r dipv6_service ; do
+                    logMessage "Disabled IPv6 for '$dipv6_service'"
+                done
+            fi
+        fi
+        readonly ipv6_disabled_services
+		# Note '\n' is translated into '\t' so it is all on one line, because grep and sed only work with single lines
+		readonly ipv6_disabled_services_encoded="$( echo "$ipv6_disabled_services" | tr '\n' '\t' )"
+
+		configureOpenVpnDns
+		EXIT_CODE=$?
+	fi
+fi
+
+touch "/tmp/bitmask-downscript-needs-to-be-run.txt"
+
+logMessage "End of output from ${OUR_NAME}"
+logMessage "**********************************************"
+
+exit $EXIT_CODE
diff --git a/pkg/osx/daemon.py b/pkg/osx/daemon.py
new file mode 100644
index 00000000..07810cf1
--- /dev/null
+++ b/pkg/osx/daemon.py
@@ -0,0 +1,926 @@
+# -*- coding: utf-8 -*-
+
+# daemon/daemon.py
+# Part of ‘python-daemon’, an implementation of PEP 3143.
+#
+# Copyright © 2008–2015 Ben Finney <ben+python@benfinney.id.au>
+# Copyright © 2007–2008 Robert Niederreiter, Jens Klein
+# Copyright © 2004–2005 Chad J. Schroeder
+# Copyright © 2003 Clark Evans
+# Copyright © 2002 Noah Spurrier
+# Copyright © 2001 Jürgen Hermann
+#
+# This is free software: you may copy, modify, and/or distribute this work
+# under the terms of the Apache License, version 2.0 as published by the
+# Apache Software Foundation.
+# No warranty expressed or implied. See the file ‘LICENSE.ASF-2’ for details.
+
+""" Daemon process behaviour.
+    """
+
+from __future__ import (absolute_import, unicode_literals)
+
+import os
+import sys
+import resource
+import errno
+import signal
+import socket
+import atexit
+try:
+    # Python 2 has both ‘str’ (bytes) and ‘unicode’ (text).
+    basestring = basestring
+    unicode = unicode
+except NameError:
+    # Python 3 names the Unicode data type ‘str’.
+    basestring = str
+    unicode = str
+
+
+class DaemonError(Exception):
+    """ Base exception class for errors from this module. """
+
+    def __init__(self, *args, **kwargs):
+        self._chain_from_context()
+
+        super(DaemonError, self).__init__(*args, **kwargs)
+
+    def _chain_from_context(self):
+        _chain_exception_from_existing_exception_context(self, as_cause=True)
+
+
+class DaemonOSEnvironmentError(DaemonError, OSError):
+    """ Exception raised when daemon OS environment setup receives error. """
+
+
+class DaemonProcessDetachError(DaemonError, OSError):
+    """ Exception raised when process detach fails. """
+
+
+class DaemonContext:
+    """ Context for turning the current program into a daemon process.
+
+        A `DaemonContext` instance represents the behaviour settings and
+        process context for the program when it becomes a daemon. The
+        behaviour and environment is customised by setting options on the
+        instance, before calling the `open` method.
+
+        Each option can be passed as a keyword argument to the `DaemonContext`
+        constructor, or subsequently altered by assigning to an attribute on
+        the instance at any time prior to calling `open`. That is, for
+        options named `wibble` and `wubble`, the following invocation::
+
+            foo = daemon.DaemonContext(wibble=bar, wubble=baz)
+            foo.open()
+
+        is equivalent to::
+
+            foo = daemon.DaemonContext()
+            foo.wibble = bar
+            foo.wubble = baz
+            foo.open()
+
+        The following options are defined.
+
+        `files_preserve`
+            :Default: ``None``
+
+            List of files that should *not* be closed when starting the
+            daemon. If ``None``, all open file descriptors will be closed.
+
+            Elements of the list are file descriptors (as returned by a file
+            object's `fileno()` method) or Python `file` objects. Each
+            specifies a file that is not to be closed during daemon start.
+
+        `chroot_directory`
+            :Default: ``None``
+
+            Full path to a directory to set as the effective root directory of
+            the process. If ``None``, specifies that the root directory is not
+            to be changed.
+
+        `working_directory`
+            :Default: ``'/'``
+
+            Full path of the working directory to which the process should
+            change on daemon start.
+
+            Since a filesystem cannot be unmounted if a process has its
+            current working directory on that filesystem, this should either
+            be left at default or set to a directory that is a sensible “home
+            directory” for the daemon while it is running.
+
+        `umask`
+            :Default: ``0``
+
+            File access creation mask (“umask”) to set for the process on
+            daemon start.
+
+            A daemon should not rely on the parent process's umask value,
+            which is beyond its control and may prevent creating a file with
+            the required access mode. So when the daemon context opens, the
+            umask is set to an explicit known value.
+
+            If the conventional value of 0 is too open, consider setting a
+            value such as 0o022, 0o027, 0o077, or another specific value.
+            Otherwise, ensure the daemon creates every file with an
+            explicit access mode for the purpose.
+
+        `pidfile`
+            :Default: ``None``
+
+            Context manager for a PID lock file. When the daemon context opens
+            and closes, it enters and exits the `pidfile` context manager.
+
+        `detach_process`
+            :Default: ``None``
+
+            If ``True``, detach the process context when opening the daemon
+            context; if ``False``, do not detach.
+
+            If unspecified (``None``) during initialisation of the instance,
+            this will be set to ``True`` by default, and ``False`` only if
+            detaching the process is determined to be redundant; for example,
+            in the case when the process was started by `init`, by `initd`, or
+            by `inetd`.
+
+        `signal_map`
+            :Default: system-dependent
+
+            Mapping from operating system signals to callback actions.
+
+            The mapping is used when the daemon context opens, and determines
+            the action for each signal's signal handler:
+
+            * A value of ``None`` will ignore the signal (by setting the
+              signal action to ``signal.SIG_IGN``).
+
+            * A string value will be used as the name of an attribute on the
+              ``DaemonContext`` instance. The attribute's value will be used
+              as the action for the signal handler.
+
+            * Any other value will be used as the action for the
+              signal handler. See the ``signal.signal`` documentation
+              for details of the signal handler interface.
+
+            The default value depends on which signals are defined on the
+            running system. Each item from the list below whose signal is
+            actually defined in the ``signal`` module will appear in the
+            default map:
+
+            * ``signal.SIGTTIN``: ``None``
+
+            * ``signal.SIGTTOU``: ``None``
+
+            * ``signal.SIGTSTP``: ``None``
+
+            * ``signal.SIGTERM``: ``'terminate'``
+
+            Depending on how the program will interact with its child
+            processes, it may need to specify a signal map that
+            includes the ``signal.SIGCHLD`` signal (received when a
+            child process exits). See the specific operating system's
+            documentation for more detail on how to determine what
+            circumstances dictate the need for signal handlers.
+
+        `uid`
+            :Default: ``os.getuid()``
+
+        `gid`
+            :Default: ``os.getgid()``
+
+            The user ID (“UID”) value and group ID (“GID”) value to switch
+            the process to on daemon start.
+
+            The default values, the real UID and GID of the process, will
+            relinquish any effective privilege elevation inherited by the
+            process.
+
+        `prevent_core`
+            :Default: ``True``
+
+            If true, prevents the generation of core files, in order to avoid
+            leaking sensitive information from daemons run as `root`.
+
+        `stdin`
+            :Default: ``None``
+
+        `stdout`
+            :Default: ``None``
+
+        `stderr`
+            :Default: ``None``
+
+            Each of `stdin`, `stdout`, and `stderr` is a file-like object
+            which will be used as the new file for the standard I/O stream
+            `sys.stdin`, `sys.stdout`, and `sys.stderr` respectively. The file
+            should therefore be open, with a minimum of mode 'r' in the case
+            of `stdin`, and mimimum of mode 'w+' in the case of `stdout` and
+            `stderr`.
+
+            If the object has a `fileno()` method that returns a file
+            descriptor, the corresponding file will be excluded from being
+            closed during daemon start (that is, it will be treated as though
+            it were listed in `files_preserve`).
+
+            If ``None``, the corresponding system stream is re-bound to the
+            file named by `os.devnull`.
+
+        """
+
+    __metaclass__ = type
+
+    def __init__(
+            self,
+            chroot_directory=None,
+            working_directory="/",
+            umask=0,
+            uid=None,
+            gid=None,
+            prevent_core=True,
+            detach_process=None,
+            files_preserve=None,
+            pidfile=None,
+            stdin=None,
+            stdout=None,
+            stderr=None,
+            signal_map=None,
+            ):
+        """ Set up a new instance. """
+        self.chroot_directory = chroot_directory
+        self.working_directory = working_directory
+        self.umask = umask
+        self.prevent_core = prevent_core
+        self.files_preserve = files_preserve
+        self.pidfile = pidfile
+        self.stdin = stdin
+        self.stdout = stdout
+        self.stderr = stderr
+
+        if uid is None:
+            uid = os.getuid()
+        self.uid = uid
+        if gid is None:
+            gid = os.getgid()
+        self.gid = gid
+
+        if detach_process is None:
+            detach_process = is_detach_process_context_required()
+        self.detach_process = detach_process
+
+        if signal_map is None:
+            signal_map = make_default_signal_map()
+        self.signal_map = signal_map
+
+        self._is_open = False
+
+    @property
+    def is_open(self):
+        """ ``True`` if the instance is currently open. """
+        return self._is_open
+
+    def open(self):
+        """ Become a daemon process.
+
+            :return: ``None``.
+
+            Open the daemon context, turning the current program into a daemon
+            process. This performs the following steps:
+
+            * If this instance's `is_open` property is true, return
+              immediately. This makes it safe to call `open` multiple times on
+              an instance.
+
+            * If the `prevent_core` attribute is true, set the resource limits
+              for the process to prevent any core dump from the process.
+
+            * If the `chroot_directory` attribute is not ``None``, set the
+              effective root directory of the process to that directory (via
+              `os.chroot`).
+
+              This allows running the daemon process inside a “chroot gaol”
+              as a means of limiting the system's exposure to rogue behaviour
+              by the process. Note that the specified directory needs to
+              already be set up for this purpose.
+
+            * Set the process UID and GID to the `uid` and `gid` attribute
+              values.
+
+            * Close all open file descriptors. This excludes those listed in
+              the `files_preserve` attribute, and those that correspond to the
+              `stdin`, `stdout`, or `stderr` attributes.
+
+            * Change current working directory to the path specified by the
+              `working_directory` attribute.
+
+            * Reset the file access creation mask to the value specified by
+              the `umask` attribute.
+
+            * If the `detach_process` option is true, detach the current
+              process into its own process group, and disassociate from any
+              controlling terminal.
+
+            * Set signal handlers as specified by the `signal_map` attribute.
+
+            * If any of the attributes `stdin`, `stdout`, `stderr` are not
+              ``None``, bind the system streams `sys.stdin`, `sys.stdout`,
+              and/or `sys.stderr` to the files represented by the
+              corresponding attributes. Where the attribute has a file
+              descriptor, the descriptor is duplicated (instead of re-binding
+              the name).
+
+            * If the `pidfile` attribute is not ``None``, enter its context
+              manager.
+
+            * Mark this instance as open (for the purpose of future `open` and
+              `close` calls).
+
+            * Register the `close` method to be called during Python's exit
+              processing.
+
+            When the function returns, the running program is a daemon
+            process.
+
+            """
+        if self.is_open:
+            return
+
+        if self.chroot_directory is not None:
+            change_root_directory(self.chroot_directory)
+
+        if self.prevent_core:
+            prevent_core_dump()
+
+        change_file_creation_mask(self.umask)
+        change_working_directory(self.working_directory)
+        change_process_owner(self.uid, self.gid)
+
+        if self.detach_process:
+            detach_process_context()
+
+        signal_handler_map = self._make_signal_handler_map()
+        set_signal_handlers(signal_handler_map)
+
+        exclude_fds = self._get_exclude_file_descriptors()
+        close_all_open_files(exclude=exclude_fds)
+
+        redirect_stream(sys.stdin, self.stdin)
+        redirect_stream(sys.stdout, self.stdout)
+        redirect_stream(sys.stderr, self.stderr)
+
+        if self.pidfile is not None:
+            self.pidfile.__enter__()
+
+        self._is_open = True
+
+        register_atexit_function(self.close)
+
+    def __enter__(self):
+        """ Context manager entry point. """
+        self.open()
+        return self
+
+    def close(self):
+        """ Exit the daemon process context.
+
+            :return: ``None``.
+
+            Close the daemon context. This performs the following steps:
+
+            * If this instance's `is_open` property is false, return
+              immediately. This makes it safe to call `close` multiple times
+              on an instance.
+
+            * If the `pidfile` attribute is not ``None``, exit its context
+              manager.
+
+            * Mark this instance as closed (for the purpose of future `open`
+              and `close` calls).
+
+            """
+        if not self.is_open:
+            return
+
+        if self.pidfile is not None:
+            # Follow the interface for telling a context manager to exit,
+            # <URL:http://docs.python.org/library/stdtypes.html#typecontextmanager>.
+            self.pidfile.__exit__(None, None, None)
+
+        self._is_open = False
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        """ Context manager exit point. """
+        self.close()
+
+    def terminate(self, signal_number, stack_frame):
+        """ Signal handler for end-process signals.
+
+            :param signal_number: The OS signal number received.
+            :param stack_frame: The frame object at the point the
+                signal was received.
+            :return: ``None``.
+
+            Signal handler for the ``signal.SIGTERM`` signal. Performs the
+            following step:
+
+            * Raise a ``SystemExit`` exception explaining the signal.
+
+            """
+        exception = SystemExit(
+                "Terminating on signal {signal_number!r}".format(
+                    signal_number=signal_number))
+        raise exception
+
+    def _get_exclude_file_descriptors(self):
+        """ Get the set of file descriptors to exclude closing.
+
+            :return: A set containing the file descriptors for the
+                files to be preserved.
+
+            The file descriptors to be preserved are those from the
+            items in `files_preserve`, and also each of `stdin`,
+            `stdout`, and `stderr`. For each item:
+
+            * If the item is ``None``, it is omitted from the return
+              set.
+
+            * If the item's ``fileno()`` method returns a value, that
+              value is in the return set.
+
+            * Otherwise, the item is in the return set verbatim.
+
+            """
+        files_preserve = self.files_preserve
+        if files_preserve is None:
+            files_preserve = []
+        files_preserve.extend(
+                item for item in [self.stdin, self.stdout, self.stderr]
+                if hasattr(item, 'fileno'))
+
+        exclude_descriptors = set()
+        for item in files_preserve:
+            if item is None:
+                continue
+            file_descriptor = _get_file_descriptor(item)
+            if file_descriptor is not None:
+                exclude_descriptors.add(file_descriptor)
+            else:
+                exclude_descriptors.add(item)
+
+        return exclude_descriptors
+
+    def _make_signal_handler(self, target):
+        """ Make the signal handler for a specified target object.
+
+            :param target: A specification of the target for the
+                handler; see below.
+            :return: The value for use by `signal.signal()`.
+
+            If `target` is ``None``, return ``signal.SIG_IGN``. If `target`
+            is a text string, return the attribute of this instance named
+            by that string. Otherwise, return `target` itself.
+
+            """
+        if target is None:
+            result = signal.SIG_IGN
+        elif isinstance(target, unicode):
+            name = target
+            result = getattr(self, name)
+        else:
+            result = target
+
+        return result
+
+    def _make_signal_handler_map(self):
+        """ Make the map from signals to handlers for this instance.
+
+            :return: The constructed signal map for this instance.
+
+            Construct a map from signal numbers to handlers for this
+            context instance, suitable for passing to
+            `set_signal_handlers`.
+
+            """
+        signal_handler_map = dict(
+                (signal_number, self._make_signal_handler(target))
+                for (signal_number, target) in self.signal_map.items())
+        return signal_handler_map
+
+
+def _get_file_descriptor(obj):
+    """ Get the file descriptor, if the object has one.
+
+        :param obj: The object expected to be a file-like object.
+        :return: The file descriptor iff the file supports it; otherwise
+            ``None``.
+
+        The object may be a non-file object. It may also be a
+        file-like object with no support for a file descriptor. In
+        either case, return ``None``.
+
+        """
+    file_descriptor = None
+    if hasattr(obj, 'fileno'):
+        try:
+            file_descriptor = obj.fileno()
+        except ValueError:
+            # The item doesn't support a file descriptor.
+            pass
+
+    return file_descriptor
+
+
+def change_working_directory(directory):
+    """ Change the working directory of this process.
+
+        :param directory: The target directory path.
+        :return: ``None``.
+
+        """
+    try:
+        os.chdir(directory)
+    except Exception as exc:
+        error = DaemonOSEnvironmentError(
+                "Unable to change working directory ({exc})".format(exc=exc))
+        raise error
+
+
+def change_root_directory(directory):
+    """ Change the root directory of this process.
+
+        :param directory: The target directory path.
+        :return: ``None``.
+
+        Set the current working directory, then the process root directory,
+        to the specified `directory`. Requires appropriate OS privileges
+        for this process.
+
+        """
+    try:
+        os.chdir(directory)
+        os.chroot(directory)
+    except Exception as exc:
+        error = DaemonOSEnvironmentError(
+                "Unable to change root directory ({exc})".format(exc=exc))
+        raise error
+
+
+def change_file_creation_mask(mask):
+    """ Change the file creation mask for this process.
+
+        :param mask: The numeric file creation mask to set.
+        :return: ``None``.
+
+        """
+    try:
+        os.umask(mask)
+    except Exception as exc:
+        error = DaemonOSEnvironmentError(
+                "Unable to change file creation mask ({exc})".format(exc=exc))
+        raise error
+
+
+def change_process_owner(uid, gid):
+    """ Change the owning UID and GID of this process.
+
+        :param uid: The target UID for the daemon process.
+        :param gid: The target GID for the daemon process.
+        :return: ``None``.
+
+        Set the GID then the UID of the process (in that order, to avoid
+        permission errors) to the specified `gid` and `uid` values.
+        Requires appropriate OS privileges for this process.
+
+        """
+    try:
+        os.setgid(gid)
+        os.setuid(uid)
+    except Exception as exc:
+        error = DaemonOSEnvironmentError(
+                "Unable to change process owner ({exc})".format(exc=exc))
+        raise error
+
+
+def prevent_core_dump():
+    """ Prevent this process from generating a core dump.
+
+        :return: ``None``.
+
+        Set the soft and hard limits for core dump size to zero. On Unix,
+        this entirely prevents the process from creating core dump.
+
+        """
+    core_resource = resource.RLIMIT_CORE
+
+    try:
+        # Ensure the resource limit exists on this platform, by requesting
+        # its current value.
+        core_limit_prev = resource.getrlimit(core_resource)
+    except ValueError as exc:
+        error = DaemonOSEnvironmentError(
+                "System does not support RLIMIT_CORE resource limit"
+                " ({exc})".format(exc=exc))
+        raise error
+
+    # Set hard and soft limits to zero, i.e. no core dump at all.
+    core_limit = (0, 0)
+    resource.setrlimit(core_resource, core_limit)
+
+
+def detach_process_context():
+    """ Detach the process context from parent and session.
+
+        :return: ``None``.
+
+        Detach from the parent process and session group, allowing the
+        parent to exit while this process continues running.
+
+        Reference: “Advanced Programming in the Unix Environment”,
+        section 13.3, by W. Richard Stevens, published 1993 by
+        Addison-Wesley.
+
+        """
+
+    def fork_then_exit_parent(error_message):
+        """ Fork a child process, then exit the parent process.
+
+            :param error_message: Message for the exception in case of a
+                detach failure.
+            :return: ``None``.
+            :raise DaemonProcessDetachError: If the fork fails.
+
+            """
+        try:
+            pid = os.fork()
+            if pid > 0:
+                os._exit(0)
+        except OSError as exc:
+            error = DaemonProcessDetachError(
+                    "{message}: [{exc.errno:d}] {exc.strerror}".format(
+                        message=error_message, exc=exc))
+            raise error
+
+    fork_then_exit_parent(error_message="Failed first fork")
+    os.setsid()
+    fork_then_exit_parent(error_message="Failed second fork")
+
+
+def is_process_started_by_init():
+    """ Determine whether the current process is started by `init`.
+
+        :return: ``True`` iff the parent process is `init`; otherwise
+            ``False``.
+
+        The `init` process is the one with process ID of 1.
+
+        """
+    result = False
+
+    init_pid = 1
+    if os.getppid() == init_pid:
+        result = True
+
+    return result
+
+
+def is_socket(fd):
+    """ Determine whether the file descriptor is a socket.
+
+        :param fd: The file descriptor to interrogate.
+        :return: ``True`` iff the file descriptor is a socket; otherwise
+            ``False``.
+
+        Query the socket type of `fd`. If there is no error, the file is a
+        socket.
+
+        """
+    result = False
+
+    file_socket = socket.fromfd(fd, socket.AF_INET, socket.SOCK_RAW)
+
+    try:
+        socket_type = file_socket.getsockopt(
+                socket.SOL_SOCKET, socket.SO_TYPE)
+    except socket.error as exc:
+        exc_errno = exc.args[0]
+        if exc_errno == errno.ENOTSOCK:
+            # Socket operation on non-socket.
+            pass
+        else:
+            # Some other socket error.
+            result = True
+    else:
+        # No error getting socket type.
+        result = True
+
+    return result
+
+
+def is_process_started_by_superserver():
+    """ Determine whether the current process is started by the superserver.
+
+        :return: ``True`` if this process was started by the internet
+            superserver; otherwise ``False``.
+
+        The internet superserver creates a network socket, and
+        attaches it to the standard streams of the child process. If
+        that is the case for this process, return ``True``, otherwise
+        ``False``.
+
+        """
+    result = False
+
+    stdin_fd = sys.__stdin__.fileno()
+    if is_socket(stdin_fd):
+        result = True
+
+    return result
+
+
+def is_detach_process_context_required():
+    """ Determine whether detaching the process context is required.
+
+        :return: ``True`` iff the process is already detached; otherwise
+            ``False``.
+
+        The process environment is interrogated for the following:
+
+        * Process was started by `init`; or
+
+        * Process was started by `inetd`.
+
+        If any of the above are true, the process is deemed to be already
+        detached.
+
+        """
+    result = True
+    if is_process_started_by_init() or is_process_started_by_superserver():
+        result = False
+
+    return result
+
+
+def close_file_descriptor_if_open(fd):
+    """ Close a file descriptor if already open.
+
+        :param fd: The file descriptor to close.
+        :return: ``None``.
+
+        Close the file descriptor `fd`, suppressing an error in the
+        case the file was not open.
+
+        """
+    try:
+        os.close(fd)
+    except EnvironmentError as exc:
+        if exc.errno == errno.EBADF:
+            # File descriptor was not open.
+            pass
+        else:
+            error = DaemonOSEnvironmentError(
+                    "Failed to close file descriptor {fd:d} ({exc})".format(
+                        fd=fd, exc=exc))
+            raise error
+
+
+MAXFD = 2048
+
+def get_maximum_file_descriptors():
+    """ Get the maximum number of open file descriptors for this process.
+
+        :return: The number (integer) to use as the maximum number of open
+            files for this process.
+
+        The maximum is the process hard resource limit of maximum number of
+        open file descriptors. If the limit is “infinity”, a default value
+        of ``MAXFD`` is returned.
+
+        """
+    limits = resource.getrlimit(resource.RLIMIT_NOFILE)
+    result = limits[1]
+    if result == resource.RLIM_INFINITY:
+        result = MAXFD
+    return result
+
+
+def close_all_open_files(exclude=set()):
+    """ Close all open file descriptors.
+
+        :param exclude: Collection of file descriptors to skip when closing
+            files.
+        :return: ``None``.
+
+        Closes every file descriptor (if open) of this process. If
+        specified, `exclude` is a set of file descriptors to *not*
+        close.
+
+        """
+    maxfd = get_maximum_file_descriptors()
+    for fd in reversed(range(maxfd)):
+        if fd not in exclude:
+            close_file_descriptor_if_open(fd)
+
+
+def redirect_stream(system_stream, target_stream):
+    """ Redirect a system stream to a specified file.
+
+        :param standard_stream: A file object representing a standard I/O
+            stream.
+        :param target_stream: The target file object for the redirected
+            stream, or ``None`` to specify the null device.
+        :return: ``None``.
+
+        `system_stream` is a standard system stream such as
+        ``sys.stdout``. `target_stream` is an open file object that
+        should replace the corresponding system stream object.
+
+        If `target_stream` is ``None``, defaults to opening the
+        operating system's null device and using its file descriptor.
+
+        """
+    if target_stream is None:
+        target_fd = os.open(os.devnull, os.O_RDWR)
+    else:
+        target_fd = target_stream.fileno()
+    os.dup2(target_fd, system_stream.fileno())
+
+
+def make_default_signal_map():
+    """ Make the default signal map for this system.
+
+        :return: A mapping from signal number to handler object.
+
+        The signals available differ by system. The map will not contain
+        any signals not defined on the running system.
+
+        """
+    name_map = {
+            'SIGTSTP': None,
+            'SIGTTIN': None,
+            'SIGTTOU': None,
+            'SIGTERM': 'terminate',
+            }
+    signal_map = dict(
+            (getattr(signal, name), target)
+            for (name, target) in name_map.items()
+            if hasattr(signal, name))
+
+    return signal_map
+
+
+def set_signal_handlers(signal_handler_map):
+    """ Set the signal handlers as specified.
+
+        :param signal_handler_map: A map from signal number to handler
+            object.
+        :return: ``None``.
+
+        See the `signal` module for details on signal numbers and signal
+        handlers.
+
+        """
+    for (signal_number, handler) in signal_handler_map.items():
+        signal.signal(signal_number, handler)
+
+
+def register_atexit_function(func):
+    """ Register a function for processing at program exit.
+
+        :param func: A callable function expecting no arguments.
+        :return: ``None``.
+
+        The function `func` is registered for a call with no arguments
+        at program exit.
+
+        """
+    atexit.register(func)
+
+
+def _chain_exception_from_existing_exception_context(exc, as_cause=False):
+    """ Decorate the specified exception with the existing exception context.
+
+        :param exc: The exception instance to decorate.
+        :param as_cause: If true, the existing context is declared to be
+            the cause of the exception.
+        :return: ``None``.
+
+        :PEP:`344` describes syntax and attributes (`__traceback__`,
+        `__context__`, `__cause__`) for use in exception chaining.
+
+        Python 2 does not have that syntax, so this function decorates
+        the exception with values from the current exception context.
+
+        """
+    (existing_exc_type, existing_exc, existing_traceback) = sys.exc_info()
+    if as_cause:
+        exc.__cause__ = existing_exc
+    else:
+        exc.__context__ = existing_exc
+    exc.__traceback__ = existing_traceback
+
+
+# Local variables:
+# coding: utf-8
+# mode: python
+# End:
+# vim: fileencoding=utf-8 filetype=python :
diff --git a/pkg/osx/install/ProcessNetworkChanges.plist.template b/pkg/osx/install/ProcessNetworkChanges.plist.template
deleted file mode 100644
index eaf54fcf..00000000
--- a/pkg/osx/install/ProcessNetworkChanges.plist.template
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-	<dict>
-		<key>Label</key>
-		<string>se.leap.openvpn.process-network-changes</string>
-		<key>ProgramArguments</key>
-		<array>
-			<string>${DIR}/process-network-changes</string>
-		</array>
-		<key>WatchPaths</key>
-		<array>
-			<string>/Library/Preferences/SystemConfiguration</string>
-		</array>
-	</dict>
-</plist>
diff --git a/pkg/osx/install/client.down.sh b/pkg/osx/install/client.down.sh
deleted file mode 100755
index 52ba4de6..00000000
--- a/pkg/osx/install/client.down.sh
+++ /dev/null
@@ -1,148 +0,0 @@
-#!/bin/bash -e
-# Note: must be bash; uses bash-specific tricks
-#
-# ******************************************************************************************************************
-# Based on the Tunnelblick script that just "does everything!"
-# It handles TUN and TAP interfaces, 
-# pushed configurations and DHCP leases. :)
-# 
-# This is the "Down" version of the script, executed after the connection is 
-# closed.
-#
-# Created by: Nick Williams (using original code and parts of old Tblk scripts)
-# 
-# ******************************************************************************************************************
-# TODO: review and adapt version 3 of the clientX.down.sh
-
-trap "" TSTP
-trap "" HUP
-trap "" INT
-export PATH="/bin:/sbin:/usr/sbin:/usr/bin"
-
-readonly LOG_MESSAGE_COMMAND=$(basename "${0}")
-
-# Quick check - is the configuration there?
-if ! scutil -w State:/Network/OpenVPN &>/dev/null -t 1 ; then
-	# Configuration isn't there, so we forget it
-	echo "$(date '+%a %b %e %T %Y') *LEAPClient $LOG_MESSAGE_COMMAND: WARNING: No existing OpenVPN DNS configuration found; not tearing down anything; exiting."
-	exit 0
-fi
-
-# NOTE: This script does not use any arguments passed to it by OpenVPN, so it doesn't shift LEAPClient options out of the argument list
-
-# Get info saved by the up script
-LEAPCLIENT_CONFIG="$(/usr/sbin/scutil <<-EOF
-	open
-	show State:/Network/OpenVPN
-	quit
-EOF)"
-
-ARG_MONITOR_NETWORK_CONFIGURATION="$(echo "${LEAPCLIENT_CONFIG}" | grep -i '^[[:space:]]*MonitorNetwork :' | sed -e 's/^.*: //g')"
-LEASEWATCHER_PLIST_PATH="$(echo "${LEAPCLIENT_CONFIG}" | grep -i '^[[:space:]]*LeaseWatcherPlistPath :' | sed -e 's/^.*: //g')"
-PSID="$(echo "${LEAPCLIENT_CONFIG}" | grep -i '^[[:space:]]*Service :' | sed -e 's/^.*: //g')"
-SCRIPT_LOG_FILE="$(echo "${LEAPCLIENT_CONFIG}" | grep -i '^[[:space:]]*ScriptLogFile :' | sed -e 's/^.*: //g')"
-# Don't need: ARG_RESTORE_ON_DNS_RESET="$(echo "${LEAPCLIENT_CONFIG}" | grep -i '^[[:space:]]*RestoreOnDNSReset :' | sed -e 's/^.*: //g')"
-# Don't need: ARG_RESTORE_ON_WINS_RESET="$(echo "${LEAPCLIENT_CONFIG}" | grep -i '^[[:space:]]*RestoreOnWINSReset :' | sed -e 's/^.*: //g')"
-# Don't need: PROCESS="$(echo "${LEAPCLIENT_CONFIG}" | grep -i '^[[:space:]]*PID :' | sed -e 's/^.*: //g')"
-# Don't need: ARG_IGNORE_OPTION_FLAGS="$(echo "${LEAPCLIENT_CONFIG}" | grep -i '^[[:space:]]*IgnoreOptionFlags :' | sed -e 's/^.*: //g')"
-ARG_TAP="$(echo "${LEAPCLIENT_CONFIG}" | grep -i '^[[:space:]]*IsTapInterface :' | sed -e 's/^.*: //g')"
-bRouteGatewayIsDhcp="$(echo "${LEAPCLIENT_CONFIG}" | grep -i '^[[:space:]]*RouteGatewayIsDhcp :' | sed -e 's/^.*: //g')"
-
-# @param String message - The message to log
-logMessage()
-{
-	echo "$(date '+%a %b %e %T %Y') *LEAP CLient $LOG_MESSAGE_COMMAND: "${@} >> "${SCRIPT_LOG_FILE}"
-}
-
-trim()
-{
-	echo ${@}
-}
-
-if ${ARG_TAP} ; then
-	if [ "$bRouteGatewayIsDhcp" == "true" ]; then
-		if [ -z "$dev" ]; then
-			logMessage "Cannot configure TAP interface for DHCP without \$dev being defined. Device may not have disconnected properly."
-		else
-			set +e
-			ipconfig set "$dev" NONE 2>/dev/null
-			set -e
-		fi
-	fi
-fi
-
-# Issue warning if the primary service ID has changed
-PSID_CURRENT="$( (scutil | grep Service | sed -e 's/.*Service : //')<<- EOF
-	open
-	show State:/Network/OpenVPN
-	quit
-EOF)"
-if [ "${PSID}" != "${PSID_CURRENT}" ] ; then
-	logMessage "Ignoring change of Network Primary Service from ${PSID} to ${PSID_CURRENT}"
-fi
-
-# Remove leasewatcher
-if ${ARG_MONITOR_NETWORK_CONFIGURATION} ; then
-	launchctl unload "${LEASEWATCHER_PLIST_PATH}"
-	logMessage "Cancelled monitoring of system configuration changes"
-fi
-
-# Restore configurations
-DNS_OLD="$(/usr/sbin/scutil <<-EOF
-	open
-	show State:/Network/OpenVPN/OldDNS
-	quit
-EOF)"
-WINS_OLD="$(/usr/sbin/scutil <<-EOF
-	open
-	show State:/Network/OpenVPN/OldSMB
-	quit
-EOF)"
-TB_NO_SUCH_KEY="<dictionary> {
-  LEAPClientNoSuchKey : true
-}"
-
-if [ "${DNS_OLD}" = "${TB_NO_SUCH_KEY}" ] ; then
-	scutil <<- EOF
-		open
-		remove State:/Network/Service/${PSID}/DNS
-		quit
-EOF
-else
-	scutil <<- EOF
-		open
-		get State:/Network/OpenVPN/OldDNS
-		set State:/Network/Service/${PSID}/DNS
-		quit
-EOF
-fi
-
-if [ "${WINS_OLD}" = "${TB_NO_SUCH_KEY}" ] ; then
-	scutil <<- EOF
-		open
-		remove State:/Network/Service/${PSID}/SMB
-		quit
-EOF
-else
-	scutil <<- EOF
-		open
-		get State:/Network/OpenVPN/OldSMB
-		set State:/Network/Service/${PSID}/SMB
-		quit
-EOF
-fi
-
-logMessage "Restored the DNS and WINS configurations"
-
-# Remove our system configuration data
-scutil <<- EOF
-	open
-	remove State:/Network/OpenVPN/SMB
-	remove State:/Network/OpenVPN/DNS
-	remove State:/Network/OpenVPN/OldSMB
-	remove State:/Network/OpenVPN/OldDNS
-	remove State:/Network/OpenVPN
-	quit
-EOF
-
-exit 0
diff --git a/pkg/osx/install/client.up.sh b/pkg/osx/install/client.up.sh
deleted file mode 100755
index be9814c2..00000000
--- a/pkg/osx/install/client.up.sh
+++ /dev/null
@@ -1,599 +0,0 @@
-#!/bin/bash -e
-# Note: must be bash; uses bash-specific tricks
-#
-# ******************************************************************************************************************
-# Taken from the Tunnelblick script that "just does everything!"
-# It handles TUN and TAP interfaces, 
-# pushed configurations, DHCP with DNS and WINS, and renewed DHCP leases. :)
-# 
-# This is the "Up" version of the script, executed after the interface is 
-# initialized.
-#
-# Created by: Nick Williams (using original code and parts of old Tblk scripts)
-# 
-# ******************************************************************************************************************
-# TODO: review and adapt revision 3 of the clientX-up.sh instead
-
-trap "" TSTP
-trap "" HUP
-trap "" INT
-export PATH="/bin:/sbin:/usr/sbin:/usr/bin"
-
-# Process optional arguments (if any) for the script
-# Each one begins with a "-"
-# They come from the leap-client invocation, and come first, before the OpenVPN arguments
-# So we set ARG_ script variables to their values and shift them out of the argument list
-# When we're done, only the OpenVPN arguments remain for the rest of the script to use
-ARG_MONITOR_NETWORK_CONFIGURATION="false"
-ARG_RESTORE_ON_DNS_RESET="false"
-ARG_RESTORE_ON_WINS_RESET="false"
-ARG_TAP="false"
-ARG_IGNORE_OPTION_FLAGS=""
-
-while [ {$#} ] ; do
-	if [ "$1" = "-m" ] ; then						# Handle the arguments we know about
-		ARG_MONITOR_NETWORK_CONFIGURATION="true"	# by setting ARG_ script variables to their values
-		shift										# Then shift them out
-	elif [ "$1" = "-d" ] ; then
-		ARG_RESTORE_ON_DNS_RESET="true"
-		shift
-	elif [ "$1" = "-w" ] ; then
-		ARG_RESTORE_ON_WINS_RESET="true"
-		shift
-	elif [ "$1" = "-a" ] ; then
-		ARG_TAP="true"
-		shift
-	elif [ "${1:0:2}" = "-i" ] ; then
-		ARG_IGNORE_OPTION_FLAGS="${1}"
-		shift
-	elif [ "${1:0:2}" = "-a" ] ; then
-		ARG_IGNORE_OPTION_FLAGS="${1}"
-		shift
-	else
-		if [ "${1:0:1}" = "-" ] ; then				# Shift out Tunnelblick arguments (they start with "-") that we don't understand
-			shift									# so the rest of the script sees only the OpenVPN arguments
-		else
-			break
-		fi
-	fi
-done
-
-readonly ARG_MONITOR_NETWORK_CONFIGURATION ARG_RESTORE_ON_DNS_RESET ARG_RESTORE_ON_WINS_RESET ARG_TAP ARG_IGNORE_OPTION_FLAGS
-
-# Note: The script log path name is constructed from the path of the regular config file, not the shadow copy
-# if the config is shadow copy, e.g. /Library/Application Support/Tunnelblick/Users/Jonathan/Folder/Subfolder/config.ovpn
-# then convert to regular config     /Users/Jonathan/Library/Application Support/Tunnelblick/Configurations/Folder/Subfolder/config.ovpn
-#      to get the script log path
-# Note: "/Users/..." works even if the home directory has a different path; it is used in the name of the log file, and is not used as a path to get to anything.
-readonly TBALTPREFIX="/Library/Application Support/LEAP Client/Users/"
-readonly TBALTPREFIXLEN="${#TBALTPREFIX}"
-readonly TBCONFIGSTART="${config:0:$TBALTPREFIXLEN}"
-if [ "$TBCONFIGSTART" = "$TBALTPREFIX" ] ; then
-	readonly TBBASE="${config:$TBALTPREFIXLEN}"
-	readonly TBSUFFIX="${TBBASE#*/}"
-	readonly TBUSERNAME="${TBBASE%%/*}"
-	readonly TBCONFIG="/Users/$TBUSERNAME/Library/Application Support/LEAP Client/Configurations/$TBSUFFIX"
-else
-    readonly TBCONFIG="${config}"
-fi
-
-readonly CONFIG_PATH_DASHES_SLASHES="$(echo "${TBCONFIG}" | sed -e 's/-/--/g' | sed -e 's/\//-S/g')"
-
-# XXX PUT LOGS SOMEWHERE BETTER
-readonly SCRIPT_LOG_FILE="/Users/$LEAPUSER/.config/leap/logs/${CONFIG_PATH_DASHES_SLASHES}.script.log"
-readonly TB_RESOURCE_PATH=$(dirname "${0}")
-
-LEASEWATCHER_PLIST_PATH="/Users/$LEAPUSER/.config/leap/logs/LeaseWatch.plist"
-
-readonly OSVER="$(sw_vers | grep 'ProductVersion:' | grep -o '10\.[0-9]*')"
-
-readonly DEFAULT_DOMAIN_NAME="openvpn"
-
-bRouteGatewayIsDhcp="false"
-
-# @param String message - The message to log
-readonly LOG_MESSAGE_COMMAND=$(basename "${0}")
-logMessage()
-{
-	echo "$(date '+%a %b %e %T %Y') *LEAP Client $LOG_MESSAGE_COMMAND: "${@} >> "${SCRIPT_LOG_FILE}"
-}
-
-# @param String string - Content to trim
-trim()
-{
-	echo ${@}
-}
-
-# @param String[] dnsServers - The name servers to use
-# @param String domainName - The domain name to use
-# @param \optional String[] winsServers - The WINS servers to use
-setDnsServersAndDomainName()
-{
-	declare -a vDNS=("${!1}")
-	domain=$2
-	declare -a vWINS=("${!3}")
-	
-	set +e # "grep" will return error status (1) if no matches are found, so don't fail on individual errors
-	
-	PSID=$( (scutil | grep PrimaryService | sed -e 's/.*PrimaryService : //')<<- EOF
-		open
-		show State:/Network/Global/IPv4
-		quit
-EOF )
-	
-	STATIC_DNS_CONFIG="$( (scutil | sed -e 's/^[[:space:]]*[[:digit:]]* : //g' | tr '\n' ' ')<<- EOF
-		open
-		show Setup:/Network/Service/${PSID}/DNS
-		quit
-EOF )"
-	if echo "${STATIC_DNS_CONFIG}" | grep -q "ServerAddresses" ; then
-		readonly STATIC_DNS="$(trim "$( echo "${STATIC_DNS_CONFIG}" | sed -e 's/^.*ServerAddresses[^{]*{[[:space:]]*\([^}]*\)[[:space:]]*}.*$/\1/g' )")"
-	fi
-	if echo "${STATIC_DNS_CONFIG}" | grep -q "SearchDomains" ; then
-		readonly STATIC_SEARCH="$(trim "$( echo "${STATIC_DNS_CONFIG}" | sed -e 's/^.*SearchDomains[^{]*{[[:space:]]*\([^}]*\)[[:space:]]*}.*$/\1/g' )")"
-	fi
-	
-	STATIC_WINS_CONFIG="$( (scutil | sed -e 's/^[[:space:]]*[[:digit:]]* : //g' | tr '\n' ' ')<<- EOF
-		open
-		show Setup:/Network/Service/${PSID}/SMB
-		quit
-EOF )"
-    STATIC_WINS_SERVERS=""
-    STATIC_WORKGROUP=""
-    STATIC_NETBIOSNAME=""
-    if echo "${STATIC_WINS_CONFIG}" | grep -q "WINSAddresses" ; then
-        STATIC_WINS_SERVERS="$(trim "$( echo "${STATIC_WINS_CONFIG}" | sed -e 's/^.*WINSAddresses[^{]*{[[:space:]]*\([^}]*\)[[:space:]]*}.*$/\1/g' )")"
-    fi
-    if echo "${STATIC_WINS_CONFIG}" | grep -q "Workgroup" ; then
-        STATIC_WORKGROUP="$(trim "$( echo "${STATIC_WINS_CONFIG}" | sed -e 's/^.*Workgroup : \([^[:space:]]*\).*$/\1/g' )")"
-    fi
-    if echo "${STATIC_WINS_CONFIG}" | grep -q "NetBIOSName" ; then
-        STATIC_NETBIOSNAME="$(trim "$( echo "${STATIC_WINS_CONFIG}" | sed -e 's/^.*NetBIOSName : \([^[:space:]]*\).*$/\1/g' )")"
-    fi
-    readonly STATIC_WINS_SERVERS STATIC_WORKGROUP STATIC_NETBIOSNAME
-    
-	if [ ${#vDNS[*]} -eq 0 ] ; then
-		DYN_DNS="false"
-		ALL_DNS="${STATIC_DNS}"
-	elif [ -n "${STATIC_DNS}" ] ; then
-		case "${OSVER}" in
-			10.6 | 10.7 )
-				# Do nothing - in 10.6 we don't aggregate our configurations, apparently
-				DYN_DNS="false"
-				ALL_DNS="${STATIC_DNS}"
-				;;
-			10.4 | 10.5 )
-				DYN_DNS="true"
-				# We need to remove duplicate DNS entries, so that our reference list matches MacOSX's
-				SDNS="$(echo "${STATIC_DNS}" | tr ' ' '\n')"
-				(( i=0 ))
-				for n in "${vDNS[@]}" ; do
-					if echo "${SDNS}" | grep -q "${n}" ; then
-						unset vDNS[${i}]
-					fi
-					(( i++ ))
-				done
-				if [ ${#vDNS[*]} -gt 0 ] ; then
-					ALL_DNS="$(trim "${STATIC_DNS}" "${vDNS[*]}")"
-				else
-					DYN_DNS="false"
-					ALL_DNS="${STATIC_DNS}"
-				fi
-				;;
-		esac
-	else
-		DYN_DNS="true"
-		ALL_DNS="$(trim "${vDNS[*]}")"
-	fi
-	readonly DYN_DNS ALL_DNS
-
-	if [ ${#vWINS[*]} -eq 0 ] ; then
-		DYN_WINS="false"
-		ALL_WINS_SERVERS="${STATIC_WINS_SERVERS}"
-	elif [ -n "${STATIC_WINS_SERVERS}" ] ; then
-		case "${OSVER}" in
-			10.6 | 10.7 )
-				# Do nothing - in 10.6 we don't aggregate our configurations, apparently
-				DYN_WINS="false"
-				ALL_WINS_SERVERS="${STATIC_WINS_SERVERS}"
-				;;
-			10.4 | 10.5 )
-				DYN_WINS="true"
-				# We need to remove duplicate WINS entries, so that our reference list matches MacOSX's
-				SWINS="$(echo "${STATIC_WINS_SERVERS}" | tr ' ' '\n')"
-				(( i=0 ))
-				for n in "${vWINS[@]}" ; do
-					if echo "${SWINS}" | grep -q "${n}" ; then
-						unset vWINS[${i}]
-					fi
-					(( i++ ))
-				done
-				if [ ${#vWINS[*]} -gt 0 ] ; then
-					ALL_WINS_SERVERS="$(trim "${STATIC_WINS_SERVERS}" "${vWINS[*]}")"
-				else
-					DYN_WINS="false"
-					ALL_WINS_SERVERS="${STATIC_WINS_SERVERS}"
-				fi
-				;;
-		esac
-	else
-		DYN_WINS="true"
-		ALL_WINS_SERVERS="$(trim "${vWINS[*]}")"
-	fi
-	readonly DYN_WINS ALL_WINS_SERVERS
-
-	# We double-check that our search domain isn't already on the list
-	SEARCH_DOMAIN="${domain}"
-	case "${OSVER}" in
-		10.6 | 10.7 )
-			# Do nothing - in 10.6 we don't aggregate our configurations, apparently
-			if [ -n "${STATIC_SEARCH}" ] ; then
-				ALL_SEARCH="${STATIC_SEARCH}"
-				SEARCH_DOMAIN=""
-			else
-				ALL_SEARCH="${SEARCH_DOMAIN}"
-			fi
-			;;
-		10.4 | 10.5 )
-			if echo "${STATIC_SEARCH}" | tr ' ' '\n' | grep -q "${SEARCH_DOMAIN}" ; then
-				SEARCH_DOMAIN=""
-			fi
-			if [ -z "${SEARCH_DOMAIN}" ] ; then
-				ALL_SEARCH="${STATIC_SEARCH}"
-			else
-				ALL_SEARCH="$(trim "${STATIC_SEARCH}" "${SEARCH_DOMAIN}")"
-			fi
-			;;
-	esac
-	readonly SEARCH_DOMAIN ALL_SEARCH
-
-	if ! ${DYN_DNS} ; then
-		NO_DNS="#"
-	fi
-	if ! ${DYN_WINS} ; then
-		NO_WS="#"
-	fi
-	if [ -z "${SEARCH_DOMAIN}" ] ; then
-		NO_SEARCH="#"
-	fi
-	if [ -z "${STATIC_WORKGROUP}" ] ; then
-		NO_WG="#"
-	fi
-	if [ -z "${STATIC_NETBIOSNAME}" ] ; then
-		NO_NB="#"
-	fi
-	if [ -z "${ALL_DNS}" ] ; then
-		AGG_DNS="#"
-	fi
-	if [ -z "${ALL_SEARCH}" ] ; then
-		AGG_SEARCH="#"
-	fi
-	if [ -z "${ALL_WINS_SERVERS}" ] ; then
-		AGG_WINS="#"
-	fi
-	
-	# Now, do the aggregation
-	# Save the openvpn process ID and the Network Primary Service ID, leasewather.plist path, logfile path, and optional arguments from LEAP Client,
-	# then save old and new DNS and WINS settings
-	# PPID is a bash-script variable that contains the process ID of the parent of the process running the script (i.e., OpenVPN's process ID)
-	# config is an environmental variable set to the configuration path by OpenVPN prior to running this up script
-	logMessage "Up to two 'No such key' warnings are normal and may be ignored"
-	
-	# If DNS is manually set, it overrides the DHCP setting, which isn't reflected in 'State:/Network/Service/${PSID}/DNS'
-	if echo "${STATIC_DNS_CONFIG}" | grep -q "ServerAddresses" ; then
-		CORRECT_OLD_DNS_KEY="Setup:"
-	else
-		CORRECT_OLD_DNS_KEY="State:"
-	fi
-	
-	# If WINS is manually set, it overrides the DHCP setting, which isn't reflected in 'State:/Network/Service/${PSID}/DNS'
-	if echo "${STATIC_WINS_CONFIG}" | grep -q "WINSAddresses" ; then
-		CORRECT_OLD_WINS_KEY="Setup:"
-	else
-		CORRECT_OLD_WINS_KEY="State:"
-	fi
-	
-    # If we are not expecting any WINS value, add <LEAPClientNoSuchKey : true> to the expected WINS setup
-    NO_NOSUCH_KEY_WINS="#"
-    if [ "${NO_NB}" = "#" -a "${AGG_WINS}" = "#" -a "${NO_WG}" = "#" ] ; then
-        NO_NOSUCH_KEY_WINS=""
-    fi
-    readonly NO_NOSUCH_KEY_WINS
-    
-	set -e # We instruct bash that it CAN again fail on errors
-
-	scutil <<- EOF
-		open
-		d.init
-		d.add PID # ${PPID}
-		d.add Service ${PSID}
-		d.add LeaseWatcherPlistPath "${LEASEWATCHER_PLIST_PATH}"
-		d.add ScriptLogFile         "${SCRIPT_LOG_FILE}"
-		d.add MonitorNetwork        "${ARG_MONITOR_NETWORK_CONFIGURATION}"
-		d.add RestoreOnDNSReset     "${ARG_RESTORE_ON_DNS_RESET}"
-		d.add RestoreOnWINSReset    "${ARG_RESTORE_ON_WINS_RESET}"
-		d.add IgnoreOptionFlags     "${ARG_IGNORE_OPTION_FLAGS}"
-		d.add IsTapInterface        "${ARG_TAP}"
-		d.add RouteGatewayIsDhcp    "${bRouteGatewayIsDhcp}"
-		set State:/Network/OpenVPN
-		
-		# First, back up the device's current DNS and WINS configurations
-		# Indicate 'no such key' by a dictionary with a single entry: "LEAPClientNoSuchKey : true"
-		d.init
-		d.add LEAPClientNoSuchKey true
-		get ${CORRECT_OLD_DNS_KEY}/Network/Service/${PSID}/DNS
-		set State:/Network/OpenVPN/OldDNS
-		
-		d.init
-		d.add LEAPClientNoSuchKey true
-		get ${CORRECT_OLD_WINS_KEY}/Network/Service/${PSID}/SMB
-		set State:/Network/OpenVPN/OldSMB
-		
-		# Second, initialize the new DNS map
-		d.init
-		${NO_DNS}d.add ServerAddresses * ${vDNS[*]}
-		${NO_SEARCH}d.add SearchDomains * ${SEARCH_DOMAIN}
-		d.add DomainName ${domain}
-		set State:/Network/Service/${PSID}/DNS
-		
-		# Third, initialize the WINS map
-		d.init
-		${NO_NB}d.add NetBIOSName ${STATIC_NETBIOSNAME}
-		${NO_WS}d.add WINSAddresses * ${vWINS[*]}
-		${NO_WG}d.add Workgroup ${STATIC_WORKGROUP}
-		set State:/Network/Service/${PSID}/SMB
-		
-		# Now, initialize the maps that will be compared against the system-generated map
-		# which means that we will have to aggregate configurations of statically-configured
-		# nameservers, and statically-configured search domains
-		d.init
-		${AGG_DNS}d.add ServerAddresses * ${ALL_DNS}
-		${AGG_SEARCH}d.add SearchDomains * ${ALL_SEARCH}
-		d.add DomainName ${domain}
-		set State:/Network/OpenVPN/DNS
-		
-		d.init
-		${NO_NB}d.add NetBIOSName ${STATIC_NETBIOSNAME}
-		${AGG_WINS}d.add WINSAddresses * ${ALL_WINS_SERVERS}
-		${NO_WG}d.add Workgroup ${STATIC_WORKGROUP}
-        ${NO_NOSUCH_KEY_WINS}d.add LEAPClientNoSuchKey true
-		set State:/Network/OpenVPN/SMB
-		
-		# We are done
-		quit
-EOF
-	
-	logMessage "Saved the DNS and WINS configurations for later use"
-	
-	if ${ARG_MONITOR_NETWORK_CONFIGURATION} ; then
-        if [ "${ARG_IGNORE_OPTION_FLAGS:0:2}" = "-a" ] ; then
-            # Generate an updated plist with the path for process-network-changes
-            readonly LEASEWATCHER_TEMPLATE_PATH="$(dirname "${0}")/ProcessNetworkChanges.plist.template"
-            sed -e "s|\${DIR}|$(dirname "${0}")|g" "${LEASEWATCHER_TEMPLATE_PATH}" > "${LEASEWATCHER_PLIST_PATH}"
-            launchctl load "${LEASEWATCHER_PLIST_PATH}"
-            logMessage "Set up to monitor system configuration with process-network-changes"
-        else
-            # Generate an updated plist with the path for leasewatch
-            readonly LEASEWATCHER_TEMPLATE_PATH="$(dirname "${0}")/LeaseWatch.plist.template"
-            sed -e "s|\${DIR}|$(dirname "${0}")|g" "${LEASEWATCHER_TEMPLATE_PATH}" > "${LEASEWATCHER_PLIST_PATH}"
-            launchctl load "${LEASEWATCHER_PLIST_PATH}"
-            logMessage "Set up to monitor system configuration with leasewatch"
-        fi
-	fi
-}
-
-configureDhcpDns()
-{
-	# whilst ipconfig will have created the neccessary Network Service keys, the DNS
-	# settings won't actually be used by OS X unless the SupplementalMatchDomains key
-	# is added
-	# ref. <http://lists.apple.com/archives/Macnetworkprog/2005/Jun/msg00011.html>
-	# - is there a way to extract the domains from the SC dictionary and re-insert
-	#   as SupplementalMatchDomains? i.e. not requiring the ipconfig domain_name call?
-	
-	# - wait until we get a lease before extracting the DNS domain name and merging into SC
-	# - despite it's name, ipconfig waitall doesn't (but maybe one day it will :-)
-	ipconfig waitall
-	
-	unset test_domain_name
-	unset test_name_server
-	
-	set +e # We instruct bash NOT to exit on individual command errors, because if we need to wait longer these commands will fail
-	
-	# usually takes at least a few seconds to get a DHCP lease
-	sleep 3
-	n=0
-	while [ -z "$test_domain_name" -a -z "$test_name_server" -a $n -lt 5 ]
-	do
-		logMessage "Sleeping for $n seconds to wait for DHCP to finish setup."
-		sleep $n
-		n=`expr $n + 1`
-		
-		if [ -z "$test_domain_name" ]; then
-			test_domain_name=`ipconfig getoption $dev domain_name 2>/dev/null`
-		fi
-		
-		if [ -z "$test_name_server" ]; then
-			test_name_server=`ipconfig getoption $dev domain_name_server 2>/dev/null`
-		fi
-	done
-	
-	sGetPacketOutput=`ipconfig getpacket $dev`
-	
-	set -e # We instruct bash that it CAN again fail on individual errors
-	
-	#echo "`date` test_domain_name = $test_domain_name, test_name_server = $test_name_server, sGetPacketOutput = $sGetPacketOutput"
-	
-	unset aNameServers
-	unset aWinsServers
-	
-	nNameServerIndex=1
-	nWinsServerIndex=1
-	
-	if [ "$sGetPacketOutput" ]; then
-		sGetPacketOutput_FirstLine=`echo "$sGetPacketOutput"|head -n 1`
-		#echo $sGetPacketOutput_FirstLine
-		
-		if [ "$sGetPacketOutput_FirstLine" == "op = BOOTREPLY" ]; then
-			set +e # "grep" will return error status (1) if no matches are found, so don't fail on individual errors
-			
-			for tNameServer in `echo "$sGetPacketOutput"|grep "domain_name_server"|grep -Eo "\{([0-9\.]+)(, [0-9\.]+)*\}"|grep -Eo "([0-9\.]+)"`; do
-				aNameServers[nNameServerIndex-1]="$(trim "$tNameServer")"
-				let nNameServerIndex++
-			done
-			
-			for tWINSServer in `echo "$sGetPacketOutput"|grep "nb_over_tcpip_name_server"|grep -Eo "\{([0-9\.]+)(, [0-9\.]+)*\}"|grep -Eo "([0-9\.]+)"`; do
-				aWinsServers[nWinsServerIndex-1]="$(trim "$tWINSServer")"
-				let nWinsServerIndex++
-			done
-			
-			sDomainName=`echo "$sGetPacketOutput"|grep "domain_name "|grep -Eo ": [-A-Za-z0-9\-\.]+"|grep -Eo "[-A-Za-z0-9\-\.]+"`
-			sDomainName="$(trim "$sDomainName")"
-			
-			if [ ${#aNameServers[*]} -gt 0 -a "$sDomainName" ]; then
-				logMessage "Retrieved name server(s) [ ${aNameServers[@]} ], domain name [ $sDomainName ], and WINS server(s) [ ${aWinsServers[@]} ]"
-				setDnsServersAndDomainName aNameServers[@] "$sDomainName" aWinsServers[@]
-				return 0
-			elif [ ${#aNameServers[*]} -gt 0 ]; then
-				logMessage "Retrieved name server(s) [ ${aNameServers[@]} ] and WINS server(s) [ ${aWinsServers[@]} ] and using default domain name [ $DEFAULT_DOMAIN_NAME ]"
-				setDnsServersAndDomainName aNameServers[@] "$DEFAULT_DOMAIN_NAME" aWinsServers[@]
-				return 0
-			else
-				# Should we return 1 here and indicate an error, or attempt the old method?
-				logMessage "No useful information extracted from DHCP/BOOTP packet. Attempting legacy configuration."
-			fi
-			
-			set -e # We instruct bash that it CAN again fail on errors
-		else
-			# Should we return 1 here and indicate an error, or attempt the old method?
-			logMessage "No DHCP/BOOTP packet found on interface. Attempting legacy configuration."
-		fi
-	fi
-	
-	unset sDomainName
-	unset sNameServer
-	unset aNameServers
-	
-	sDomainName=`ipconfig getoption $dev domain_name 2>/dev/null`
-	sNameServer=`ipconfig getoption $dev domain_name_server 2>/dev/null`
-	
-	sDomainName="$(trim "$sDomainName")"
-	sNameServer="$(trim "$sNameServer")"
-	
-	declare -a aWinsServers=( ) # Declare empty WINS array to avoid any useless error messages
-	
-	if [ "$sDomainName" -a "$sNameServer" ]; then
-		aNameServers[0]=$sNameServer
-		logMessage "Retrieved name server [ $sNameServer ], domain name [ $sDomainName ], and no WINS servers"
-		setDnsServersAndDomainName aNameServers[@] "$sDomainName" aWinsServers[@]
-	elif [ "$sNameServer" ]; then
-		aNameServers[0]=$sNameServer
-		logMessage "Retrieved name server [ $sNameServer ] and no WINS servers, and using default domain name [ $DEFAULT_DOMAIN_NAME ]"
-		setDnsServersAndDomainName aNameServers[@] "$DEFAULT_DOMAIN_NAME" aWinsServers[@]
-	elif [ "$sDomainName" ]; then
-		logMessage "WARNING: Retrieved domain name [ $sDomainName ] but no name servers from OpenVPN (DHCP), which is not sufficient to make network/DNS configuration changes."
-		if ${ARG_MONITOR_NETWORK_CONFIGURATION} ; then
-			logMessage "Will NOT monitor for other network configuration changes."
-		fi
-	else
-		logMessage "WARNING: No DNS information received from OpenVPN (DHCP), so no network/DNS configuration changes need to be made."
-		if ${ARG_MONITOR_NETWORK_CONFIGURATION} ; then
-			logMessage "Will NOT monitor for other network configuration changes."
-		fi
-	fi
-	
-	return 0
-}
-
-configureOpenVpnDns()
-{
-	unset vForOptions
-	unset vOptions
-	unset aNameServers
-	unset aWinsServers
-	
-	nOptionIndex=1
-	nNameServerIndex=1
-	nWinsServerIndex=1
-
-	while vForOptions=foreign_option_$nOptionIndex; [ -n "${!vForOptions}" ]; do
-		vOptions[nOptionIndex-1]=${!vForOptions}
-		case ${vOptions[nOptionIndex-1]} in
-			*DOMAIN* )
-				sDomainName="$(trim "${vOptions[nOptionIndex-1]//dhcp-option DOMAIN /}")"
-				;;
-			*DNS*    )
-				aNameServers[nNameServerIndex-1]="$(trim "${vOptions[nOptionIndex-1]//dhcp-option DNS /}")"
-				let nNameServerIndex++
-				;;
-			*WINS*   )
-				aWinsServers[nWinsServerIndex-1]="$(trim "${vOptions[nOptionIndex-1]//dhcp-option WINS /}")"
-				let nWinsServerIndex++
-				;;
-            *   )
-                logMessage "Unknown: 'foreign_option_${nOptionIndex}' = '${vOptions[nOptionIndex-1]}'"
-                ;;
-		esac
-		let nOptionIndex++
-	done
-	
-	if [ ${#aNameServers[*]} -gt 0 -a "$sDomainName" ]; then
-		logMessage "Retrieved name server(s) [ ${aNameServers[@]} ], domain name [ $sDomainName ], and WINS server(s) [ ${aWinsServers[@]} ]"
-		setDnsServersAndDomainName aNameServers[@] "$sDomainName" aWinsServers[@]
-	elif [ ${#aNameServers[*]} -gt 0 ]; then
-		logMessage "Retrieved name server(s) [ ${aNameServers[@]} ] and WINS server(s) [ ${aWinsServers[@]} ] and using default domain name [ $DEFAULT_DOMAIN_NAME ]"
-		setDnsServersAndDomainName aNameServers[@] "$DEFAULT_DOMAIN_NAME" aWinsServers[@]
-	else
-		# Should we maybe just return 1 here to indicate an error? Does this mean that something bad has happened?
-		logMessage "No DNS information recieved from OpenVPN, so no network configuration changes need to be made."
-		if ${ARG_MONITOR_NETWORK_CONFIGURATION} ; then
-			logMessage "Will NOT monitor for other network configuration changes."
-		fi
-	fi
-	
-	return 0
-}
-
-# We sleep here to allow time for OS X to process network settings
-sleep 2
-
-EXIT_CODE=0
-
-if ${ARG_TAP} ; then
-	# Still need to do: Look for route-gateway dhcp (TAP isn't always DHCP)
-	bRouteGatewayIsDhcp="false"
-	if [ -z "${route_vpn_gateway}" -o "$route_vpn_gateway" == "dhcp" -o "$route_vpn_gateway" == "DHCP" ]; then
-		bRouteGatewayIsDhcp="true"
-	fi
-	
-	if [ "$bRouteGatewayIsDhcp" == "true" ]; then
-		if [ -z "$dev" ]; then
-			logMessage "Cannot configure TAP interface for DHCP without \$dev being defined. Exiting."
-			exit 1
-		fi
-		
-		ipconfig set "$dev" DHCP
-		
-		configureDhcpDns &
-	elif [ "$foreign_option_1" == "" ]; then
-		logMessage "No network configuration changes need to be made."
-		if ${ARG_MONITOR_NETWORK_CONFIGURATION} ; then
-			logMessage "Will NOT monitor for other network configuration changes."
-		fi
-	else
-		configureOpenVpnDns
-		EXIT_CODE=$?
-	fi
-else
-	if [ "$foreign_option_1" == "" ]; then
-		logMessage "No network configuration changes need to be made."
-		if ${ARG_MONITOR_NETWORK_CONFIGURATION} ; then
-			logMessage "Will NOT monitor for other network configuration changes."
-		fi
-	else
-		configureOpenVpnDns
-		EXIT_CODE=$?
-	fi
-fi
-
-exit $EXIT_CODE
diff --git a/pkg/osx/install/install-leapc.sh b/pkg/osx/install/install-leapc.sh
deleted file mode 100755
index e47abb7c..00000000
--- a/pkg/osx/install/install-leapc.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-# Bitmask Installer Script.
-#
-# Copyright (C) 2013 LEAP Encryption Access Project
-#
-# This file is part of LEAP Client, as
-# available from http://leap.se/. This file is free software;
-# you can redistribute it and/or modify it under the terms of the GNU
-# General Public License (GPL) as published by the Free Software
-# Foundation, in version 2 as it comes in the "COPYING" file of the
-# LEAP Client distribution. LEAP Client is distributed in the
-# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
-#
-
-set -e
-
-destlibs=/opt/local/lib
-leapdir=/Applications/LEAP\ Client.app
-leaplibs=${leapdir}/Contents/MacOS
-tunstartup=/Library/StartupItems/tun/tun
-
-echo "Installing Bitmask in /Applications..."
-cp -r "LEAP Client.app" /Applications
-
-echo "Copying openvpn binary..."
-cp -r openvpn.leap /usr/bin 
-
-echo "Installing tun/tap drivers..."
-test -f $tunstartup && $tunstartup stop
-
-test -d /Library/Extensions || mkdir -p /Library/Extensions
-test -d /Library/StartupItems || mkdir -p /Library/StartupItems
-
-cp -r Extensions/* /Library/Extensions
-cp -r StartupItems/* /Library/StartupItems
-
-echo "Loading tun/tap kernel extension..."
-
-$tunstartup start
-
-echo "Installation Finished!"
diff --git a/pkg/osx/install/leap-installer.platypus b/pkg/osx/install/leap-installer.platypus
deleted file mode 100644
index 9150961e..00000000
--- a/pkg/osx/install/leap-installer.platypus
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>AcceptsFiles</key>
-	<true/>
-	<key>AcceptsText</key>
-	<false/>
-	<key>Authentication</key>
-	<true/>
-	<key>Author</key>
-	<string>Kali Yuga</string>
-	<key>BundledFiles</key>
-	<array/>
-	<key>Creator</key>
-	<string>Platypus-4.7</string>
-	<key>DeclareService</key>
-	<false/>
-	<key>Destination</key>
-	<string>MyPlatypusApp.app</string>
-	<key>DestinationOverride</key>
-	<false/>
-	<key>DevelopmentVersion</key>
-	<false/>
-	<key>DocIcon</key>
-	<string></string>
-	<key>Droppable</key>
-	<false/>
-	<key>ExecutablePath</key>
-	<string>/opt/local/share/platypus/ScriptExec</string>
-	<key>FileTypes</key>
-	<array>
-		<string>****</string>
-		<string>fold</string>
-	</array>
-	<key>IconPath</key>
-	<string></string>
-	<key>Identifier</key>
-	<string>se.leap.LEAPClientInstaller</string>
-	<key>Interpreter</key>
-	<string>/bin/sh</string>
-	<key>InterpreterArgs</key>
-	<array/>
-	<key>Name</key>
-	<string>LEAPClient Installer</string>
-	<key>NibPath</key>
-	<string>/opt/local/share/platypus/MainMenu.nib</string>
-	<key>OptimizeApplication</key>
-	<true/>
-	<key>Output</key>
-	<string>Progress Bar</string>
-	<key>RemainRunning</key>
-	<true/>
-	<key>Role</key>
-	<string>Viewer</string>
-	<key>ScriptArgs</key>
-	<array/>
-	<key>ScriptPath</key>
-	<string>./install/install-leapc.sh</string>
-	<key>Secure</key>
-	<false/>
-	<key>ShowInDock</key>
-	<false/>
-	<key>StatusItemDisplayType</key>
-	<string>Text</string>
-	<key>StatusItemIcon</key>
-	<data>
-	</data>
-	<key>StatusItemTitle</key>
-	<string>MyPlatypusApp</string>
-	<key>Suffixes</key>
-	<array>
-		<string>*</string>
-	</array>
-	<key>TextBackground</key>
-	<string>#ffffff</string>
-	<key>TextEncoding</key>
-	<integer>4</integer>
-	<key>TextFont</key>
-	<string>Monaco</string>
-	<key>TextForeground</key>
-	<string>#000000</string>
-	<key>TextSize</key>
-	<real>10</real>
-	<key>UseXMLPlistFormat</key>
-	<true/>
-	<key>Version</key>
-	<string>1.0</string>
-</dict>
-</plist>
diff --git a/pkg/osx/pidfile.py b/pkg/osx/pidfile.py
new file mode 100644
index 00000000..4517ee0e
--- /dev/null
+++ b/pkg/osx/pidfile.py
@@ -0,0 +1,67 @@
+# -*- coding: utf-8 -*-
+
+# daemon/pidfile.py
+# Part of ‘python-daemon’, an implementation of PEP 3143.
+#
+# Copyright © 2008–2015 Ben Finney <ben+python@benfinney.id.au>
+#
+# This is free software: you may copy, modify, and/or distribute this work
+# under the terms of the Apache License, version 2.0 as published by the
+# Apache Software Foundation.
+# No warranty expressed or implied. See the file ‘LICENSE.ASF-2’ for details.
+
+""" Lockfile behaviour implemented via Unix PID files.
+    """
+
+from __future__ import (absolute_import, unicode_literals)
+
+from lockfile.pidlockfile import PIDLockFile
+
+
+class TimeoutPIDLockFile(PIDLockFile, object):
+    """ Lockfile with default timeout, implemented as a Unix PID file.
+
+        This uses the ``PIDLockFile`` implementation, with the
+        following changes:
+
+        * The `acquire_timeout` parameter to the initialiser will be
+          used as the default `timeout` parameter for the `acquire`
+          method.
+
+        """
+
+    def __init__(self, path, acquire_timeout=None, *args, **kwargs):
+        """ Set up the parameters of a TimeoutPIDLockFile.
+
+            :param path: Filesystem path to the PID file.
+            :param acquire_timeout: Value to use by default for the
+                `acquire` call.
+            :return: ``None``.
+
+            """
+        self.acquire_timeout = acquire_timeout
+        super(TimeoutPIDLockFile, self).__init__(path, *args, **kwargs)
+
+    def acquire(self, timeout=None, *args, **kwargs):
+        """ Acquire the lock.
+
+            :param timeout: Specifies the timeout; see below for valid
+                values.
+            :return: ``None``.
+
+            The `timeout` defaults to the value set during
+            initialisation with the `acquire_timeout` parameter. It is
+            passed to `PIDLockFile.acquire`; see that method for
+            details.
+
+            """
+        if timeout is None:
+            timeout = self.acquire_timeout
+        super(TimeoutPIDLockFile, self).acquire(timeout, *args, **kwargs)
+
+
+# Local variables:
+# coding: utf-8
+# mode: python
+# End:
+# vim: fileencoding=utf-8 filetype=python :
diff --git a/pkg/osx/post-inst.sh b/pkg/osx/post-inst.sh
new file mode 100755
index 00000000..2fc719f0
--- /dev/null
+++ b/pkg/osx/post-inst.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# Post-Instalation script
+
+cp se.leap.bitmask-helper.plist /Library/LaunchDaemons/
+launchctl load /Library/LaunchDaemons/se.leap.bitmask-helper.plist
diff --git a/pkg/osx/pre-inst.sh b/pkg/osx/pre-inst.sh
new file mode 100755
index 00000000..b6d17f20
--- /dev/null
+++ b/pkg/osx/pre-inst.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+launchctl unload /Library/LaunchDaemons/se.leap.bitmask-helper.plist
diff --git a/pkg/osx/runner.py b/pkg/osx/runner.py
new file mode 100644
index 00000000..6973cf1c
--- /dev/null
+++ b/pkg/osx/runner.py
@@ -0,0 +1,324 @@
+# -*- coding: utf-8 -*-
+
+# daemon/runner.py
+# Part of ‘python-daemon’, an implementation of PEP 3143.
+#
+# Copyright © 2009–2015 Ben Finney <ben+python@benfinney.id.au>
+# Copyright © 2007–2008 Robert Niederreiter, Jens Klein
+# Copyright © 2003 Clark Evans
+# Copyright © 2002 Noah Spurrier
+# Copyright © 2001 Jürgen Hermann
+#
+# This is free software: you may copy, modify, and/or distribute this work
+# under the terms of the Apache License, version 2.0 as published by the
+# Apache Software Foundation.
+# No warranty expressed or implied. See the file ‘LICENSE.ASF-2’ for details.
+
+""" Daemon runner library.
+    """
+
+from __future__ import (absolute_import, unicode_literals)
+
+import sys
+import os
+import signal
+import errno
+try:
+    # Python 3 standard library.
+    ProcessLookupError
+except NameError:
+    # No such class in Python 2.
+    ProcessLookupError = NotImplemented
+
+import lockfile
+
+from . import pidfile
+from .daemon import (basestring, unicode)
+from .daemon import DaemonContext
+from .daemon import _chain_exception_from_existing_exception_context
+
+
+class DaemonRunnerError(Exception):
+    """ Abstract base class for errors from DaemonRunner. """
+
+    def __init__(self, *args, **kwargs):
+        self._chain_from_context()
+
+        super(DaemonRunnerError, self).__init__(*args, **kwargs)
+
+    def _chain_from_context(self):
+        _chain_exception_from_existing_exception_context(self, as_cause=True)
+
+
+class DaemonRunnerInvalidActionError(DaemonRunnerError, ValueError):
+    """ Raised when specified action for DaemonRunner is invalid. """
+
+    def _chain_from_context(self):
+        # This exception is normally not caused by another.
+        _chain_exception_from_existing_exception_context(self, as_cause=False)
+
+
+class DaemonRunnerStartFailureError(DaemonRunnerError, RuntimeError):
+    """ Raised when failure starting DaemonRunner. """
+
+
+class DaemonRunnerStopFailureError(DaemonRunnerError, RuntimeError):
+    """ Raised when failure stopping DaemonRunner. """
+
+
+class DaemonRunner:
+    """ Controller for a callable running in a separate background process.
+
+        The first command-line argument is the action to take:
+
+        * 'start': Become a daemon and call `app.run()`.
+        * 'stop': Exit the daemon process specified in the PID file.
+        * 'restart': Stop, then start.
+
+        """
+
+    __metaclass__ = type
+
+    start_message = "started with pid {pid:d}"
+
+    def __init__(self, app):
+        """ Set up the parameters of a new runner.
+
+            :param app: The application instance; see below.
+            :return: ``None``.
+
+            The `app` argument must have the following attributes:
+
+            * `stdin_path`, `stdout_path`, `stderr_path`: Filesystem paths
+              to open and replace the existing `sys.stdin`, `sys.stdout`,
+              `sys.stderr`.
+
+            * `pidfile_path`: Absolute filesystem path to a file that will
+              be used as the PID file for the daemon. If ``None``, no PID
+              file will be used.
+
+            * `pidfile_timeout`: Used as the default acquisition timeout
+              value supplied to the runner's PID lock file.
+
+            * `run`: Callable that will be invoked when the daemon is
+              started.
+
+            """
+        self.parse_args()
+        self.app = app
+        self.daemon_context = DaemonContext()
+        self.daemon_context.stdin = open(app.stdin_path, 'rt')
+        self.daemon_context.stdout = open(app.stdout_path, 'w+t')
+        self.daemon_context.stderr = open(
+                app.stderr_path, 'w+t', buffering=0)
+
+        self.pidfile = None
+        if app.pidfile_path is not None:
+            self.pidfile = make_pidlockfile(
+                    app.pidfile_path, app.pidfile_timeout)
+        self.daemon_context.pidfile = self.pidfile
+
+    def _usage_exit(self, argv):
+        """ Emit a usage message, then exit.
+
+            :param argv: The command-line arguments used to invoke the
+                program, as a sequence of strings.
+            :return: ``None``.
+
+            """
+        progname = os.path.basename(argv[0])
+        usage_exit_code = 2
+        action_usage = "|".join(self.action_funcs.keys())
+        message = "usage: {progname} {usage}".format(
+                progname=progname, usage=action_usage)
+        emit_message(message)
+        sys.exit(usage_exit_code)
+
+    def parse_args(self, argv=None):
+        """ Parse command-line arguments.
+
+            :param argv: The command-line arguments used to invoke the
+                program, as a sequence of strings.
+
+            :return: ``None``.
+
+            The parser expects the first argument as the program name, the
+            second argument as the action to perform.
+
+            If the parser fails to parse the arguments, emit a usage
+            message and exit the program.
+
+            """
+        if argv is None:
+            argv = sys.argv
+
+        min_args = 2
+        if len(argv) < min_args:
+            self._usage_exit(argv)
+
+        self.action = unicode(argv[1])
+        if self.action not in self.action_funcs:
+            self._usage_exit(argv)
+
+    def _start(self):
+        """ Open the daemon context and run the application.
+
+            :return: ``None``.
+            :raises DaemonRunnerStartFailureError: If the PID file cannot
+                be locked by this process.
+
+            """
+        if is_pidfile_stale(self.pidfile):
+            self.pidfile.break_lock()
+
+        try:
+            self.daemon_context.open()
+        except lockfile.AlreadyLocked:
+            error = DaemonRunnerStartFailureError(
+                    "PID file {pidfile.path!r} already locked".format(
+                        pidfile=self.pidfile))
+            raise error
+
+        pid = os.getpid()
+        message = self.start_message.format(pid=pid)
+        emit_message(message)
+
+        self.app.run()
+
+    def _terminate_daemon_process(self):
+        """ Terminate the daemon process specified in the current PID file.
+
+            :return: ``None``.
+            :raises DaemonRunnerStopFailureError: If terminating the daemon
+                fails with an OS error.
+
+            """
+        pid = self.pidfile.read_pid()
+        try:
+            os.kill(pid, signal.SIGTERM)
+        except OSError as exc:
+            error = DaemonRunnerStopFailureError(
+                    "Failed to terminate {pid:d}: {exc}".format(
+                        pid=pid, exc=exc))
+            raise error
+
+    def _stop(self):
+        """ Exit the daemon process specified in the current PID file.
+
+            :return: ``None``.
+            :raises DaemonRunnerStopFailureError: If the PID file is not
+                already locked.
+
+            """
+        if not self.pidfile.is_locked():
+            error = DaemonRunnerStopFailureError(
+                    "PID file {pidfile.path!r} not locked".format(
+                        pidfile=self.pidfile))
+            raise error
+
+        if is_pidfile_stale(self.pidfile):
+            self.pidfile.break_lock()
+        else:
+            self._terminate_daemon_process()
+
+    def _restart(self):
+        """ Stop, then start.
+            """
+        self._stop()
+        self._start()
+
+    action_funcs = {
+            'start': _start,
+            'stop': _stop,
+            'restart': _restart,
+            }
+
+    def _get_action_func(self):
+        """ Get the function for the specified action.
+
+            :return: The function object corresponding to the specified
+                action.
+            :raises DaemonRunnerInvalidActionError: if the action is
+               unknown.
+
+            The action is specified by the `action` attribute, which is set
+            during `parse_args`.
+
+            """
+        try:
+            func = self.action_funcs[self.action]
+        except KeyError:
+            error = DaemonRunnerInvalidActionError(
+                    "Unknown action: {action!r}".format(
+                        action=self.action))
+            raise error
+        return func
+
+    def do_action(self):
+        """ Perform the requested action.
+
+            :return: ``None``.
+
+            The action is specified by the `action` attribute, which is set
+            during `parse_args`.
+
+            """
+        func = self._get_action_func()
+        func(self)
+
+
+def emit_message(message, stream=None):
+    """ Emit a message to the specified stream (default `sys.stderr`). """
+    if stream is None:
+        stream = sys.stderr
+    stream.write("{message}\n".format(message=message))
+    stream.flush()
+
+
+def make_pidlockfile(path, acquire_timeout):
+    """ Make a PIDLockFile instance with the given filesystem path. """
+    if not isinstance(path, basestring):
+        error = ValueError("Not a filesystem path: {path!r}".format(
+                path=path))
+        raise error
+    if not os.path.isabs(path):
+        error = ValueError("Not an absolute path: {path!r}".format(
+                path=path))
+        raise error
+    lockfile = pidfile.TimeoutPIDLockFile(path, acquire_timeout)
+
+    return lockfile
+
+
+def is_pidfile_stale(pidfile):
+    """ Determine whether a PID file is stale.
+
+        :return: ``True`` iff the PID file is stale; otherwise ``False``.
+
+        The PID file is “stale” if its contents are valid but do not
+        match the PID of a currently-running process.
+
+        """
+    result = False
+
+    pidfile_pid = pidfile.read_pid()
+    if pidfile_pid is not None:
+        try:
+            os.kill(pidfile_pid, signal.SIG_DFL)
+        except ProcessLookupError:
+            # The specified PID does not exist.
+            result = True
+        except OSError as exc:
+            if exc.errno == errno.ESRCH:
+                # Under Python 2, process lookup error is an OSError.
+                # The specified PID does not exist.
+                result = True
+
+    return result
+
+
+# Local variables:
+# coding: utf-8
+# mode: python
+# End:
+# vim: fileencoding=utf-8 filetype=python :
diff --git a/pkg/osx/se.leap.bitmask-helper.plist b/pkg/osx/se.leap.bitmask-helper.plist
new file mode 100644
index 00000000..4428f131
--- /dev/null
+++ b/pkg/osx/se.leap.bitmask-helper.plist
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>StandardOutPath</key>
+	<string>bitmask-helper.log</string>
+	<key>StandardErrorPath</key>
+	<string>bitmask-helper-err.log</string>
+	<key>GroupName</key>
+	<string>daemon</string>
+	<key>KeepAlive</key>
+	<dict>
+		<key>SuccessfulExit</key>
+		<false/>
+	</dict>
+	<key>Label</key>
+	<string>se.leap.bitmask-helper</string>
+	<key>ProgramArguments</key>
+	<array>
+		<string>/Applications/Bitmask.app/Contents/Resources/bitmask-helper/bitmask-helper</string>
+	</array>
+	<key>RunAtLoad</key>
+	<true/>
+	<key>WorkingDirectory</key>
+	<string>/Applications/Bitmask.app/Contents/Resources/bitmask-helper/</string>
+	<key>SessionCreate</key>
+	<true/>
+</dict>
+</plist>
diff --git a/pkg/pyinst/bitmask.spec.orig b/pkg/pyinst/bitmask.spec.orig
new file mode 100644
index 00000000..617104b9
--- /dev/null
+++ b/pkg/pyinst/bitmask.spec.orig
@@ -0,0 +1,38 @@
+# -*- mode: python -*-
+
+block_cipher = None
+
+
+a = Analysis([os.path.join('bitmask.py')],
+             hiddenimports=[
+	     	'zope.interface', 'zope.proxy',
+		'PySide.QtCore', 'PySide.QtGui'],
+             hookspath=None,
+             runtime_hooks=None,
+             excludes=None,
+             cipher=block_cipher)
+pyz = PYZ(a.pure,
+             cipher=block_cipher)
+exe = EXE(pyz,
+          a.scripts,
+          exclude_binaries=True,
+          name='bitmask',
+          debug=False,
+          strip=False,
+          upx=True,
+          console=False )
+coll = COLLECT(exe,
+               a.binaries,
+               a.zipfiles,
+               a.datas,
+               strip=False,
+               upx=True,
+               name='bitmask')
+if sys.platform.startswith("darwin"):
+	app = BUNDLE(coll,
+		     name=os.path.join(
+		      'dist', 'Bitmask.app'),
+                     appname='Bitmask',
+                     version='0.9.0rc2',
+		     icon='pkg/osx/bitmask.icns',
+		     bundle_identifier='bitmask-0.9.0rc2')
diff --git a/pkg/pyinst/cryptography/osrandom_engine.c b/pkg/pyinst/cryptography/osrandom_engine.c
new file mode 100644
index 00000000..27894712
--- /dev/null
+++ b/pkg/pyinst/cryptography/osrandom_engine.c
@@ -0,0 +1,167 @@
+static const char *Cryptography_osrandom_engine_id = "osrandom";
+static const char *Cryptography_osrandom_engine_name = "osrandom_engine";
+
+#if defined(_WIN32)
+static HCRYPTPROV hCryptProv = 0;
+
+static int osrandom_init(ENGINE *e) {
+    if (hCryptProv > 0) {
+        return 1;
+    }
+    if (CryptAcquireContext(&hCryptProv, NULL, NULL,
+                            PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) {
+        return 1;
+    } else {
+        return 0;
+    }
+}
+
+static int osrandom_rand_bytes(unsigned char *buffer, int size) {
+    if (hCryptProv == 0) {
+        return 0;
+    }
+
+    if (!CryptGenRandom(hCryptProv, (DWORD)size, buffer)) {
+        ERR_put_error(
+            ERR_LIB_RAND, 0, ERR_R_RAND_LIB, "osrandom_engine.py", 0
+        );
+        return 0;
+    }
+    return 1;
+}
+
+static int osrandom_finish(ENGINE *e) {
+    if (CryptReleaseContext(hCryptProv, 0)) {
+        hCryptProv = 0;
+        return 1;
+    } else {
+        return 0;
+    }
+}
+
+static int osrandom_rand_status(void) {
+    if (hCryptProv == 0) {
+        return 0;
+    } else {
+        return 1;
+    }
+}
+#else
+static int urandom_fd = -1;
+
+static int osrandom_finish(ENGINE *e);
+
+static int osrandom_init(ENGINE *e) {
+    if (urandom_fd > -1) {
+        return 1;
+    }
+    urandom_fd = open("/dev/urandom", O_RDONLY);
+    if (urandom_fd > -1) {
+        int flags = fcntl(urandom_fd, F_GETFD);
+        if (flags == -1) {
+            osrandom_finish(e);
+            return 0;
+        } else if (fcntl(urandom_fd, F_SETFD, flags | FD_CLOEXEC) == -1) {
+            osrandom_finish(e);
+            return 0;
+        }
+        return 1;
+    } else {
+        return 0;
+    }
+}
+
+static int osrandom_rand_bytes(unsigned char *buffer, int size) {
+    ssize_t n;
+    while (size > 0) {
+        do {
+            n = read(urandom_fd, buffer, (size_t)size);
+        } while (n < 0 && errno == EINTR);
+        if (n <= 0) {
+            ERR_put_error(
+                ERR_LIB_RAND, 0, ERR_R_RAND_LIB, "osrandom_engine.py", 0
+            );
+            return 0;
+        }
+        buffer += n;
+        size -= n;
+    }
+    return 1;
+}
+
+static int osrandom_finish(ENGINE *e) {
+    int n;
+    do {
+        n = close(urandom_fd);
+    } while (n < 0 && errno == EINTR);
+    urandom_fd = -1;
+    if (n < 0) {
+        return 0;
+    } else {
+        return 1;
+    }
+}
+
+static int osrandom_rand_status(void) {
+    if (urandom_fd == -1) {
+        return 0;
+    } else {
+        return 1;
+    }
+}
+#endif
+
+/* This replicates the behavior of the OpenSSL FIPS RNG, which returns a
+   -1 in the event that there is an error when calling RAND_pseudo_bytes. */
+static int osrandom_pseudo_rand_bytes(unsigned char *buffer, int size) {
+    int res = osrandom_rand_bytes(buffer, size);
+    if (res == 0) {
+        return -1;
+    } else {
+        return res;
+    }
+}
+
+static RAND_METHOD osrandom_rand = {
+    NULL,
+    osrandom_rand_bytes,
+    NULL,
+    NULL,
+    osrandom_pseudo_rand_bytes,
+    osrandom_rand_status,
+};
+
+/* Returns 1 if successfully added, 2 if engine has previously been added,
+   and 0 for error. */
+int Cryptography_add_osrandom_engine(void) {
+    ENGINE *e;
+    e = ENGINE_by_id(Cryptography_osrandom_engine_id);
+    if (e != NULL) {
+        ENGINE_free(e);
+        return 2;
+    } else {
+        ERR_clear_error();
+    }
+
+    e = ENGINE_new();
+    if (e == NULL) {
+        return 0;
+    }
+    if(!ENGINE_set_id(e, Cryptography_osrandom_engine_id) ||
+            !ENGINE_set_name(e, Cryptography_osrandom_engine_name) ||
+            !ENGINE_set_RAND(e, &osrandom_rand) ||
+            !ENGINE_set_init_function(e, osrandom_init) ||
+            !ENGINE_set_finish_function(e, osrandom_finish)) {
+        ENGINE_free(e);
+        return 0;
+    }
+    if (!ENGINE_add(e)) {
+        ENGINE_free(e);
+        return 0;
+    }
+    if (!ENGINE_free(e)) {
+        return 0;
+    }
+
+    return 1;
+}
diff --git a/pkg/pyinst/cryptography/osrandom_engine.h b/pkg/pyinst/cryptography/osrandom_engine.h
new file mode 100644
index 00000000..11a3159e
--- /dev/null
+++ b/pkg/pyinst/cryptography/osrandom_engine.h
@@ -0,0 +1,6 @@
+#ifdef _WIN32
+#include <Wincrypt.h>
+#else
+#include <fcntl.h>
+#include <unistd.h>
+#endif
diff --git a/src/leap/bitmask/_components.py b/src/leap/bitmask/_components.py
index 9d6f3f59..9be0e6bc 100644
--- a/src/leap/bitmask/_components.py
+++ b/src/leap/bitmask/_components.py
@@ -2,5 +2,5 @@
 Enabled Modules in Bitmask.
 Change these values for builds of the client with only one module enabled.
 """
-HAS_EIP = False
+HAS_EIP = True
 HAS_MAIL = True
diff --git a/src/leap/bitmask/backend/components.py b/src/leap/bitmask/backend/components.py
index 03a92c88..acb562c7 100644
--- a/src/leap/bitmask/backend/components.py
+++ b/src/leap/bitmask/backend/components.py
@@ -647,7 +647,7 @@ class EIP(object):
         :param domain: the domain for the provider to check
         :type domain: str
         """
-        if not LinuxPolicyChecker.is_up():
+        if IS_LINUX and not LinuxPolicyChecker.is_up():
             logger.error("No polkit agent running.")
             return False
 
diff --git a/src/leap/bitmask/services/eip/darwinvpnlauncher.py b/src/leap/bitmask/services/eip/darwinvpnlauncher.py
index 17fc11c2..42d9576b 100644
--- a/src/leap/bitmask/services/eip/darwinvpnlauncher.py
+++ b/src/leap/bitmask/services/eip/darwinvpnlauncher.py
@@ -20,6 +20,7 @@ Darwin VPN launcher implementation.
 import commands
 import getpass
 import os
+import socket
 import sys
 
 from leap.bitmask.logs.utils import get_logger
@@ -34,17 +35,47 @@ class EIPNoTunKextLoaded(VPNLauncherException):
     pass
 
 
+class DarwinHelperCommand(object):
+
+    SOCKET_ADDR = '/tmp/bitmask-helper.socket'
+
+    def __init__(self):
+        pass
+
+    def _connect(self):
+        self._sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+        try:
+            self._sock.connect(self.SOCKET_ADDR)
+        except socket.error, msg:
+            raise RuntimeError(msg)
+
+    def send(self, cmd, args=''):
+        # TODO check cmd is in allowed list
+        self._connect()
+        sock = self._sock
+        data = ""
+        
+        command = cmd + ' ' + args + '/CMD'
+
+        try:
+            sock.sendall(command)
+            while '\n' not in data:
+                data += sock.recv(32)
+        finally:
+            sock.close()
+
+        return data
+
+
 class DarwinVPNLauncher(VPNLauncher):
     """
     VPN launcher for the Darwin Platform
     """
-    COCOASUDO = "cocoasudo"
-    # XXX need the good old magic translate for these strings
-    # (look for magic in 0.2.0 release)
-    SUDO_MSG = ("Bitmask needs administrative privileges to run "
-                "Encrypted Internet.")
-    INSTALL_MSG = ("\"Bitmask needs administrative privileges to install "
-                   "missing scripts and fix permissions.\"")
+    UP_SCRIPT = None
+    DOWN_SCRIPT = None
+
+    # TODO -- move this to bitmask-helper
+
 
     # Hardcode the installation path for OSX for security, openvpn is
     # run as root
@@ -56,14 +87,9 @@ class DarwinVPNLauncher(VPNLauncher):
         INSTALL_PATH_ESCAPED,)
     OPENVPN_BIN_PATH = "%s/Contents/Resources/%s" % (INSTALL_PATH,
                                                      OPENVPN_BIN)
-
-    UP_SCRIPT = "%s/client.up.sh" % (OPENVPN_PATH,)
-    DOWN_SCRIPT = "%s/client.down.sh" % (OPENVPN_PATH,)
-    OPENVPN_DOWN_PLUGIN = '%s/openvpn-down-root.so' % (OPENVPN_PATH,)
-
-    UPDOWN_FILES = (UP_SCRIPT, DOWN_SCRIPT, OPENVPN_DOWN_PLUGIN)
     OTHER_FILES = []
 
+    # TODO deprecate ------------------------------------------------
     @classmethod
     def cmd_for_missing_scripts(kls, frompath):
         """
@@ -87,7 +113,7 @@ class DarwinVPNLauncher(VPNLauncher):
         :returns: True if kext is loaded, False otherwise.
         :rtype: bool
         """
-        return bool(commands.getoutput('kextstat | grep "leap.tun"'))
+        return bool(commands.getoutput('kextstat | grep "foo.tun"'))
 
     @classmethod
     def _get_icon_path(kls):
@@ -101,6 +127,8 @@ class DarwinVPNLauncher(VPNLauncher):
 
         return os.path.join(resources_path, "bitmask.tiff")
 
+
+    # TODO deprecate ---------------------------------------------------------
     @classmethod
     def get_cocoasudo_ovpn_cmd(kls):
         """
@@ -120,6 +148,7 @@ class DarwinVPNLauncher(VPNLauncher):
 
         return kls.COCOASUDO, args
 
+    # TODO deprecate ---------------------------------------------------------
     @classmethod
     def get_cocoasudo_installmissing_cmd(kls):
         """
@@ -171,12 +200,6 @@ class DarwinVPNLauncher(VPNLauncher):
         # we use `super` in order to send the class to use
         command = super(DarwinVPNLauncher, kls).get_vpn_command(
             eipconfig, providerconfig, socket_host, socket_port, openvpn_verb)
-
-        cocoa, cargs = kls.get_cocoasudo_ovpn_cmd()
-        cargs.extend(command)
-        command = cargs
-        command.insert(0, cocoa)
-
         command.extend(['--setenv', "LEAPUSER", getpass.getuser()])
 
         return command
diff --git a/src/leap/bitmask/services/eip/vpnlauncher.py b/src/leap/bitmask/services/eip/vpnlauncher.py
index c48f857c..16dfd9cf 100644
--- a/src/leap/bitmask/services/eip/vpnlauncher.py
+++ b/src/leap/bitmask/services/eip/vpnlauncher.py
@@ -29,7 +29,7 @@ from leap.bitmask.config import flags
 from leap.bitmask.logs.utils import get_logger
 from leap.bitmask.backend.settings import Settings, GATEWAY_AUTOMATIC
 from leap.bitmask.config.providerconfig import ProviderConfig
-from leap.bitmask.platform_init import IS_LINUX
+from leap.bitmask.platform_init import IS_LINUX, IS_MAC
 from leap.bitmask.services.eip.eipconfig import EIPConfig, VPNGatewaySelector
 from leap.bitmask.util import force_eval
 from leap.common.check import leap_assert, leap_assert_type
@@ -286,8 +286,8 @@ class VPNLauncher(object):
         :rtype: list
         """
         # FIXME
-        # XXX remove method when we ditch UPDOWN in osx and win too
-        if IS_LINUX:
+        # XXX remove method when we ditch UPDOWN in win too
+        if IS_LINUX or IS_MAC:
             return []
         else:
             leap_assert(kls.UPDOWN_FILES is not None,
@@ -308,7 +308,7 @@ class VPNLauncher(object):
         """
         leap_assert(kls.OTHER_FILES is not None,
                     "Need to define OTHER_FILES for this particular "
-                    "auncher before calling this method")
+                    "launcher before calling this method")
         other = force_eval(kls.OTHER_FILES)
         file_exist = partial(_has_other_files, warn=False)
 
diff --git a/src/leap/bitmask/services/eip/vpnprocess.py b/src/leap/bitmask/services/eip/vpnprocess.py
index 586b50f5..6d18a599 100644
--- a/src/leap/bitmask/services/eip/vpnprocess.py
+++ b/src/leap/bitmask/services/eip/vpnprocess.py
@@ -23,6 +23,7 @@ import shutil
 import socket
 import subprocess
 import sys
+import time
 
 from itertools import chain, repeat
 
@@ -41,6 +42,7 @@ from leap.bitmask.config.providerconfig import ProviderConfig
 from leap.bitmask.logs.utils import get_logger
 from leap.bitmask.services.eip import get_vpn_launcher
 from leap.bitmask.services.eip import linuxvpnlauncher
+from leap.bitmask.services.eip import darwinvpnlauncher
 from leap.bitmask.services.eip.eipconfig import EIPConfig
 from leap.bitmask.services.eip.udstelnet import UDSTelnet
 from leap.bitmask.util import first, force_eval
@@ -145,7 +147,7 @@ class VPN(object):
     demand.
     """
     TERMINATE_MAXTRIES = 10
-    TERMINATE_WAIT = 1  # secs
+    TERMINATE_WAIT = 2  # secs
 
     OPENVPN_VERB = "openvpn_verb"
 
@@ -173,7 +175,7 @@ class VPN(object):
         :param kwargs: kwargs to be passed to the VPNProcess
         :type kwargs: dict
         """
-        logger.debug('VPN: start')
+        logger.debug('VPN: start ---------------------------------------------------')
         self._user_stopped = False
         self._stop_pollers()
         kwargs['openvpn_verb'] = self._openvpn_verb
@@ -181,22 +183,6 @@ class VPN(object):
 
         restart = kwargs.pop('restart', False)
 
-        # start the main vpn subprocess
-        vpnproc = VPNProcess(*args, **kwargs)
-
-        if vpnproc.get_openvpn_process():
-            logger.info("Another vpn process is running. Will try to stop it.")
-            vpnproc.stop_if_already_running()
-
-        # we try to bring the firewall up
-        if IS_LINUX:
-            gateways = vpnproc.getGateways()
-            firewall_up = self._launch_firewall(gateways,
-                                                restart=restart)
-            if not restart and not firewall_up:
-                logger.error("Could not bring firewall up, "
-                             "aborting openvpn launch.")
-                return
 
         # FIXME it would be good to document where the
         # errors here are catched, since we currently handle them
@@ -211,18 +197,56 @@ class VPN(object):
         # the ping-pong to the frontend, and without adding any logical checks
         # in the frontend. We should just communicate UI changes to frontend,
         # and abstract us away from anything else.
-        try:
+
+        # TODO factor this out to the platform-launchers
+
+        if IS_LINUX:
+            # start the main vpn subprocess
+            vpnproc = VPNProcess(*args, **kwargs)
             cmd = vpnproc.getCommand()
-        except Exception as e:
-            logger.error("Error while getting vpn command... {0!r}".format(e))
-            raise
+
+            if vpnproc.get_openvpn_process():
+                logger.info("Another vpn process is running. Will try to stop it.")
+                vpnproc.stop_if_already_running()
+
+            # we try to bring the firewall up
+            gateways = vpnproc.getGateways()
+            firewall_up = self._launch_firewall_linux(
+                gateways, restart=restart)
+            if not restart and not firewall_up:
+                logger.error("Could not bring firewall up, "
+                             "aborting openvpn launch.")
+                return
+
+        if IS_MAC:
+            # start the main vpn subprocess
+            vpnproc = VPNCanary(*args, **kwargs)
+
+            # we try to bring the firewall up
+            gateways = vpnproc.getGateways()
+            firewall_up = self._launch_firewall_osx(
+                gateways, restart=restart)
+            if not restart and not firewall_up:
+                logger.error("Could not bring firewall up, "
+                             "aborting openvpn launch.")
+                return
+
+            helper = darwinvpnlauncher.DarwinHelperCommand()
+            cmd = vpnproc.getVPNCommand()
+            result = helper.send('openvpn_start %s' % ' '.join(cmd))
+
+        # TODO Windows version -- should be similar to osx.
 
         env = os.environ
         for key, val in vpnproc.vpn_env.items():
             env[key] = val
 
-        reactor.spawnProcess(vpnproc, cmd[0], cmd, env)
+        cmd = vpnproc.getCommand()
+        running_proc = reactor.spawnProcess(vpnproc, cmd[0], cmd, env)
+        vpnproc.pid = running_proc.pid
         self._vpnproc = vpnproc
+        
+
 
         # add pollers for status and state
         # this could be extended to a collection of
@@ -233,9 +257,9 @@ class VPN(object):
         self._pollers.extend(poll_list)
         self._start_pollers()
 
-    def _launch_firewall(self, gateways, restart=False):
+    def _launch_firewall_linux(self, gateways, restart=False):
         """
-        Launch the firewall using the privileged wrapper.
+        Launch the firewall using the privileged wrapper (linux).
 
         :param gateways:
         :type gateways: list
@@ -254,40 +278,63 @@ class VPN(object):
         exitCode = subprocess.call(cmd + gateways)
         return True if exitCode is 0 else False
 
+    def _launch_firewall_osx(self, gateways, restart=False):
+        cmd = 'firewall_start %s' % ' '.join(gateways)
+        helper = darwinvpnlauncher.DarwinHelperCommand()
+        result = helper.send(cmd)
+        return True
+
+    # TODO -- write LINUX/OSX VERSION too ------------------------------------
     def is_fw_down(self):
         """
         Return whether the firewall is down or not.
 
         :rtype: bool
         """
-        BM_ROOT = force_eval(linuxvpnlauncher.LinuxVPNLauncher.BITMASK_ROOT)
-        fw_up_cmd = "pkexec {0} firewall isup".format(BM_ROOT)
-        fw_is_down = lambda: commands.getstatusoutput(fw_up_cmd)[0] == 256
-        return fw_is_down()
+        if IS_LINUX:
+            BM_ROOT = force_eval(linuxvpnlauncher.LinuxVPNLauncher.BITMASK_ROOT)
+            fw_up_cmd = "pkexec {0} firewall isup".format(BM_ROOT)
+            fw_is_down = lambda: commands.getstatusoutput(fw_up_cmd)[0] == 256
+            return fw_is_down()
+
+        if IS_MAC:
+            cmd = 'firewall_isup'
+            helper = darwinvpnlauncher.DarwinHelperCommand()
+            result = helper.send(cmd)
+            return True
+
 
     def tear_down_firewall(self):
         """
         Tear the firewall down using the privileged wrapper.
         """
         if IS_MAC:
-            # We don't support Mac so far
+            cmd = 'firewall_stop'
+            helper = darwinvpnlauncher.DarwinHelperCommand()
+            result = helper.send(cmd)
             return True
-        BM_ROOT = force_eval(linuxvpnlauncher.LinuxVPNLauncher.BITMASK_ROOT)
-        exitCode = subprocess.call(["pkexec",
-                                    BM_ROOT, "firewall", "stop"])
-        return True if exitCode is 0 else False
+
+        if IS_LINUX:
+            BM_ROOT = force_eval(linuxvpnlauncher.LinuxVPNLauncher.BITMASK_ROOT)
+            exitCode = subprocess.call(["pkexec",
+                                        BM_ROOT, "firewall", "stop"])
+            return True if exitCode is 0 else False
 
     def bitmask_root_vpn_down(self):
         """
         Bring openvpn down using the privileged wrapper.
         """
         if IS_MAC:
-            # We don't support Mac so far
+            cmd = 'openvpn_stop'
+            helper = darwinvpnlauncher.DarwinHelperCommand()
+            result = helper.send(cmd)
             return True
-        BM_ROOT = force_eval(linuxvpnlauncher.LinuxVPNLauncher.BITMASK_ROOT)
-        exitCode = subprocess.call(["pkexec",
-                                    BM_ROOT, "openvpn", "stop"])
-        return True if exitCode is 0 else False
+
+        if IS_LINUX:
+            BM_ROOT = force_eval(linuxvpnlauncher.LinuxVPNLauncher.BITMASK_ROOT)
+            exitCode = subprocess.call(["pkexec",
+                                        BM_ROOT, "openvpn", "stop"])
+            return True if exitCode is 0 else False
 
     def _kill_if_left_alive(self, tries=0):
         """
@@ -297,18 +344,18 @@ class VPN(object):
         :param tries: counter of tries, used in recursion
         :type tries: int
         """
+        # we try to tear the firewall down
+        if (IS_LINUX or IS_MAC) and self._user_stopped:
+            logger.debug('trying to bring firewall down...')
+            firewall_down = self.tear_down_firewall()
+            if firewall_down:
+                logger.debug("Firewall down")
+            else:
+                logger.warning("Could not tear firewall down")
+
         while tries < self.TERMINATE_MAXTRIES:
             if self._vpnproc.transport.pid is None:
                 logger.debug("Process has been happily terminated.")
-
-                # we try to tear the firewall down
-                if IS_LINUX and self._user_stopped:
-                    firewall_down = self.tear_down_firewall()
-                    if firewall_down:
-                        logger.debug("Firewall down")
-                    else:
-                        logger.warning("Could not tear firewall down")
-
                 return
             else:
                 logger.debug("Process did not die, waiting...")
@@ -813,6 +860,8 @@ class VPNProcess(protocol.ProcessProtocol, VPNManager):
     programmatically.
     """
 
+    pid = None
+
     def __init__(self, eipconfig, providerconfig, socket_host, socket_port,
                  signaler, openvpn_verb):
         """
@@ -861,7 +910,7 @@ class VPNProcess(protocol.ProcessProtocol, VPNManager):
         self._vpn_observer = VPNObserver(signaler)
         self.is_restart = False
 
-    # processProtocol methods
+    # ProcessProtocol methods
 
     def connectionMade(self):
         """
@@ -893,8 +942,11 @@ class VPNProcess(protocol.ProcessProtocol, VPNManager):
         .. seeAlso: `http://twistedmatrix.com/documents/13.0.0/api/twisted.internet.protocol.ProcessProtocol.html` # noqa
         """
         exit_code = reason.value.exitCode
+
         if isinstance(exit_code, int):
             logger.debug("processExited, status %d" % (exit_code,))
+        else:
+            exit_code = 0
         self._signaler.signal(
             self._signaler.eip_process_finished, exit_code)
         self._alive = False
@@ -976,3 +1028,41 @@ class VPNProcess(protocol.ProcessProtocol, VPNManager):
             self.transport.signalProcess('KILL')
         except internet_error.ProcessExitedAlready:
             logger.debug('Process Exited Already')
+
+
+class VPNCanary(VPNProcess):
+
+    """
+    This is a Canary Process that does not run openvpn itself, but it's
+    notified by the privileged process when the process dies.
+
+    This is an ugly workaround to allow the qt signals and the processprotocol
+    to live happily together until we refactor EIP out of the qt model
+    completely.
+    """
+
+    def connectionMade(self):
+        VPNProcess.connectionMade(self)
+        reactor.callLater(2, self.registerPID)
+
+    def registerPID(self):
+        helper = darwinvpnlauncher.DarwinHelperCommand()
+        cmd = 'openvpn_set_watcher %s' % self.pid
+        result = helper.send(cmd)
+
+    def killProcess(self):
+        helper = darwinvpnlauncher.DarwinHelperCommand()
+        cmd = 'openvpn_force_stop'
+        result = helper.send(cmd)
+
+    def getVPNCommand(self):
+        return VPNProcess.getCommand(self)
+
+    def getCommand(self):
+        canary = '''import sys, signal, time
+def receive_signal(signum, stack):
+    sys.exit()
+signal.signal(signal.SIGTERM, receive_signal)
+while True:
+    time.sleep(60)'''
+        return ['python', '-c', '%s' % canary]
author	Kali Kaneko <kali@leap.se>	2016-01-29 13:18:36 -0800
committer	Kali Kaneko <kali@leap.se>	2016-04-18 16:15:21 -0400
commit	e9e9abc4ec26be29b3a6b09e6a0b67786269183b (patch)
tree	698ffd51104e6d391957ba25e31e88a2bbced38a
parent	0bd65c1d3e6c5ee1d861122ec2cd617ad026de43 (diff)