svn rev #24627: branches/krb5-1-7/src/slave/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=24627
Commit By: tlyu
Log Message:
ticket: 6864
subject: kpropd denial of service [MITKRB5-SA-2011-001 CVE-2010-4022]
version_fixed: 1.7.2
status: resolved

pull up r24621 from trunk

 ------------------------------------------------------------------------
 r24621 | tlyu | 2011-02-09 15:25:03 -0500 (Wed, 09 Feb 2011) | 8 lines

 ticket: 6859
 subject: kpropd denial of service [MITKRB5-SA-2011-001 CVE-2010-4022]
 tags: pullup
 target_version: 1.9.1

 When operating in standalone mode and not doing iprop, don't return
 from do_standalone() if the child exits with abnormal status.


Changed Files:
U   branches/krb5-1-7/src/slave/kpropd.c
Modified: branches/krb5-1-7/src/slave/kpropd.c
===================================================================
--- branches/krb5-1-7/src/slave/kpropd.c	2011-02-09 21:03:49 UTC (rev 24626)
+++ branches/krb5-1-7/src/slave/kpropd.c	2011-02-09 21:38:04 UTC (rev 24627)
@@ -422,11 +422,11 @@
 		    }
 
 		    close(s);
-		    if (iproprole == IPROP_SLAVE)
+		    if (iproprole == IPROP_SLAVE) {
 			close(finet);
- 
-		    if ((ret = WEXITSTATUS(status)) != 0)
-			return (ret);
+			if ((ret = WEXITSTATUS(status)) != 0)
+			  return (ret);
+		    }
 		}
 		if (iproprole == IPROP_SLAVE)
 		    break;