From: Tom Yu <tlyu@mit.edu>
Date: Mon, 7 Nov 2011 22:35:48 +0000 (+0000)
Subject: pull up r25433 from trunk
X-Git-Tag: krb5-1.10-alpha2~28
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a789ba6bcf331f27dfe536232cd27b8c8d8205b4;p=krb5.git

pull up r25433 from trunk

 ------------------------------------------------------------------------
 r25433 | ghudson | 2011-11-04 01:53:23 -0400 (Fri, 04 Nov 2011) | 9 lines

 ticket: 7000
 subject: Exit on error in kadmind kprop child
 target_version: 1.10
 tags: pullup

 When we fork from kadmind to dump the database and kprop to an iprop
 slave, if we encounter an error in the child process we should exit
 rather than returning to the main loop.

ticket: 7000
version_fixed: 1.10
status: resolved

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-10@25453 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/kadmin/server/ipropd_svc.c b/src/kadmin/server/ipropd_svc.c
index d732098a2..0e45f6a17 100644
--- a/src/kadmin/server/ipropd_svc.c
+++ b/src/kadmin/server/ipropd_svc.c
@@ -380,7 +380,7 @@ ipropx_resync(uint32_t vers, struct svc_req *rqstp)
 			     _("%s: pclose(popen) failed: %s"),
 			     whoami,
 			     error_message(errno));
-	    goto out;
+	    _exit(1);
 	}
 
 	DPRINT(("%s: exec `kprop -f %s %s' ...\n",
@@ -401,7 +401,7 @@ ipropx_resync(uint32_t vers, struct svc_req *rqstp)
 			     _("%s: exec failed: %s"),
 			     whoami,
 			     error_message(errno));
-	    goto out;
+	    _exit(1);
 	}
 
     default: /* parent */