diff options
| author | Andrew Stormont <astormont@racktopsystems.com> | 2017-02-10 23:52:07 +0000 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2017-02-23 16:59:38 +0000 |
| commit | 6d88fd4d74cbf1962856668273386b3b904d692c (patch) | |
| tree | 40e4d1f2f9377d5a39915942eeea76fb3c3ab190 /usr/src | |
| parent | b6dfa2aeab5684f8adcd31c0837de483a907ba59 (diff) | |
| download | illumos-joyent-6d88fd4d74cbf1962856668273386b3b904d692c.tar.gz | |
7852 svccfg archive should drop SCF_NOTIFY_PG_POSTFIX
Reviewed by: Dan McDonald <danmcd@omniti.com>
Approved by: Robert Mustacchi <rm@joyent.com>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/svc/svccfg/svccfg_libscf.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/usr/src/cmd/svc/svccfg/svccfg_libscf.c b/usr/src/cmd/svc/svccfg/svccfg_libscf.c index ab657d69a0..32202bf0be 100644 --- a/usr/src/cmd/svc/svccfg/svccfg_libscf.c +++ b/usr/src/cmd/svc/svccfg/svccfg_libscf.c @@ -10386,6 +10386,7 @@ export_notify_params(scf_propertygroup_t *pg, struct entity_elts *elts) xmlNodePtr n, event, *type; struct params_elts *eelts; int ret, err, i; + char *s; n = xmlNewNode(NULL, (xmlChar *)"notification_parameters"); event = xmlNewNode(NULL, (xmlChar *)"event"); @@ -10395,6 +10396,9 @@ export_notify_params(scf_propertygroup_t *pg, struct entity_elts *elts) /* event value */ if (scf_pg_get_name(pg, exp_str, max_scf_name_len + 1) < 0) scfdie(); + /* trim SCF_NOTIFY_PG_POSTFIX appended to name on import */ + if ((s = strchr(exp_str, ',')) != NULL) + *s = '\0'; safe_setprop(event, value_attr, exp_str); (void) xmlAddChild(n, event); |