Merge tag 'upstream/2.4.0'

Upstream version 2.4.0

1 files changed, 54 insertions, 48 deletions

diff --git a/sample/sample-plugins/simple/simple.c b/sample/sample-plugins/simple/simple.c
index f26d89f..f595333 100644
--- a/sample/sample-plugins/simple/simple.c
+++ b/sample/sample-plugins/simple/simple.c
@@ -5,7 +5,7 @@
  *             packet encryption, packet authentication, and
  *             packet compression.
  *
- *  Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sales@openvpn.net>
+ *  Copyright (C) 2002-2017 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
@@ -41,8 +41,8 @@
  * Our context, where we keep our state.
  */
 struct plugin_context {
-  const char *username;
-  const char *password;
+    const char *username;
+    const char *password;
 };
 
 /*
@@ -51,70 +51,76 @@ struct plugin_context {
  * if found or NULL otherwise.
  */
 static const char *
-get_env (const char *name, const char *envp[])
+get_env(const char *name, const char *envp[])
 {
-  if (envp)
+    if (envp)
     {
-      int i;
-      const int namelen = strlen (name);
-      for (i = 0; envp[i]; ++i)
-	{
-	  if (!strncmp (envp[i], name, namelen))
-	    {
-	      const char *cp = envp[i] + namelen;
-	      if (*cp == '=')
-		return cp + 1;
-	    }
-	}
+        int i;
+        const int namelen = strlen(name);
+        for (i = 0; envp[i]; ++i)
+        {
+            if (!strncmp(envp[i], name, namelen))
+            {
+                const char *cp = envp[i] + namelen;
+                if (*cp == '=')
+                {
+                    return cp + 1;
+                }
+            }
+        }
     }
-  return NULL;
+    return NULL;
 }
 
 OPENVPN_EXPORT openvpn_plugin_handle_t
-openvpn_plugin_open_v1 (unsigned int *type_mask, const char *argv[], const char *envp[])
+openvpn_plugin_open_v1(unsigned int *type_mask, const char *argv[], const char *envp[])
 {
-  struct plugin_context *context;
+    struct plugin_context *context;
 
-  /*
-   * Allocate our context
-   */
-  context = (struct plugin_context *) calloc (1, sizeof (struct plugin_context));
+    /*
+     * Allocate our context
+     */
+    context = (struct plugin_context *) calloc(1, sizeof(struct plugin_context));
 
-  /*
-   * Set the username/password we will require.
-   */
-  context->username = "foo";
-  context->password = "bar";
+    /*
+     * Set the username/password we will require.
+     */
+    context->username = "foo";
+    context->password = "bar";
 
-  /*
-   * We are only interested in intercepting the
-   * --auth-user-pass-verify callback.
-   */
-  *type_mask = OPENVPN_PLUGIN_MASK (OPENVPN_PLUGIN_AUTH_USER_PASS_VERIFY);
+    /*
+     * We are only interested in intercepting the
+     * --auth-user-pass-verify callback.
+     */
+    *type_mask = OPENVPN_PLUGIN_MASK(OPENVPN_PLUGIN_AUTH_USER_PASS_VERIFY);
 
-  return (openvpn_plugin_handle_t) context;
+    return (openvpn_plugin_handle_t) context;
 }
 
 OPENVPN_EXPORT int
-openvpn_plugin_func_v1 (openvpn_plugin_handle_t handle, const int type, const char *argv[], const char *envp[])
+openvpn_plugin_func_v1(openvpn_plugin_handle_t handle, const int type, const char *argv[], const char *envp[])
 {
-  struct plugin_context *context = (struct plugin_context *) handle;
+    struct plugin_context *context = (struct plugin_context *) handle;
 
-  /* get username/password from envp string array */
-  const char *username = get_env ("username", envp);
-  const char *password = get_env ("password", envp);
+    /* get username/password from envp string array */
+    const char *username = get_env("username", envp);
+    const char *password = get_env("password", envp);
 
-  /* check entered username/password against what we require */
-  if (username && !strcmp (username, context->username)
-      && password && !strcmp (password, context->password))
-    return OPENVPN_PLUGIN_FUNC_SUCCESS;
-  else
-    return OPENVPN_PLUGIN_FUNC_ERROR;
+    /* check entered username/password against what we require */
+    if (username && !strcmp(username, context->username)
+        && password && !strcmp(password, context->password))
+    {
+        return OPENVPN_PLUGIN_FUNC_SUCCESS;
+    }
+    else
+    {
+        return OPENVPN_PLUGIN_FUNC_ERROR;
+    }
 }
 
 OPENVPN_EXPORT void
-openvpn_plugin_close_v1 (openvpn_plugin_handle_t handle)
+openvpn_plugin_close_v1(openvpn_plugin_handle_t handle)
 {
-  struct plugin_context *context = (struct plugin_context *) handle;
-  free (context);
+    struct plugin_context *context = (struct plugin_context *) handle;
+    free(context);
 }