summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjulien.pierre.boogz%sun.com <devnull@localhost>2008-09-25 02:07:12 +0000
committerjulien.pierre.boogz%sun.com <devnull@localhost>2008-09-25 02:07:12 +0000
commit591845b408ba2cacf8cadfd3b67d4bc7f5cfc62b (patch)
tree22dd031d06d12b5d14ddbd975c76c6366b431936
parenta51725099ff1e10fbb740d9ee0fa5f954ab7c0ce (diff)
downloadnss-hg-591845b408ba2cacf8cadfd3b67d4bc7f5cfc62b.tar.gz
Fix for bug 445706 . Always abort nsinstall when a symlink creation race is detected.
-rw-r--r--security/coreconf/nsinstall/nsinstall.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/security/coreconf/nsinstall/nsinstall.c b/security/coreconf/nsinstall/nsinstall.c
index f9cf8d166..67850411d 100644
--- a/security/coreconf/nsinstall/nsinstall.c
+++ b/security/coreconf/nsinstall/nsinstall.c
@@ -359,9 +359,8 @@ retry:
if (!exists && symlink(name, toname) < 0) {
if (errno == EEXIST) {
fprintf(stderr, "symlink creation race: %s\n", toname);
- fprintf(stderr,
- "symlink was attempted in working directory %s "
- "from %s to %s.\n", cwd, name, toname);
+ fail("symlink was attempted in working directory %s "
+ "from %s to %s.\n", cwd, name, toname);
goto retry;
}
diagnosePath(toname);