Merge from Master

[l2tpns.git] / stripdomain.c

diff --git a/stripdomain.c b/stripdomain.c
index a7a3fb2..b536339 100644 (file)
--- a/stripdomain.c
+++ b/stripdomain.c
@@ -1,31 +1,33 @@
 #include <string.h>
+#include <linux/rtnetlink.h>
+#include <netinet/ip6.h>
+
+#include "dhcp6.h"
 #include "l2tpns.h"
 #include "plugin.h"
 
 /* strip domain part of username before sending RADIUS requests */
 
-char const *cvs_id = "$Id: stripdomain.c,v 1.7 2004-11-29 02:17:18 bodea Exp $";
-
 int plugin_api_version = PLUGIN_API_VERSION;
-static struct pluginfuncs *p = 0;
+static struct pluginfuncs *f = 0;
 
 int plugin_pre_auth(struct param_pre_auth *data)
 {
-       char *x;
+    char *p;
 
-       if (!data->continue_auth) return PLUGIN_RET_STOP;
+    if (!data->continue_auth) return PLUGIN_RET_STOP;
 
-       // Strip off @domain
-       if ((x = strchr(data->username, '@')))
-       {
-               p->log(3, 0, 0, "Stripping off trailing domain name \"%s\"\n", x);
-               *x = 0;
-       }
+    // Strip off @domain
+    if ((p = strchr(data->username, '@')))
+    {
+       f->log(3, 0, 0, "Stripping off trailing domain name \"%s\"\n", p);
+       *p = 0;
+    }
 
-       return PLUGIN_RET_OK;
+    return PLUGIN_RET_OK;
 }
 
 int plugin_init(struct pluginfuncs *funcs)
 {
-       return ((p = funcs)) ? 1 : 0;
+    return ((f = funcs)) ? 1 : 0;
 }