git » chasquid » commit 5c6fb93

diff --git a/internal/config/config.pb.go b/internal/config/config.pb.go
index bd6bf18..21e7228 100644
--- a/internal/config/config.pb.go
+++ b/internal/config/config.pb.go
@@ -35,28 +35,30 @@ type Config struct {
 	Hostname string `protobuf:"bytes,1,opt,name=hostname" json:"hostname,omitempty"`
 	// Maximum email size, in megabytes.
 	// Default: 50.
-	MaxDataSizeMb int64 `protobuf:"varint,2,opt,name=max_data_size_mb" json:"max_data_size_mb,omitempty"`
+	MaxDataSizeMb int64 `protobuf:"varint,2,opt,name=max_data_size_mb,json=maxDataSizeMb" json:"max_data_size_mb,omitempty"`
 	// Addresses to listen on for SMTP (usually port 25).
 	// Default: "systemd", which means systemd passes sockets to us.
-	SmtpAddress []string `protobuf:"bytes,3,rep,name=smtp_address" json:"smtp_address,omitempty"`
+	// systemd sockets must be named with "FileDescriptorName=smtp".
+	SmtpAddress []string `protobuf:"bytes,3,rep,name=smtp_address,json=smtpAddress" json:"smtp_address,omitempty"`
 	// Addresses to listen on for submission (usually port 587).
 	// Default: "systemd", which means systemd passes sockets to us.
-	SubmissionAddress []string `protobuf:"bytes,4,rep,name=submission_address" json:"submission_address,omitempty"`
+	// systemd sockets must be named with "FileDescriptorName=submission".
+	SubmissionAddress []string `protobuf:"bytes,4,rep,name=submission_address,json=submissionAddress" json:"submission_address,omitempty"`
 	// Address for the monitoring http server.
 	// Default: no monitoring http server.
-	MonitoringAddress string `protobuf:"bytes,5,opt,name=monitoring_address" json:"monitoring_address,omitempty"`
+	MonitoringAddress string `protobuf:"bytes,5,opt,name=monitoring_address,json=monitoringAddress" json:"monitoring_address,omitempty"`
 	// Mail delivery agent (MDA, also known as LDA) to use.
 	// This should point to the binary to use to deliver email to local users.
 	// The content of the email will be passed via stdin.
 	// If it exits unsuccessfully, we assume the mail was not delivered.
 	// Default: "procmail".
-	MailDeliveryAgentBin string `protobuf:"bytes,6,opt,name=mail_delivery_agent_bin" json:"mail_delivery_agent_bin,omitempty"`
+	MailDeliveryAgentBin string `protobuf:"bytes,6,opt,name=mail_delivery_agent_bin,json=mailDeliveryAgentBin" json:"mail_delivery_agent_bin,omitempty"`
 	// Command line arguments for the mail delivery agent. One per argument.
 	// Some replacements will be done:
 	//  - "%user%"   -> local user (anything before the @)
 	//  - "%domain%" -> domain (anything after the @)
 	// Default: "-d", "%user"  (adequate for procmail)
-	MailDeliveryAgentArgs []string `protobuf:"bytes,7,rep,name=mail_delivery_agent_args" json:"mail_delivery_agent_args,omitempty"`
+	MailDeliveryAgentArgs []string `protobuf:"bytes,7,rep,name=mail_delivery_agent_args,json=mailDeliveryAgentArgs" json:"mail_delivery_agent_args,omitempty"`
 }
 
 func (m *Config) Reset()                    { *m = Config{} }
@@ -71,17 +73,20 @@ func init() {
 func init() { proto.RegisterFile("config.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 186 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x6c, 0xcf, 0xc1, 0x8a, 0xc2, 0x30,
-	0x10, 0x80, 0x61, 0xba, 0xdd, 0xed, 0xee, 0x0e, 0x3d, 0x94, 0xb0, 0xb0, 0xc1, 0x8b, 0xc5, 0x93,
-	0x27, 0x2f, 0x3e, 0x82, 0x0f, 0x12, 0x26, 0x26, 0xc6, 0x81, 0x26, 0x29, 0x99, 0x28, 0xea, 0xfb,
-	0xf9, 0x5e, 0xd6, 0x80, 0x3d, 0x79, 0x9d, 0xef, 0x67, 0x86, 0x81, 0x76, 0x1f, 0xc3, 0x81, 0xdc,
-	0x66, 0x4c, 0x31, 0xc7, 0xd5, 0xbd, 0x82, 0x66, 0x57, 0x06, 0xa2, 0x83, 0x9f, 0x63, 0xe4, 0x1c,
-	0xd0, 0x5b, 0x59, 0xf5, 0xd5, 0xfa, 0x57, 0x48, 0xe8, 0x3c, 0x5e, 0x94, 0xc1, 0x8c, 0x8a, 0xe9,
-	0x66, 0x95, 0xd7, 0xf2, 0x63, 0x92, 0x5a, 0xfc, 0x41, 0xcb, 0x3e, 0x8f, 0x0a, 0x8d, 0x49, 0x96,
-	0x59, 0xd6, 0x7d, 0x3d, 0xf5, 0x0b, 0x10, 0x7c, 0xd2, 0x9e, 0x98, 0x29, 0x86, 0xd9, 0x3e, 0x5f,
-	0xe6, 0x63, 0xa0, 0x1c, 0x13, 0x05, 0x37, 0xdb, 0x57, 0xb9, 0xb3, 0x84, 0x7f, 0x8f, 0x34, 0x28,
-	0x63, 0x07, 0x3a, 0xdb, 0x74, 0x55, 0xe8, 0x6c, 0xc8, 0x4a, 0x53, 0x90, 0x4d, 0x09, 0x7a, 0x90,
-	0xef, 0x02, 0x4c, 0x8e, 0xe5, 0xf7, 0x73, 0xbd, 0x6e, 0xca, 0x3b, 0xdb, 0x47, 0x00, 0x00, 0x00,
-	0xff, 0xff, 0x75, 0x30, 0x88, 0xe6, 0xde, 0x00, 0x00, 0x00,
+	// 236 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x6c, 0x90, 0x41, 0x2f, 0x04, 0x31,
+	0x14, 0xc7, 0xb3, 0x3b, 0x0c, 0x6a, 0x25, 0xb6, 0x21, 0x1a, 0xa7, 0xe5, 0xc2, 0x85, 0x8b, 0x88,
+	0xf3, 0xb0, 0x57, 0x97, 0xf5, 0x01, 0x9a, 0x57, 0x53, 0xf5, 0x92, 0xed, 0xeb, 0xa6, 0xaf, 0x04,
+	0x1f, 0xce, 0x67, 0xd3, 0x29, 0x66, 0x24, 0xf6, 0x38, 0xbf, 0xdf, 0xef, 0x3f, 0x79, 0xa9, 0x98,
+	0x3c, 0x06, 0x7a, 0x42, 0x77, 0xb9, 0x8a, 0x21, 0x85, 0xd3, 0xcf, 0xb1, 0xa8, 0xef, 0x0a, 0x90,
+	0xc7, 0x62, 0xfb, 0x39, 0x70, 0x22, 0xf0, 0x56, 0x8d, 0x66, 0xa3, 0xf3, 0x9d, 0x45, 0xff, 0x2d,
+	0xcf, 0xc4, 0xbe, 0x87, 0x37, 0xdd, 0x42, 0x02, 0xcd, 0xf8, 0x61, 0xb5, 0x37, 0x6a, 0x9c, 0x9b,
+	0x6a, 0xb1, 0x97, 0xf9, 0x3c, 0xe3, 0x87, 0x4c, 0xef, 0x8d, 0x3c, 0x11, 0x13, 0xf6, 0x69, 0xa5,
+	0xa1, 0x6d, 0xa3, 0x65, 0x56, 0xd5, 0xac, 0xca, 0x3f, 0xda, 0xed, 0x58, 0xf3, 0x8d, 0xe4, 0x85,
+	0x90, 0xfc, 0x62, 0x3c, 0x32, 0x63, 0xa0, 0x3e, 0xdc, 0x28, 0xe1, 0x74, 0x30, 0x7f, 0x72, 0x1f,
+	0x08, 0x53, 0x88, 0x48, 0xae, 0xcf, 0x37, 0xcb, 0x81, 0xd3, 0xc1, 0xfc, 0xe6, 0xd7, 0xe2, 0xc8,
+	0x03, 0x2e, 0x75, 0x6b, 0x97, 0xf8, 0x6a, 0xe3, 0xbb, 0x06, 0x67, 0x29, 0x69, 0x83, 0xa4, 0xea,
+	0xb2, 0x39, 0xe8, 0xf4, 0xfc, 0xc7, 0x36, 0x9d, 0xbc, 0x45, 0x92, 0x37, 0x42, 0xad, 0x9b, 0x41,
+	0x74, 0xac, 0xb6, 0xca, 0x69, 0x87, 0xff, 0x76, 0x4d, 0x96, 0xa6, 0x2e, 0xef, 0x78, 0xf5, 0x15,
+	0x00, 0x00, 0xff, 0xff, 0x23, 0xe3, 0xdb, 0x23, 0x57, 0x01, 0x00, 0x00,
 }
diff --git a/internal/protoio/testpb/testpb.pb.go b/internal/protoio/testpb/testpb.pb.go
index f20e2c4..01e9c4f 100644
--- a/internal/protoio/testpb/testpb.pb.go
+++ b/internal/protoio/testpb/testpb.pb.go
@@ -44,10 +44,10 @@ func init() {
 func init() { proto.RegisterFile("testpb.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 69 bytes of a gzipped FileDescriptorProto
+	// 72 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xe2, 0x29, 0x49, 0x2d, 0x2e,
-	0x29, 0x48, 0xd2, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x83, 0xf0, 0x94, 0x44, 0xb8, 0x18,
-	0x7d, 0x85, 0xf8, 0xb9, 0xd8, 0x93, 0xf3, 0xf3, 0x4a, 0x52, 0xf3, 0x4a, 0x24, 0x18, 0x15, 0x18,
-	0x35, 0x38, 0x93, 0xd8, 0xc0, 0x8a, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa9, 0x18, 0x08,
-	0x20, 0x34, 0x00, 0x00, 0x00,
+	0x29, 0x48, 0xd2, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x83, 0xf0, 0x94, 0x64, 0xb9, 0x18,
+	0x7d, 0x85, 0x24, 0xb8, 0xd8, 0x93, 0xf3, 0xf3, 0x4a, 0x52, 0xf3, 0x4a, 0x24, 0x18, 0x15, 0x18,
+	0x35, 0x38, 0x83, 0x60, 0xdc, 0x24, 0x36, 0xb0, 0x6a, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff,
+	0xcb, 0x37, 0x9b, 0x8f, 0x3d, 0x00, 0x00, 0x00,
 }