$OpenBSD$
--- Source_Files/Misc/preferences.cpp.orig	Sat Jan 12 18:35:47 2008
+++ Source_Files/Misc/preferences.cpp	Mon Apr  7 23:03:39 2008
@@ -199,7 +199,7 @@ static void get_name_from_system(unsigned char *outNam
     // Hope caller's buffer is big enough.
     char* name = (char*) outName;
 
-#if defined(unix) || defined(__BEOS__) || (defined (__APPLE__) && defined (__MACH__)) || defined(__NetBSD__)
+#if defined(unix) || defined(__BEOS__) || (defined (__APPLE__) && defined (__MACH__)) || defined(__NetBSD__) || defined(__OpenBSD__)
 
 	char *login = getlogin();
 	strcpy(name, login ? login : "Bob User");
@@ -3032,17 +3032,21 @@ bool XML_NetworkPrefsParser::HandleAttribute(const cha
 	}
 	else if (StringsEqual(Tag,"metaserver_login"))
 	{
+#ifdef SDL
 		DeUTF8_C(Value, strlen(Value),network_preferences->metaserver_login, sizeof(network_preferences->metaserver_login));
+#endif
 		return true;
 	}
 	else if (StringsEqual(Tag,"metaserver_clear_password"))
 	{
+#ifdef SDL
 		DeUTF8_C(Value, strlen(Value),network_preferences->metaserver_password, sizeof(network_preferences->metaserver_password));
+#endif
 		return true;
 	}
 	else if (StringsEqual(Tag,"metaserver_password"))
 	{
-		char obscure_password[32];
+		char obscure_password[33];
 		DeUTF8_C(Value, strlen(Value), obscure_password, sizeof(obscure_password));
 		for (int i = 0; i < 16; i++)
 		{
