[master] 1e977a772 Use Jail functions to remove files and directories.

Poul-Henning Kamp phk at FreeBSD.org
Mon May 25 08:17:07 UTC 2020


commit 1e977a772b1fcc56e025e968e2825862e2828801
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon May 25 08:15:21 2020 +0000

    Use Jail functions to remove files and directories.

diff --git a/bin/varnishd/mgt/mgt_vcc.c b/bin/varnishd/mgt/mgt_vcc.c
index e82fa81c5..1d1d86d58 100644
--- a/bin/varnishd/mgt/mgt_vcc.c
+++ b/bin/varnishd/mgt/mgt_vcc.c
@@ -275,12 +275,12 @@ static void
 mgt_vcc_fini_vp(struct vcc_priv *vp, int leave_lib)
 {
 	if (!MGT_DO_DEBUG(DBG_VCL_KEEP)) {
-		(void)unlink(VSB_data(vp->csrcfile));
-		(void)unlink(VSB_data(vp->symfile));
+		VJ_unlink(VSB_data(vp->csrcfile));
+		VJ_unlink(VSB_data(vp->symfile));
 		if (!leave_lib)
-			(void)unlink(VSB_data(vp->libfile));
+			VJ_unlink(VSB_data(vp->libfile));
 	}
-	(void)rmdir(VSB_data(vp->dir));
+	VJ_rmdir(VSB_data(vp->dir));
 	VSB_destroy(&vp->csrcfile);
 	VSB_destroy(&vp->libfile);
 	VSB_destroy(&vp->symfile);


More information about the varnish-commit mailing list