X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/eb6906a28c887872d459890ad05cbf8e07c97b75..0753f6fc9fbd507f6a44c60224c018008030f765:/garden.c

diff --git a/garden.c b/garden.c
index ca41d14..62f49a2 100644
--- a/garden.c
+++ b/garden.c
@@ -9,7 +9,7 @@
 
 /* walled garden */
 
-char const *cvs_id = "$Id: garden.c,v 1.14 2004-11-17 15:08:19 bodea Exp $";
+char const *cvs_id = "$Id: garden.c,v 1.16 2004-11-18 06:41:03 bodea Exp $";
 
 int plugin_api_version = PLUGIN_API_VERSION;
 static struct pluginfuncs *p = 0;
@@ -76,15 +76,15 @@ int plugin_kill_session(struct param_new_session *data)
 }
 
 char *plugin_control_help[] = {
-	"  garden USER|SID           Put user into the walled garden",
-	"  ungarden USER|SID         Release user from garden",
+	"  garden USER|SID                             Put user into the walled garden",
+	"  ungarden SID                                Release session from garden",
 	0
 };
 
 int plugin_control(struct param_control *data)
 {
-	sessionidt s;
-	sessiont *sess = 0;
+	sessionidt session;
+	sessiont *s = 0;
 	int flag;
 	char *end;
 
@@ -94,14 +94,10 @@ int plugin_control(struct param_control *data)
 	if (strcmp(data->argv[0], "garden") && strcmp(data->argv[0], "ungarden"))
 		return PLUGIN_RET_OK; // not for us
 
-	flag = data->argv[0][0] != 'u';
+	if (!iam_master)
+		return PLUGIN_RET_NOTMASTER;
 
-	if (!iam_master)	// All garden processing happens on the master.
-	{
-	    	data->response = NSCTL_RES_ERR;
-		data->additional = "must be run on the cluster master";
-		return PLUGIN_RET_STOP;
-	}
+	flag = data->argv[0][0] != 'u';
 
 	if (data->argc != 2)
 	{
@@ -111,7 +107,12 @@ int plugin_control(struct param_control *data)
 	}
 
 	if (!(session = strtol(data->argv[1], &end, 10)) || *end)
-		session = p->get_session_by_username(data->argv[1]);
+	{
+		if (flag)
+			session = p->get_session_by_username(data->argv[1]);
+		else
+			session = 0; // can't ungarden by username
+	}
 
 	if (session)
 		s = p->get_session_by_id(session);
@@ -131,7 +132,7 @@ int plugin_control(struct param_control *data)
 	}
 
 	garden_session(s, flag);
-	p->sesssion_changed(session);
+	p->session_changed(session);
 
 	data->response = NSCTL_RES_OK;
 	data->additional = 0;