svn rev #24621: trunk/src/slave/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=24621
Commit By: tlyu
Log Message:
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   trunk/src/slave/kpropd.c
Modified: trunk/src/slave/kpropd.c
===================================================================
--- trunk/src/slave/kpropd.c	2011-02-09 04:59:38 UTC (rev 24620)
+++ trunk/src/slave/kpropd.c	2011-02-09 20:25:03 UTC (rev 24621)
@@ -414,11 +414,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;