Merge upstream v0.16.23
Five conflicts, resolved: - crates/common/src/auth/authentication.rs: upstream's get_directory_for_token and JwtClaims replace extract_jwt_domain; the per-domain directory code (DIR-1, DIR-5 to DIR-7) is kept, and the token lookup routes through it. The release's one new Enterprise snippet was the body of get_directory_for_issuer, which stays returning None: a token naming no address gets the server default, as DIR-2 specifies and as v0.16.22 did. - crates/common/src/manager/application.rs: upstream's rewrite of the tests, with the temp directory names renamed again, and the 5(a) notice the name-purge change should have added. - crates/common/src/network/mta.rs: both sides' imports. - crates/main/Cargo.toml: the AGPL-only license kept, version 0.16.23. - Cargo.lock: upstream's, with the fork's crates added by Cargo.
This commit is contained in:
@@ -57,7 +57,7 @@ pub async fn insert_test_data(server: &Server) {
|
||||
server.inner.data.queue_id_gen.generate(),
|
||||
QueueName::default(),
|
||||
);
|
||||
assert!(qm.save_changes(server, None).await);
|
||||
assert!(qm.save_changes(server, None, None).await);
|
||||
}
|
||||
|
||||
for report in sample_tls_internal_reports() {
|
||||
@@ -163,7 +163,7 @@ fn sample_queued_messages(blob_hashes: Vec<BlobHash>) -> Vec<Message> {
|
||||
},
|
||||
}),
|
||||
flags: RCPT_DSN_SENT,
|
||||
orcpt: Some("rfc822;[email protected]".into()),
|
||||
orcpt: Some("[email protected]".into()),
|
||||
},
|
||||
],
|
||||
received_from_ip: std::net::IpAddr::V4(Ipv4Addr::new(192, 168, 1, 10)),
|
||||
|
||||
Reference in New Issue
Block a user