oysteikt/heimdal
0
0
Fork 0
Code Issues 4 Pull Requests Releases Activity

kadmind: add support for systemd socket activation

Browse Source 
Adds support for systemd's fd-passing socket activation, letting systemd
listen for connections before starting the service. This might enable
quicker startup on systems with dependent services, since they will now
only need to wait for the socket, which holds connections until kdc is
finished starting up. It also enables use of the `PrivateNetwork`
directive, sandboxing kadmind into it's own network namespace.
This commit is contained in:
Oystein Kristoffer Tveit
2026-07-22 04:43:00 +09:00
parent f6ec5e5f9a
commit 69e74be224
1 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kadmin/kadm_conn.c
+30 -4
View File
@@ -273,12 +273,37 @@ start_server(krb5_context contextp, const char *port_str)
unsigned int num_socks = 0;
int i;
if (port_str == NULL)
port_str = "+";
#ifdef HAVE_SYSTEMD
{
char **names = NULL;
int sd_n, j;
parse_ports(contextp, port_str);
sd_n = sd_listen_fds_with_names(0, &names);
if (sd_n < 0)
krb5_err(contextp, 1, -sd_n, "sd_listen_fds_with_names");
if (sd_n > 0) {
socks = malloc(sd_n * sizeof(*socks));
if (socks == NULL)
krb5_err(contextp, 1, errno, "malloc");
for (j = 0; j < sd_n; j++) {
if (names != NULL && names[j] != NULL &&
strncmp(names[j], "kadmind", 7) == 0)
socks[num_socks++] = SD_LISTEN_FDS_START + j;
}
}
for (j = 0; names != NULL && names[j] != NULL; j++)
free(names[j]);
free(names);
}
#endif /* HAVE_SYSTEMD */
for(p = kadm_ports; p; p = p->next) {
if (num_socks == 0) {
if (port_str == NULL)
port_str = "+";
parse_ports(contextp, port_str);
for(p = kadm_ports; p; p = p->next) {
struct addrinfo hints, *ai, *ap;
char portstr[32];
memset (&hints, 0, sizeof(hints));
@@ -334,6 +359,7 @@ start_server(krb5_context contextp, const char *port_str)
socks[num_socks++] = s;
}
freeaddrinfo (ai);
}
}
if(num_socks == 0)
krb5_errx(contextp, 1, "no sockets to listen to - exiting");