Merge tag 'upstream/2.3_rc1'

Upstream version 2.3_rc1

1 files changed, 0 insertions, 42 deletions

diff --git a/pushlist.h b/pushlist.h
deleted file mode 100644
index b252676..0000000
--- a/pushlist.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  OpenVPN -- An application to securely tunnel IP networks
- *             over a single TCP/UDP port, with support for SSL/TLS-based
- *             session authentication and key exchange,
- *             packet encryption, packet authentication, and
- *             packet compression.
- *
- *  Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sales@openvpn.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2
- *  as published by the Free Software Foundation.
- *
- *  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 (see the file COPYING included with this
- *  distribution); if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#if !defined(PUSHLIST_H) && P2MP && P2MP_SERVER
-#define PUSHLIST_H
-
-/* parameters to be pushed to peer */
-
-struct push_entry {
-  struct push_entry *next;
-  bool enable;
-  const char *option;
-};
-
-struct push_list {
-  struct push_entry *head;
-  struct push_entry *tail;
-};
-
-
-#endif