5 files changed, 52 insertions, 10 deletions
diff --git a/swat/index.esp b/swat/index.esp
index 0abfcc46d9..e1ec624308 100644
--- a/swat/index.esp
+++ b/swat/index.esp
@@ -10,13 +10,13 @@ var servers = new Array("nbt_server", "smb_server", "ldap_server", "cldap_server
 var i;
 var info = new Object();
 
-info["NBT Server"]   = server_status("nbt");
-info["WINS Server"]  = server_status("wins");
-info["CLDAP Server"] = server_status("cldap");
-info["KDC"]          = server_status("kdc");
-info["SMB Server"]   = stream_server_status("smb");
-info["LDAP Server"]  = stream_server_status("ldap");
-info["RPC Server"]   = stream_server_status("rpc");
+info["NBT Server"]      = server_status("nbt");
+info["WINS Server"]     = server_status("wins");
+info["CLDAP Server"]    = server_status("cldap");
+info["Kerberos Server"] = server_status("kdc");
+info["SMB Server"]      = stream_server_status("smb");
+info["LDAP Server"]     = stream_server_status("ldap");
+info["RPC Server"]      = stream_server_status("rpc");
 
 simple_table(info);
 %>
diff --git a/swat/kdc_server/index.esp b/swat/kdc_server/index.esp
new file mode 100644
index 0000000000..ed70f7ff46
--- /dev/null
+++ b/swat/kdc_server/index.esp
@@ -0,0 +1,13 @@
+<% page_header("columns", "Kerberos Server", ""); 
+
+  libinclude("base.js");
+  libinclude("management.js");
+%>
+
+<h1>Kerberos Server</h1>
+
+<%
+writefln("Status: %s\n", server_status("kdc"));
+%>
+
+<% page_footer(); %>
diff --git a/swat/menu.js b/swat/menu.js
index 78d61b34d2..406bba0a56 100644
--- a/swat/menu.js
+++ b/swat/menu.js
@@ -1,8 +1,11 @@
 /* show a menu for the esp test pages */
 simple_menu(
 	"Main Menu",
-	"File Server",         session_uri("/smb_server/"),
-	"LDAP Server",         session_uri("/ldap_server/"),
-	"CLDAP Server",         session_uri("/cldap_server/"),
+	"File Server",        session_uri("/smb_server/"),
+	"LDAP Server",        session_uri("/ldap_server/"),
+	"CLDAP Server",       session_uri("/cldap_server/"),
+	"RPC Server",         session_uri("/rpc_server/"),
 	"NBT Server",         session_uri("/nbt_server/"),
+	"WINS Server",        session_uri("/wins_server/"),
+	"Kerberos Server",    session_uri("/kdc_server/"),
 	"ESP Tests",          session_uri("/esptest/"));
diff --git a/swat/rpc_server/index.esp b/swat/rpc_server/index.esp
new file mode 100644
index 0000000000..5c42907783
--- /dev/null
+++ b/swat/rpc_server/index.esp
@@ -0,0 +1,13 @@
+<% page_header("columns", "RPC Server", ""); 
+
+  libinclude("base.js");
+  libinclude("management.js");
+%>
+
+<h1>RPC Server</h1>
+
+<%
+writefln("Status: %s\n", stream_server_status("rpc"));
+%>
+
+<% page_footer(); %>
diff --git a/swat/wins_server/index.esp b/swat/wins_server/index.esp
new file mode 100644
index 0000000000..d24fa3410d
--- /dev/null
+++ b/swat/wins_server/index.esp
@@ -0,0 +1,13 @@
+<% page_header("columns", "WINS Server", ""); 
+
+  libinclude("base.js");
+  libinclude("management.js");
+%>
+
+<h1>WINS Server</h1>
+
+<%
+writefln("Status: %s\n", server_status("wins"));
+%>
+
+<% page_footer(); %>