Skip to content

Commit

Permalink
pull up r25433 from trunk
Browse files Browse the repository at this point in the history
 ------------------------------------------------------------------------
 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
  • Loading branch information
tlyu committed Nov 7, 2011
1 parent ba8aaf5 commit a789ba6
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/kadmin/server/ipropd_svc.c
Expand Up @@ -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",
Expand All @@ -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 */
Expand Down

0 comments on commit a789ba6

Please sign in to comment.