6 files changed, 6 insertions, 6 deletions
diff --git a/modules/protocol/bahamut.cpp b/modules/protocol/bahamut.cpp
index 92aee74fb..29f16004e 100644
--- a/modules/protocol/bahamut.cpp
+++ b/modules/protocol/bahamut.cpp
@@ -232,7 +232,7 @@ class BahamutIRCdProto : public IRCDProto
 
 	void SendConnect()
 	{
-		bahamut_cmd_pass(uplink_server->password);
+		bahamut_cmd_pass(Config->Uplinks[CurrentUplink]->password);
 		bahamut_cmd_capab();
 		SendServer(Me);
 		bahamut_cmd_svinfo();
diff --git a/modules/protocol/inspircd-ts6.h b/modules/protocol/inspircd-ts6.h
index d76dc27c2..cf93865f8 100644
--- a/modules/protocol/inspircd-ts6.h
+++ b/modules/protocol/inspircd-ts6.h
@@ -124,7 +124,7 @@ class InspIRCdTS6Proto : public IRCDProto
 	/* SERVER services-dev.chatspike.net password 0 :Description here */
 	void SendServer(const Server *server)
 	{
-		send_cmd("", "SERVER %s %s %d %s :%s", server->GetName().c_str(), uplink_server ? uplink_server->password.c_str() : "none", server->GetHops(), server->GetSID().c_str(), server->GetDescription().c_str());
+		send_cmd("", "SERVER %s %s %d %s :%s", server->GetName().c_str(), Config->Uplinks[CurrentUplink]->password.c_str(), server->GetHops(), server->GetSID().c_str(), server->GetDescription().c_str());
 	}
 
 	/* JOIN */
diff --git a/modules/protocol/inspircd11.cpp b/modules/protocol/inspircd11.cpp
index 5ab55ab07..a382d4006 100644
--- a/modules/protocol/inspircd11.cpp
+++ b/modules/protocol/inspircd11.cpp
@@ -199,7 +199,7 @@ class InspIRCdProto : public IRCDProto
 
 	void SendConnect()
 	{
-		inspircd_cmd_pass(uplink_server->password);
+		inspircd_cmd_pass(Config->Uplinks[CurrentUplink]->password);
 		SendServer(Me);
 		send_cmd("", "BURST");
 		Module *enc = ModuleManager::FindFirstOf(ENCRYPTION);
diff --git a/modules/protocol/plexus.cpp b/modules/protocol/plexus.cpp
index 04095e5a2..5e6c67781 100644
--- a/modules/protocol/plexus.cpp
+++ b/modules/protocol/plexus.cpp
@@ -157,7 +157,7 @@ class PlexusProto : public IRCDProto
 
 	void SendConnect()
 	{
-		plexus_cmd_pass(uplink_server->password);
+		plexus_cmd_pass(Config->Uplinks[CurrentUplink]->password);
 		plexus_cmd_capab();
 		/* Make myself known to myself in the serverlist */
 		SendServer(Me);
diff --git a/modules/protocol/ratbox.cpp b/modules/protocol/ratbox.cpp
index d6cfc761f..2833c52b7 100644
--- a/modules/protocol/ratbox.cpp
+++ b/modules/protocol/ratbox.cpp
@@ -160,7 +160,7 @@ class RatboxProto : public IRCDProto
 
 	void SendConnect()
 	{
-		ratbox_cmd_pass(uplink_server->password);
+		ratbox_cmd_pass(Config->Uplinks[CurrentUplink]->password);
 		ratbox_cmd_capab();
 		/* Make myself known to myself in the serverlist */
 		SendServer(Me);
diff --git a/modules/protocol/unreal.cpp b/modules/protocol/unreal.cpp
index cb7a54d61..e07b97af0 100644
--- a/modules/protocol/unreal.cpp
+++ b/modules/protocol/unreal.cpp
@@ -228,7 +228,7 @@ class UnrealIRCdProto : public IRCDProto
 	void SendConnect()
 	{
 		unreal_cmd_capab();
-		unreal_cmd_pass(uplink_server->password);
+		unreal_cmd_pass(Config->Uplinks[CurrentUplink]->password);
 		SendServer(Me);
 	}