Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 27 Nov 2020 18:40:51 +0000 (UTC)
From:      Hajimu UMEMOTO <ume@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r368111 - head/usr.sbin/rtsold
Message-ID:  <202011271840.0ARIepbI049833@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ume
Date: Fri Nov 27 18:40:51 2020
New Revision: 368111
URL: https://svnweb.freebsd.org/changeset/base/368111

Log:
  fix casper initialization for setting scripts.
  
  MFC after:	1 week

Modified:
  head/usr.sbin/rtsold/rtsold.c

Modified: head/usr.sbin/rtsold/rtsold.c
==============================================================================
--- head/usr.sbin/rtsold/rtsold.c	Fri Nov 27 16:51:58 2020	(r368110)
+++ head/usr.sbin/rtsold/rtsold.c	Fri Nov 27 18:40:51 2020	(r368111)
@@ -333,6 +333,7 @@ init_capabilities(void)
 #ifdef WITH_CASPER
 	const char *const scripts[] =
 	    { resolvconf_script, managedconf_script, otherconf_script };
+	const char *scripts_set[nitems(scripts)];
 	cap_channel_t *capcasper;
 	nvlist_t *limits;
 	int count;
@@ -351,9 +352,9 @@ init_capabilities(void)
 	count = 0;
 	for (size_t i = 0; i < nitems(scripts); i++)
 		if (scripts[i] != NULL)
-			count++;
+			scripts_set[count++] = scripts[i];
 	limits = nvlist_create(0);
-	nvlist_add_string_array(limits, "scripts", scripts, count);
+	nvlist_add_string_array(limits, "scripts", scripts_set, count);
 	if (cap_limit_set(capscript, limits) != 0)
 		return (-1);
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011271840.0ARIepbI049833>