diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2016-01-14 10:59:29 +0100 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-01-14 10:57:33 +0000 |
commit | febc87f0569a6cc0e688991108c60a1c7d88f81e (patch) | |
tree | 5a761b29f55831492ef1556a6e72401b0a247d7c /main/ca-certificates/update-ca.c | |
parent | f488459f9813001df0ab4432b7ee64e3e3dede12 (diff) | |
download | aports-febc87f0569a6cc0e688991108c60a1c7d88f81e.tar.bz2 aports-febc87f0569a6cc0e688991108c60a1c7d88f81e.tar.xz |
main/ca-certificates: run c_rehash as a hook from update.d
instead of running c_rehash directly we run it as a hook from update.d.
We also:
- update the man-page to be more correct.
- remove obsolete lua script
Diffstat (limited to 'main/ca-certificates/update-ca.c')
-rw-r--r-- | main/ca-certificates/update-ca.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/main/ca-certificates/update-ca.c b/main/ca-certificates/update-ca.c index f13da69fb2..bcdd4270f8 100644 --- a/main/ca-certificates/update-ca.c +++ b/main/ca-certificates/update-ca.c @@ -15,6 +15,7 @@ #define CERTSDIR "/usr/share/ca-certificates/" #define LOCALCERTSDIR "/usr/local/share/ca-certificates/" #define ETCCERTSDIR "/etc/ssl/certs/" +#define RUNPARTSDIR "/etc/ca-certificates/update.d/" #define CERTBUNDLE "ca-certificates.crt" #define CERTSCONF "/etc/ca-certificates.conf" @@ -316,13 +317,9 @@ int main(int a, char **v) free(tmpfile); - /* Execute c_rehash */ - int nullfd = open("/dev/null", O_WRONLY); - if (nullfd == -1) - return 1; - dup2(nullfd, STDOUT_FILENO); - char* c_rehash_args[] = { "/usr/bin/c_rehash", ETCCERTSDIR, 0 }; - execve(c_rehash_args[0], c_rehash_args, NULL); + /* Execute run-parts */ + char* run_parts_args[] = { "run-parts", RUNPARTSDIR, 0 }; + execvpe(run_parts_args[0], run_parts_args, NULL); return 0; } |