X-Git-Url: http://andersk.mit.edu/gitweb/gssapi-openssh.git/blobdiff_plain/ff7ec5032bf683bf645ffcdb8fc878f37bf8cca7..fe53310bc2e7636f1dd16001684d0c5d936cd292:/openssh/openbsd-compat/port-solaris.c

diff --git a/openssh/openbsd-compat/port-solaris.c b/openssh/openbsd-compat/port-solaris.c
index ca08a15..8c773bd 100644
--- a/openssh/openbsd-compat/port-solaris.c
+++ b/openssh/openbsd-compat/port-solaris.c
@@ -86,27 +86,18 @@ solaris_contract_pre_fork(void)
 	debug2("%s: setting up process contract template on fd %d",
 	    __func__, tmpl_fd);
 
-	/* First we set the template parameters and event sets. */
-	if (ct_pr_tmpl_set_param(tmpl_fd, CT_PR_PGRPONLY) != 0) {
-		error("%s: Error setting process contract parameter set "
-		    "(pgrponly): %s", __func__, strerror(errno));
-		goto fail;
-	}
-	if (ct_pr_tmpl_set_fatal(tmpl_fd, CT_PR_EV_HWERR) != 0) {
+	/* We have to set certain attributes before activating the template */
+	if (ct_pr_tmpl_set_fatal(tmpl_fd,
+	    CT_PR_EV_HWERR|CT_PR_EV_SIGNAL|CT_PR_EV_CORE) != 0) {
 		error("%s: Error setting process contract template "
 		    "fatal events: %s", __func__, strerror(errno));
 		goto fail;
 	}
-	if (ct_tmpl_set_critical(tmpl_fd, 0) != 0) {
+	if (ct_tmpl_set_critical(tmpl_fd, CT_PR_EV_HWERR) != 0) {
 		error("%s: Error setting process contract template "
 		    "critical events: %s", __func__, strerror(errno));
 		goto fail;
 	}
-	if (ct_tmpl_set_informative(tmpl_fd, CT_PR_EV_HWERR) != 0) {
-		error("%s: Error setting process contract template "
-		    "informative events: %s", __func__, strerror(errno));
-		goto fail;
-	}
 
 	/* Now make this the active template for this process. */
 	if (ct_tmpl_activate(tmpl_fd) != 0) {