diff --git a/configurator.html b/configurator.html
index 99351d1f6294e35f16e614626f08e013d323be5d..0f1839dd2b026106fc1eb6b377bcd8903840f0ad 100644
--- a/configurator.html
+++ b/configurator.html
@@ -8,9 +8,41 @@ $Id$
-->
<HTML>
<HEAD><TITLE>SLURM System Configuration</TITLE>
+<SCRIPT type="text/javascript">
+
+function get_radio_value(form)
+{
+ for (var i=0; i < form.length; i++)
+ {
+ if (form[i].checked)
+ {
+ return form[i].value
+ }
+ }
+}
+
+function displayfile()
+{
+ var printme = "# Slurm.conf file generated by configurator.html<br>" +
+ "SlurmUser=" + document.config.slurm_user.value + "<br>" +
+ "SlurmctldPort=" + document.config.slurmctld_port.value + "<br>" +
+ "SlurmdPort=" + document.config.slurmd_port.value + "<br>" +
+ "AuthType=auth/" + get_radio_value(document.config.auth_type) + "<br>" +
+ "SchedulerType=sched/" + get_radio_value(document.config.sched_type) + "<br>" +
+ "SwitchType=sched/" + get_radio_value(document.config.switch_type) + "<br>" +
+ "SelectType=sched/" + get_radio_value(document.config.select_type) + "<br>"
+
+ document.write(printme);
+
+}
+
+
+</SCRIPT>
</HEAD>
<BODY>
-<FORM ACTION="http://www.cs.tut.fi/cgi-bin/run/~jkorpela/echo.cgi">
+<!-- <FORM ACTION="http://www.cs.tut.fi/cgi-bin/run/~jkorpela/echo.cgi">
+-->
+<FORM name=config>
<H1>SLURM Configration</H1>
<P>This form can be used to create a SLURM configuration file with you
controlling many of the important configuration parameters.
@@ -81,7 +113,7 @@ as a compute node too. This is not recommended for larger clusters.
<input type="checkbox" name="compute_on_head" value="YES"> Run SLURM client (slurmd) on head node
<P>
-<input type=submit value="Send">
+<input type=submit value="Send" name="send" onClick="displayfile()">
<input type=reset value="Reset Form">
<P>
</FORM>
diff --git a/src/common/slurm_protocol_defs.h b/src/common/slurm_protocol_defs.h
index 0faae815cb3a494c9ea54ebecaeb3531449625bc..b0e27780d86726caaf8257787ffe5122b6b2ffa1 100644
--- a/src/common/slurm_protocol_defs.h
+++ b/src/common/slurm_protocol_defs.h
@@ -321,6 +321,7 @@ typedef struct spawn_task_request_msg {
slurm_cred_t cred; /* job credential */
switch_jobinfo_t switch_job; /* switch credential for the job */
+
} spawn_task_request_msg_t;
typedef struct task_ext_msg {
diff --git a/src/slurmd/mgr.c b/src/slurmd/mgr.c
index b793ed553b4ac1ce2ee7425a3c98df61e2944ed1..40837e50c1b8ee88bbcda5794c5ff6f9f7fea492 100644
--- a/src/slurmd/mgr.c
+++ b/src/slurmd/mgr.c
@@ -889,7 +889,7 @@ _wait_for_io(slurmd_job_t *job)
{
debug("Waiting for IO");
io_close_all(job);
-
+
/*
* Wait until IO thread exits
*/