mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-01 15:11:25 +00:00
opensmtpd: add two configuration options
unpriviledged_smtpctl_encrypt (defaults to true) -- lets you invoke smtpctl encrypt without being root tag_char -- lets you override the + as in user+tag@domain.tld
This commit is contained in:
parent
19ee3baa32
commit
e0ef352ae7
@ -1,5 +1,12 @@
|
||||
{ stdenv, fetchurl, autoconf, automake, libtool, bison
|
||||
{ stdenv, lib, fetchurl, autoconf, automake, libtool, bison
|
||||
, libasr, libevent, zlib, openssl, db, pam
|
||||
|
||||
# opensmtpd requires root for no reason to encrypt passwords, this patch fixes it
|
||||
# see also https://github.com/OpenSMTPD/OpenSMTPD/issues/678
|
||||
, unpriviledged_smtpctl_encrypt ? true
|
||||
|
||||
# This enables you to override the '+' character which typically separates the user from the tag in user+tag@domain.tld
|
||||
, tag_char ? null
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -16,6 +23,16 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patches = [ ./proc_path.diff ];
|
||||
|
||||
postPatch = with builtins; with lib;
|
||||
optionalString (isString tag_char) ''
|
||||
sed -i -e "s,TAG_CHAR.*'+',TAG_CHAR '${tag_char}'," smtpd/smtpd-defines.h
|
||||
'' +
|
||||
optionalString unpriviledged_smtpctl_encrypt ''
|
||||
substituteInPlace smtpd/smtpctl.c --replace \
|
||||
'if (geteuid())' \
|
||||
'if (geteuid() != 0 && !(argc > 1 && !strcmp(argv[1], "encrypt")))'
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--sysconfdir=/etc"
|
||||
"--localstatedir=/var"
|
||||
|
Loading…
Reference in New Issue
Block a user