Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions README
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
20230225
Adding magic path option '-M' to provide a magic path
under which all key files are stored within files
named by sender-address followed by '.pem', i.e.
lonesome_cowboy@anywhere.de.pem

202302xx
Fix .f https://github.com/andreasschulze/signing-milter/issues/3
socketmode may be relaxed with '-c :relax'
Expand Down
18 changes: 18 additions & 0 deletions callbacks.c
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,24 @@ sfsistat callback_envfrom(SMFICTX* ctx, char** argv) {
warn_if_dict_changed(&dict_signingtable);

pemfilename = dict_lookup(&dict_signingtable, argv[0]);

/*
* MagicPath
*/
char longpemfilename[1024];
extern char* opt_magicpath;
if (opt_magicpath) {
longpemfilename[0] = 0;
strcpy(longpemfilename, opt_magicpath);
strcat(longpemfilename, argv[0]);
strcat(longpemfilename, ".pem");
pemfilename = longpemfilename;
logmsg(LOG_INFO, "MagicPath filename '%s'", pemfilename);
}
/*
* end-of-MagicPath
*/

if (pemfilename == NULL || *pemfilename == '\0') {
/*
* Absender nicht in der Signingtable gefunden.
Expand Down
20 changes: 19 additions & 1 deletion main.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,13 @@ int opt_timeout = 600;
char* opt_user = "signing-milter";
int opt_addxheader = 0;
int opt_signerfromheader = 0;
/*
* MagicPath
*/
char* opt_magicpath = NULL;
/*
* end-of-MagicPath
*/

/* globale Variablen */
struct DICT dict_signingtable = {
Expand Down Expand Up @@ -77,7 +84,8 @@ int main(int argc, char** argv) {
*/
uid = gid = client_gid = root_gid = 0;

while ((c = getopt(argc, argv, "bc:d:hfg:k:lm:n:s:t:u:vx")) > 0) {
while ((c = getopt(argc, argv, "bc:d:hfg:k:lm:n:s:t:u:vxM:")) > 0) {

switch (c) {
case 'b': /* break contentheader */
logmsg(LOG_INFO, "option -b is ignored for compatibily reasons, you may remove it safely");
Expand Down Expand Up @@ -168,6 +176,16 @@ int main(int argc, char** argv) {
case 'x': /* add X-Header */
opt_addxheader = (int) !opt_addxheader;
break;
/*
* MagicPath
*/
case 'M': /* magic-path */
opt_magicpath = optarg;
logmsg(LOG_ERR, "magic path (%s) activated", opt_magicpath);
break;
/*
* end-of-MagicPath
*/
default:
usage();
exit(EX_USAGE);
Expand Down