>From 77fc16a3df534aca71329122adb1216f9e46065c Mon Sep 17 00:00:00 2001
From: Nils Goroll <nils.goroll@uplex.de>
Date: Mon, 29 Oct 2012 18:15:52 +0100
Subject: [PATCH] Don't assert that privileges exist which have been introduced later than Solaris 10 FCS.

(see also top-level comment: "For privileges which have been added later..:")

c613b135570f87535839e3a94630880d16910f4f has broken varnish for any Solaris OS older
than onnv_140
---
 bin/varnishd/mgt/mgt_sandbox_solaris.c |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bin/varnishd/mgt/mgt_sandbox_solaris.c b/bin/varnishd/mgt/mgt_sandbox_solaris.c
index 728eca0..e27e01a 100644
--- a/bin/varnishd/mgt/mgt_sandbox_solaris.c
+++ b/bin/varnishd/mgt/mgt_sandbox_solaris.c
@@ -103,14 +103,14 @@ mgt_sandbox_solaris_add_inheritable(priv_set_t *pset, enum sandbox_e who)
 	switch (who) {
 	case SANDBOX_VCC:
 		/* for /etc/resolv.conf and /etc/hosts */
-		AZ(priv_addset(pset, "file_read"));
+		priv_addset(pset, "file_read");
 		break;
 	case SANDBOX_CC:
-		AZ(priv_addset(pset, "proc_exec"));
-		AZ(priv_addset(pset, "proc_fork"));
+		priv_addset(pset, "proc_exec");
+		priv_addset(pset, "proc_fork");
 		/* PSARC/2009/378 - 63678502e95e - onnv_140 */
-		AZ(priv_addset(pset, "file_read"));
-		AZ(priv_addset(pset, "file_write"));
+		priv_addset(pset, "file_read");
+		priv_addset(pset, "file_write");
 		break;
 	case SANDBOX_VCLLOAD:
 		break;
@@ -133,19 +133,19 @@ mgt_sandbox_solaris_add_effective(priv_set_t *pset, enum sandbox_e who)
 	switch (who) {
 	case SANDBOX_VCC:
 		/* PSARC/2009/378 - 63678502e95e - onnv_140 */
-		AZ(priv_addset(pset, "file_write"));
+		priv_addset(pset, "file_write");
 		break;
 	case SANDBOX_CC:
 		break;
 	case SANDBOX_VCLLOAD:
 		/* PSARC/2009/378 - 63678502e95e - onnv_140 */
-		AZ(priv_addset(pset, "file_read"));
+		priv_addset(pset, "file_read");
 	case SANDBOX_WORKER:
 		/* PSARC/2009/685 - 8eca52188202 - onnv_132 */
-		AZ(priv_addset(pset, "net_access"));
+		priv_addset(pset, "net_access");
 		/* PSARC/2009/378 - 63678502e95e - onnv_140 */
-		AZ(priv_addset(pset, "file_read"));
-		AZ(priv_addset(pset, "file_write"));
+		priv_addset(pset, "file_read");
+		priv_addset(pset, "file_write");
 		break;
 	default:
 		REPORT(LOG_ERR, "INCOMPLETE AT: %s(%d)\n", __func__, __LINE__);
-- 
1.5.6.5

