Browse Source

do not modify environment and --batch is optional

master
parent
commit
39c3409ba1
  1. 16
      acmetool/acmetool.c
  2. 4
      acmetool/acmetool.spec

16
acmetool/acmetool.c

@ -4,17 +4,10 @@
#include <string.h>
#include <unistd.h>
#define ACMETOOL_BINDIR "@l_prefix@/bin"
#define ACMETOOL_SBINDIR "@l_prefix@/sbin"
#define ACMETOOL_BIN "@l_prefix@/libexec/acmetool/acmetool"
#define ACMETOOL_BIN "@l_prefix@/libexec/acmetool/acmetool"
int main(int argn, char **argv)
{
static char *env[] = {
"PATH=/bin:/usr/bin:/sbin:/usr/sbin:" ACMETOOL_BINDIR ":" ACMETOOL_SBINDIR,
NULL,
NULL
};
if (setuid(geteuid()) == -1) {
perror("setuid");
exit(1);
@ -23,13 +16,8 @@ int main(int argn, char **argv)
perror("setgid");
exit(1);
}
char *term;
if ((term = getenv("TERM")) == NULL)
term = "vt100";
env[1] = malloc(strlen("TERM=") + strlen(term) + 1);
strcpy(env[1], term);
argv[0] = ACMETOOL_BIN;
if (execve(argv[0], argv, env) == -1)
if (execv(argv[0], argv) == -1)
abort();
return 0;
}

4
acmetool/acmetool.spec

@ -36,7 +36,7 @@ Class: EVAL
Group: Cryptography
License: MIT
Version: %{V_acmetool_base}
Release: 20161019
Release: 20161020
# list of sources
Source0: http://download.openpkg.org/components/versioned/acmetool/acmetool-%{V_acmetool_snap}.tar.xz
@ -179,7 +179,7 @@ PreReq: OpenPKG, openpkg >= 20160101, sudo, x509
echo " https://acme-v01.api.letsencrypt.org/directory (Live, RSA only)"
echo "Then perform the initial setup with it:"
echo " \$ $RPM_INSTALL_PREFIX/sbin/acmetool quickstart \\%{l_nil}"
echo " --batch --response-file=$RPM_INSTALL_PREFIX/etc/acmetool/responses.yaml"
echo " [--batch] --response-file=$RPM_INSTALL_PREFIX/etc/acmetool/responses.yaml"
echo "Then you can request your certificate:"
echo " \$ $RPM_INSTALL_PREFIX/sbin/acmetool want example.com"
echo "The resulting certificate/private-key you can find under:"

Loading…
Cancel
Save