summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-03-26 19:03:22 +1100
committerAndrew Tridgell <tridge@samba.org>2010-03-26 19:03:22 +1100
commit525a4fb2c423dbbeeb1e6da3254f334044b7bd7f (patch)
tree0458a5c657084da4a963c789993f1f2e5987bdf7
parentfae84f98e37e99e41b23739305e7331b3a34ae48 (diff)
downloadsamba-525a4fb2c423dbbeeb1e6da3254f334044b7bd7f.tar.gz
samba-525a4fb2c423dbbeeb1e6da3254f334044b7bd7f.tar.bz2
samba-525a4fb2c423dbbeeb1e6da3254f334044b7bd7f.zip
util: on FreeBSD true is in /usr/bin. Use execvp to find it
-rw-r--r--lib/util/util_runcmd.c2
-rw-r--r--selftest/target/Samba4.pm2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/util/util_runcmd.c b/lib/util/util_runcmd.c
index ef897d469f..54643d3292 100644
--- a/lib/util/util_runcmd.c
+++ b/lib/util/util_runcmd.c
@@ -183,7 +183,7 @@ struct tevent_req *samba_runcmd_send(TALLOC_CTX *mem_ctx,
}
va_end(ap);
- ret = execv(state->arg0, argv);
+ ret = execvp(state->arg0, argv);
fprintf(stderr, "Failed to exec child - %s\n", strerror(errno));
_exit(255);
return NULL;
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 9370a17838..06a5326096 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -584,7 +584,7 @@ sub provision_raw_step1($$)
gensec:require_pac = true
log level = $ctx->{server_loglevel}
lanman auth = Yes
- rndc command = /bin/true
+ rndc command = true
dns update command = $ENV{SRCDIR_ABS}/scripting/bin/samba_dnsupdate -s $ctx->{smb_conf} --all-interfaces --use-file=$ctx->{dns_host_file}
resolv:host file = $ctx->{dns_host_file}
";