sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-12 20:58:37 +03:00
Code

r24877: Don't panic in tdb validation code when the fork or waitpid fails.

Browse Source 
Return error instead.

Michael
This commit is contained in:
Michael Adam 2007-09-02 00:23:02 +00:00 committed by Gerald (Jerry) Carter
parent 1f122352b0
commit 9b25355dd6
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/lib/util_tdb.c
View File

@ -1097,7 +1097,8 @@ int tdb_validate(struct tdb_context *tdb, tdb_validate_data_func validate_fn)
exit(tdb_validate_child(tdb, validate_fn));
}
else if (child_pid < 0) {
smb_panic("tdb_validate: fork for validation failed.");
DEBUG(1, ("tdb_validate: fork for validation failed.\n"));
goto done;
}
/* parent */
@ -1112,14 +1113,14 @@ int tdb_validate(struct tdb_context *tdb, tdb_validate_data_func validate_fn)
errno = 0;
continue;
}
DEBUG(0, ("tdb_validate: waitpid failed with errno %s\n",
DEBUG(1, ("tdb_validate: waitpid failed with error '%s'.\n",
strerror(errno)));
smb_panic("tdb_validate: waitpid failed.");
goto done;
}
if (wait_pid != child_pid) {
DEBUG(0, ("tdb_validate: waitpid returned pid %d, "
DEBUG(1, ("tdb_validate: waitpid returned pid %d, "
"but %d was expected\n", wait_pid, child_pid));
smb_panic("tdb_validate: waitpid returned unexpected PID.");
goto done;
}
DEBUG(10, ("tdb_validate: validating child returned.\n"));
@ -1144,6 +1145,7 @@ int tdb_validate(struct tdb_context *tdb, tdb_validate_data_func validate_fn)
ret = WSTOPSIG(child_status);
}
done:
DEBUG(5, ("tdb_validate returning code '%d' for tdb '%s'\n", ret,
tdb_name(tdb)));