<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/17111">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">exec: propogate errors from osmo_environment_[filter|append]<br><br>Change-Id: If7d6e0441f73092a4fb455340c076ba4dc60af3f<br>---<br>M src/exec.c<br>1 file changed, 10 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/exec.c b/src/exec.c</span><br><span>index b806ad5..62f5919 100644</span><br><span>--- a/src/exec.c</span><br><span>+++ b/src/exec.c</span><br><span>@@ -221,10 +221,16 @@</span><br><span> new_env[0] = NULL;</span><br><span> </span><br><span> /* build the new environment */</span><br><span style="color: hsl(0, 100%, 40%);">- if (env_whitelist)</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_environment_filter(new_env, ARRAY_SIZE(new_env), environ, env_whitelist);</span><br><span style="color: hsl(0, 100%, 40%);">- if (addl_env)</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_environment_append(new_env, ARRAY_SIZE(new_env), addl_env);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (env_whitelist) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_environment_filter(new_env, ARRAY_SIZE(new_env), environ, env_whitelist);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (addl_env) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_environment_append(new_env, ARRAY_SIZE(new_env), addl_env);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> /* if we want to behave like system(3), we must go via the shell */</span><br><span> execle("/bin/sh", "sh", "-c", command, (char *) NULL, new_env);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/17111">change 17111</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/libosmocore/+/17111"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: If7d6e0441f73092a4fb455340c076ba4dc60af3f </div>
<div style="display:none"> Gerrit-Change-Number: 17111 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>