X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fmain.c;h=2ca053e11116f71673060c03f451685e8fc7c482;hb=a671f27ecb900f91bf32b8b13edb678009e319c1;hp=fadcd3a8d349cb4783ad79501c8c54a5ede3760a;hpb=544b54c409f3731b8e1581af95072a64ff393a28;p=matches%2FMCTX3420.git

diff --git a/server/main.c b/server/main.c
index fadcd3a..2ca053e 100644
--- a/server/main.c
+++ b/server/main.c
@@ -47,7 +47,7 @@ void ParseArguments(int argc, char ** argv)
 
 	g_options.auth_method = AUTH_NONE;  // Don't use authentication
 	g_options.auth_uri = ""; // 
-	g_options.ldap_base_dn = "";
+	g_options.auth_options = "";
 	g_options.experiment_dir = ".";
 	
 	for (int i = 1; i < argc; ++i)
@@ -72,14 +72,10 @@ void ParseArguments(int argc, char ** argv)
 			case 'p':
 				g_options.enable_pin = !(strtol(argv[++i], &end, 10));
 				break;
-			// LDAP URI
+			// Authentication URI and options
 			case 'A':
 				g_options.auth_uri = argv[++i];
 				break;
-			// LDAP DN
-			case 'd':
-				g_options.ldap_base_dn = argv[++i];
-				break;
 			case 'e':
 			// Experiments directory
 				g_options.experiment_dir = argv[++i];
@@ -93,12 +89,7 @@ void ParseArguments(int argc, char ** argv)
 			Fatal("argv[%d] -%c requires an integer (got \"%s\" instead)", i-1, argv[i-1][0], argv[i]);
 	}	
 
-	Log(LOGDEBUG, "Verbosity: %d", g_options.verbosity);
-	Log(LOGDEBUG, "Pin Module Enabled: %d", g_options.enable_pin);
-	Log(LOGDEBUG, "Auth URI: %s", g_options.auth_uri);
-	Log(LOGDEBUG, "LDAP Base DN: %s", g_options.ldap_base_dn);
-	//Log(LOGDEBUG, "Root directory: %s", g_options.root_dir);
-	Log(LOGDEBUG, "Experiment directory: %s", g_options.experiment_dir);
+
 
 	if (!DirExists(g_options.experiment_dir))
 	{
@@ -107,12 +98,58 @@ void ParseArguments(int argc, char ** argv)
 
 	if (g_options.auth_uri[0] != '\0')
 	{
-		//HACK...
-		if (PathExists(g_options.auth_uri))
-			g_options.auth_method = AUTH_SHADOW;
-		else
-			g_options.auth_method = AUTH_LDAP;
+		// Get the options part of the URI if it exists
+		char * c = (char*)g_options.auth_uri;
+		while (*(++c) != '\0' && *c != '#');
+		
+		if (*(c++) == '#')
+		{
+			*(c-1) = '\0';
+			g_options.auth_options = c;
+		}
+
+		// Use the first part of the URI to identify the protocol:
+		c = (char*)g_options.auth_uri;
+		while (*(++c) != '\0' && *c != ':');
+
+		if (*c == '\0') // No ':' means no protocol; use plaintext file
+		{
+			g_options.auth_method = AUTH_SHADOW;			
+		}
+		else if (*c == ':' && *(c+1) == '/' && *(c+2) == '/')
+		{
+			
+			*c = '\0';
+			if (strcmp(g_options.auth_uri, "ldap") == 0 || strcmp(g_options.auth_uri, "ldaps") == 0)
+			{
+				*c = ':'; // LDAP URI's require the prodocol as part of the string
+				g_options.auth_method = AUTH_LDAP;
+			}
+			else if (strcmp(g_options.auth_uri, "mysql") == 0)
+			{
+				g_options.auth_uri = c+3; // MySQL doesn't (just a hostname)
+				g_options.auth_method = AUTH_MYSQL;
+			}
+			else
+			{
+				Fatal("Unsupported authentication method %s", g_options.auth_uri);
+			}
+		}
 	}
+	else
+	{
+		Log(LOGWARN, "No authentication method.");
+	}
+
+	Log(LOGDEBUG, "Verbosity: %d", g_options.verbosity);
+	Log(LOGDEBUG, "Pin Module Enabled: %d", g_options.enable_pin);
+	Log(LOGDEBUG, "Auth method: %d", g_options.auth_method);
+	Log(LOGDEBUG, "Auth URI: %s", g_options.auth_uri);
+	Log(LOGDEBUG, "Auth Options: %s", g_options.auth_options);
+	//Log(LOGDEBUG, "Root directory: %s", g_options.root_dir);
+	Log(LOGDEBUG, "Experiment directory: %s", g_options.experiment_dir);
+
+
 	
 }
 
@@ -123,7 +160,7 @@ void Cleanup()
 {
 	Log(LOGDEBUG, "Begin cleanup.");
 	Sensor_Cleanup();
-	//Actuator_Cleanup();
+	Actuator_Cleanup();
 	Log(LOGDEBUG, "Finish cleanup.");
 }
 
@@ -199,23 +236,22 @@ int main(int argc, char ** argv)
 
 	
 
-	Sensor_Init();
-	Actuator_Init();
 	Pin_Init();
 	
 	// Try and start things
 	
-	const char *ret;
-	if ((ret = Control_SetMode(CONTROL_START, "test")) != NULL)
-		Fatal("Control_SetMode failed with '%s'", ret);
+	//const char *ret;
+	//if ((ret = Control_SetMode(CONTROL_START, "test")) != NULL)
+	//	Fatal("Control_SetMode failed with '%s'", ret);
 	
 
 	// run request thread in the main thread
 	FCGI_RequestLoop(NULL);
 
 	
-	if ((ret = Control_SetMode(CONTROL_STOP, "test")) != NULL)
-		Fatal("Control_SetMode failed with '%s'", ret);
+	Control_SetMode(CONTROL_STOP, NULL);
+	//if ((ret = Control_SetMode(CONTROL_STOP, "test")) != NULL)
+	//	Fatal("Control_SetMode failed with '%s'", ret);
 	
 	//Sensor_StopAll();
 	//Actuator_StopAll();