svn merge -r8319:8332 https://eris/svn/slurm/branches/slurm-1.1

NEWS

@@ -13,6 +13,8 @@ documents those changes that are of interest to users and admins.
  -- Fix bug in jobcomp/filetxt plugin to report proper NodeCnt when a job 
     fails due to a node failure.
  -- Fix Bluegene configure to work with the new 64bit libs.
+ -- Fix bug in controller that causes it to segfault when hit with a malformed
+    message.
 
 * Changes in SLURM 1.1.1
 ========================

slurm.spec

@@ -82,6 +82,11 @@ Summary: SLURM interfaces to IBM AIX and Federation switch.
 Group: System Environment/Base
 Requires: slurm
 
+%package proctrack-sgi-job
+Summary: SLURM process tracking plugin for SGI job containers.
+Group: System Environment/Base
+Requires: slurm
+
 %description 
 SLURM is an open source, fault-tolerant, and highly
 scalable cluster management and job scheduling system for Linux clusters
@@ -113,6 +118,10 @@ SLURM switch plugin for Quadrics Elan3 or Elan4.
 %description aix-federation
 SLURM plugins for IBM AIX and Federation switch.
 
+%description proctrack-sgi-job
+SLURM process tracking plugin for SGI job containers.
+(See http://oss.sgi.com/projects/pagg).
+
 %prep
 %setup -n %{name}-%{version}-%{release}
 
@@ -197,6 +206,11 @@ echo "%{_sbindir}/slurm_prolog"                   >> $LIST
 echo "%{_sbindir}/sfree"                          >> $LIST
 echo "%config %{_sysconfdir}/bluegene.conf.example" >> $LIST
 
+LIST=./sgi-job.files
+touch $LIST
+test -f $RPM_BUILD_ROOT/%{_libdir}/slurm/proctrack_sgi_job.so &&
+echo "%{_libdir}/slurm/proctrack_sgi_job.so" >> $LIST
+
 #############################################################################
 
 %clean
@@ -288,6 +302,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 #############################################################################
 
+%files -f sgi-job.files proctrack-sgi-job
+%defattr(-,root,root)
+
 %pre
 #if [ -x /etc/init.d/slurm ]; then
 #    if /etc/init.d/slurm status | grep -q running; then

src/slurmctld/controller.c

@@ -627,7 +627,7 @@ static void *_service_connection(void *arg)
 	/* set msg connection fd to accepted fd. This allows 
 	 *  possibility for slurmd_req () to close accepted connection
 	 */
-	if(errno < 0) {
+	if(errno != SLURM_SUCCESS) {
 		if (errno == SLURM_PROTOCOL_VERSION_ERROR) {
 			slurm_send_rc_msg(msg, SLURM_PROTOCOL_VERSION_ERROR);
 		} else