[PR PATCH] mgenmid: add option -d for custom domain

[PR PATCH] mgenmid: add option -d for custom domain

[nothien]

[-- Attachment #1: Type: text/plain, Size: 527 bytes --]

There is a new pull request by nothien against master on the mblaze repository

https://github.com/nothien/mblaze master
https://github.com/leahneukirchen/mblaze/pull/209

mgenmid: add option -d for custom domain
In my setup, I use mblaze across multiple mailboxes, each with different addresses and domains, which they provide through mailbox-local configuration files.  I needed this option in order to select the domain programmatically.

A patch file from https://github.com/leahneukirchen/mblaze/pull/209.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-209.patch --]
[-- Type: text/x-diff, Size: 1777 bytes --]

From 1fa062532f0e42bacdcb9d243295ab89609e0845 Mon Sep 17 00:00:00 2001
From: Arav K <nothien@uber.space>
Date: Mon, 31 May 2021 08:26:27 +0100
Subject: [PATCH 1/2] mgenmid: add option -d for custom domain

---
 mgenmid.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/mgenmid.c b/mgenmid.c
index 56499c8..b31eddb 100644
--- a/mgenmid.c
+++ b/mgenmid.c
@@ -29,17 +29,26 @@ printb36(uint64_t x)
 	fputs(o, stdout);
 }
 
-int main()
+int main(int argc, char *argv[])
 {
 	char hostbuf[1024];
 	char *host = 0;
 
+	int c;
+	while ((c = getopt(argc, argv, "d:")) != -1)
+		switch (c) {
+		case 'd': host = optarg; break;
+		default:
+			  fprintf(stderr, "Usage: mgenmid [-d domain]\n");
+			  exit(1);
+		}
+
 	char *f = blaze822_home_file("profile");
 	struct message *config = blaze822(f);
 
 	xpledge("stdio rpath dns", "");
 
-	if (config) // try FQDN: first
+	if (!host && config) // try FQDN:
 		host = blaze822_hdr(config, "fqdn");
 
 	if (!host && gethostname(hostbuf, sizeof hostbuf) == 0) {

From 25e04ed31801df5e9c74919918f3ece5775e34c8 Mon Sep 17 00:00:00 2001
From: Arav K <nothien@uber.space>
Date: Mon, 31 May 2021 08:39:57 +0100
Subject: [PATCH 2/2] mgenmid: document -d option on man page

---
 man/mgenmid.1 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/man/mgenmid.1 b/man/mgenmid.1
index ad1abc2..4aaa5d0 100644
--- a/man/mgenmid.1
+++ b/man/mgenmid.1
@@ -6,6 +6,7 @@
 .Nd generate a Message-ID
 .Sh SYNOPSIS
 .Nm
+[-d domain]
 .Sh DESCRIPTION
 .Nm
 generates and prints a unique Message-ID.
@@ -16,6 +17,10 @@ and a fully qualified domain name.
 The fully qualified domain name is arrived at by:
 .Bl -enum
 .It
+Using the
+.Sq Li domain
+parameter provided on the command line.
+.It
 Using
 .Sq Li FQDN\&:
 from

Re: mgenmid: add option -d for custom domain

[leahneukirchen]

[-- Attachment #1: Type: text/plain, Size: 199 bytes --]

New comment by leahneukirchen on mblaze repository

https://github.com/leahneukirchen/mblaze/pull/209#issuecomment-853379771

Comment:
If you use multiple mblaze profiles, you can set `fqdn:` there.

Re: mgenmid: add option -d for custom domain

[nothien]

[-- Attachment #1: Type: text/plain, Size: 495 bytes --]

New comment by nothien on mblaze repository

https://github.com/leahneukirchen/mblaze/pull/209#issuecomment-853386557

Comment:
Yes, but that means I need a `.mblaze` directory which contains the profile for every local mailbox like this; it's wasteful, and I essentially end up writing a wrapper script for `mgenmid` which deals with it properly.

Regardless, I'm using this patch locally; I've provided it here for the sake of doing so, and if it doesn't seem useful, feel free to close it.

Re: mgenmid: add option -d for custom domain

[leahneukirchen]

[-- Attachment #1: Type: text/plain, Size: 279 bytes --]

New comment by leahneukirchen on mblaze repository

https://github.com/leahneukirchen/mblaze/pull/209#issuecomment-854798288

Comment:
I think it would make more sense to use, say, an environment variable `$MBLAZE_FQDN` if it is set. Then you can set it before calling mcom etc.

Re: mgenmid: add option -d for custom domain

[nothien]

[-- Attachment #1: Type: text/plain, Size: 250 bytes --]

New comment by nothien on mblaze repository

https://github.com/leahneukirchen/mblaze/pull/209#issuecomment-855213602

Comment:
But such a design will lead to environment variables for every profile setting.  I don't think that's a good idea either.

Re: mgenmid: add option -d for custom domain

[Anachron]

[-- Attachment #1: Type: text/plain, Size: 179 bytes --]

New comment by Anachron on mblaze repository

https://github.com/leahneukirchen/mblaze/pull/209#issuecomment-1106085565

Comment:
I think this can be closed, no? @leahneukirchen 

Re: [PR PATCH] [Closed]: mgenmid: add option -d for custom domain

[leahneukirchen]

[-- Attachment #1: Type: text/plain, Size: 389 bytes --]

There's a closed pull request on the mblaze repository

mgenmid: add option -d for custom domain
https://github.com/leahneukirchen/mblaze/pull/209

Description:
In my setup, I use mblaze across multiple mailboxes, each with different addresses and domains, which they provide through mailbox-local configuration files.  I needed this option in order to select the domain programmatically.