aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Yu <tlyu@mit.edu>2011-11-08 22:21:33 +0000
committerTom Yu <tlyu@mit.edu>2011-11-08 22:21:33 +0000
commit910bee099d3144c96f37fbcbf77f1b6456a2ce30 (patch)
tree634acab306806fbd473d605f5fadafb2509f4c38
parent649d734bfeb36f4a6f0fd1cfdee4934823a0af5c (diff)
downloadkrb5-910bee099d3144c96f37fbcbf77f1b6456a2ce30.zip
krb5-910bee099d3144c96f37fbcbf77f1b6456a2ce30.tar.gz
krb5-910bee099d3144c96f37fbcbf77f1b6456a2ce30.tar.bz2
Exit on error in kadmind kprop child
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: 7011 version_fixed: 1.8.6 status: resolved git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-8@25463 dc483132-0cff-0310-8789-dd5450dbe970
-rw-r--r--src/kadmin/server/ipropd_svc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/kadmin/server/ipropd_svc.c b/src/kadmin/server/ipropd_svc.c
index 28c91a8..ba21410 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 */