Author: ume
Date: Fri Dec 4 14:09:12 2020
New Revision: 368328
URL: https://svnweb.freebsd.org/changeset/base/368328
Log:
MFC r368111: fix casper initialization for setting scripts.
Modified:
stable/12/usr.sbin/rtsold/rtsold.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/usr.sbin/rtsold/rtsold.c
==============================================================================
--- stable/12/usr.sbin/rtsold/rtsold.c Fri Dec 4 11:29:27 2020
(r368327)
+++ stable/12/usr.sbin/rtsold/rtsold.c Fri Dec 4 14:09:12 2020
(r368328)
@@ -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);
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
