[4.1] 4f6b1ea dont assert on a failing rmdir
Lasse Karstensen
lkarsten at varnish-software.com
Tue Jun 14 11:42:09 CEST 2016
commit 4f6b1eab5056037451b65db9a2c4363815c82fbc
Author: Nils Goroll <nils.goroll at uplex.de>
Date: Wed Apr 20 15:06:44 2016 +0200
dont assert on a failing rmdir
We may not have permission to unlink vp.dir
$ /etc/init.d/varnish_master restart
Stopping Varnish Cache: [FAILED]
Starting Varnish Cache: Assert error in mgt_VccCompile(), mgt/mgt_vcc.c line 302:
Condition((rmdir(vp.dir)) == 0) not true.
errno = 13 (Permission denied)
diff --git a/bin/varnishd/mgt/mgt_vcc.c b/bin/varnishd/mgt/mgt_vcc.c
index 7a88b74..eef0340 100644
--- a/bin/varnishd/mgt/mgt_vcc.c
+++ b/bin/varnishd/mgt/mgt_vcc.c
@@ -299,7 +299,7 @@ mgt_VccCompile(struct cli *cli, const char *vclname, const char *vclsrc,
if (status || C_flag) {
(void)unlink(vp.libfile);
free(vp.libfile);
- AZ(rmdir(vp.dir));
+ (void)rmdir(vp.dir);
free(vp.dir);
if (status) {
VCLI_Out(cli, "VCL compilation failed");
More information about the varnish-commit
mailing list