diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c index 4ec987335..8b4fd0192 100644 --- a/bin/ps/keyword.c +++ b/bin/ps/keyword.c @@ -1,4 +1,4 @@ -/* $OpenBSD: keyword.c,v 1.52 2022/02/25 18:05:49 rob Exp $ */ +/* $OpenBSD: keyword.c,v 1.53 2024/10/10 10:24:14 claudio Exp $ */ /* $NetBSD: keyword.c,v 1.12.6.1 1996/05/30 21:25:13 cgd Exp $ */ /*- @@ -158,7 +158,7 @@ VAR var[] = { {"rtable", "RTABLE", NULL, 0, pvar, 0, 0, POFF(p_rtableid), INT32, "d"}, UID("ruid", "RUID", pvar, POFF(p_ruid)), {"ruser", "RUSER", NULL, LJUST, runame, USERLEN}, - {"sess", "SESS", NULL, 0, pvar, PTRWIDTH, 0, POFF(p_sess), UINT64, "llx"}, + PID("sess", "SESS", pvar, POFF(p_sid)), {"sig", "PENDING", NULL, 0, pvar, 8, 0, POFF(p_siglist), INT32, "x"}, {"sigcatch", "CAUGHT", NULL, 0, pvar, 8, 0, POFF(p_sigcatch), UINT32, "x"}, {"sigignore", "IGNORED", diff --git a/bin/ps/ps.1 b/bin/ps/ps.1 index 4452bdcc4..2ea4db84e 100644 --- a/bin/ps/ps.1 +++ b/bin/ps/ps.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ps.1,v 1.137 2024/08/21 03:07:45 deraadt Exp $ +.\" $OpenBSD: ps.1,v 1.138 2024/10/10 10:24:14 claudio Exp $ .\" $NetBSD: ps.1,v 1.16 1996/03/21 01:36:28 jtc Exp $ .\" .\" Copyright (c) 1980, 1990, 1991, 1993, 1994 @@ -30,7 +30,7 @@ .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 .\" -.Dd $Mdocdate: August 21 2024 $ +.Dd $Mdocdate: October 10 2024 $ .Dt PS 1 .Os .Sh NAME @@ -382,7 +382,7 @@ Real user ID. User name (from .Cm ruid ) . .It Cm sess -Session pointer. +Session ID (PID of session leader). .It Cm sig Alias: .Cm pending . diff --git a/lib/libcrypto/conf/conf_local.h b/lib/libcrypto/conf/conf_local.h index d7255e1a0..e22c1180b 100644 --- a/lib/libcrypto/conf/conf_local.h +++ b/lib/libcrypto/conf/conf_local.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf_local.h,v 1.7 2024/08/31 09:54:31 tb Exp $ */ +/* $OpenBSD: conf_local.h,v 1.8 2024/10/10 06:51:22 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -79,15 +79,7 @@ struct conf_method_st { int CONF_module_add(const char *name, conf_init_func *ifunc, conf_finish_func *ffunc); -const char *CONF_imodule_get_name(const CONF_IMODULE *md); const char *CONF_imodule_get_value(const CONF_IMODULE *md); -void *CONF_imodule_get_usr_data(const CONF_IMODULE *md); -void CONF_imodule_set_usr_data(CONF_IMODULE *md, void *usr_data); -CONF_MODULE *CONF_imodule_get_module(const CONF_IMODULE *md); -unsigned long CONF_imodule_get_flags(const CONF_IMODULE *md); -void CONF_imodule_set_flags(CONF_IMODULE *md, unsigned long flags); -void *CONF_module_get_usr_data(CONF_MODULE *pmod); -void CONF_module_set_usr_data(CONF_MODULE *pmod, void *usr_data); int CONF_parse_list(const char *list, int sep, int nospc, int (*list_cb)(const char *elem, int len, void *usr), void *arg); diff --git a/lib/libcrypto/conf/conf_mod.c b/lib/libcrypto/conf/conf_mod.c index 3477bc71b..0e07bb3ea 100644 --- a/lib/libcrypto/conf/conf_mod.c +++ b/lib/libcrypto/conf/conf_mod.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf_mod.c,v 1.39 2024/08/31 09:26:18 tb Exp $ */ +/* $OpenBSD: conf_mod.c,v 1.40 2024/10/10 06:51:22 tb Exp $ */ /* Written by Stephen Henson (steve@openssl.org) for the OpenSSL * project 2001. */ @@ -76,7 +76,6 @@ struct conf_module_st { conf_finish_func *finish; /* Number of successfully initialized modules */ int links; - void *usr_data; }; @@ -87,10 +86,7 @@ struct conf_module_st { struct conf_imodule_st { CONF_MODULE *mod; - char *name; char *value; - unsigned long flags; - void *usr_data; }; static STACK_OF(CONF_MODULE) *supported_modules = NULL; @@ -293,8 +289,6 @@ module_init(CONF_MODULE *mod, char *name, char *value, const CONF *cnf) imod->mod = mod; - if ((imod->name = strdup(name)) == NULL) - goto err; if ((imod->value = strdup(value)) == NULL) goto err; @@ -373,7 +367,6 @@ imodule_free(CONF_IMODULE *imod) if (imod == NULL) return; - free(imod->name); free(imod->value); free(imod); } @@ -422,64 +415,12 @@ CONF_modules_free(void) } LCRYPTO_ALIAS(CONF_modules_free); -/* Utility functions */ - -const char * -CONF_imodule_get_name(const CONF_IMODULE *imod) -{ - return imod->name; -} - const char * CONF_imodule_get_value(const CONF_IMODULE *imod) { return imod->value; } -void * -CONF_imodule_get_usr_data(const CONF_IMODULE *imod) -{ - return imod->usr_data; -} - -void -CONF_imodule_set_usr_data(CONF_IMODULE *imod, void *usr_data) -{ - imod->usr_data = usr_data; -} - -CONF_MODULE * -CONF_imodule_get_module(const CONF_IMODULE *imod) -{ - return imod->mod; -} - -unsigned long -CONF_imodule_get_flags(const CONF_IMODULE *imod) -{ - return imod->flags; -} - -void -CONF_imodule_set_flags(CONF_IMODULE *imod, unsigned long flags) -{ - imod->flags = flags; -} - -void * -CONF_module_get_usr_data(CONF_MODULE *mod) -{ - return mod->usr_data; -} - -void -CONF_module_set_usr_data(CONF_MODULE *mod, void *usr_data) -{ - mod->usr_data = usr_data; -} - -/* Return default config file name */ - char * CONF_get1_default_config_file(void) { diff --git a/regress/usr.sbin/bgpd/config/Makefile b/regress/usr.sbin/bgpd/config/Makefile index 97a69be6b..8ca4c6245 100644 --- a/regress/usr.sbin/bgpd/config/Makefile +++ b/regress/usr.sbin/bgpd/config/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.14 2024/04/09 09:33:46 claudio Exp $ +# $OpenBSD: Makefile,v 1.15 2024/10/10 14:02:47 claudio Exp $ -BGPDTESTS=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 +BGPDTESTS=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 .for n in ${BGPDTESTS} BGPD_TARGETS+=bgpd${n} diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.17.in b/regress/usr.sbin/bgpd/config/bgpd.conf.17.in new file mode 100644 index 000000000..6564167ed --- /dev/null +++ b/regress/usr.sbin/bgpd/config/bgpd.conf.17.in @@ -0,0 +1,70 @@ +# $OpenBSD: bgpd.conf.17.in,v 1.1 2024/10/10 14:02:47 claudio Exp $ +# Test various authentication statements + +AS 1 + +rtr 127.0.1.2 { + tcp md5sig password secret +} + +rtr 127.0.1.3 { + tcp md5sig key deadbeef +} + +rtr 127.0.1.4 { + ipsec ah ike +} + +rtr 127.0.1.5 { + ipsec esp ike +} + +rtr 127.0.1.6 { + ipsec ah in spi 12706 sha1 deadbeefdeadbeefdeadbeefdeadbeef01c0ffee + ipsec ah out spi 12707 sha1 deadbeefdeadbeefdeadbeefdeadbeef02c0ffee +} + +rtr 127.0.1.7 { + ipsec esp in spi 12742 sha1 deadbeefdeadbeefdeadbeefdeadbeef01c0ffee \ + aes deadbeefdeadbeefdeadbeefdeadbeef + ipsec esp out spi 12743 sha1 deadbeefdeadbeefdeadbeefdeadbeef02c0ffee \ + aes deadbeefdeadbeefdeadbeefdeadbeef +} + +neighbor 127.0.0.2 { + remote-as 2 + tcp md5sig password secret +} + +neighbor 127.0.0.3 { + remote-as 3 + tcp md5sig key deadbeef +} + +neighbor 127.0.0.4 { + remote-as 4 + local-address 127.0.0.1 + ipsec ah ike +} + +neighbor 127.0.0.5 { + remote-as 5 + local-address 127.0.0.1 + ipsec esp ike +} + +neighbor 127.0.0.6 { + remote-as 6 + local-address 127.0.0.1 + ipsec ah in spi 12706 sha1 deadbeefdeadbeefdeadbeefdeadbeef01c0ffee + ipsec ah out spi 12707 sha1 deadbeefdeadbeefdeadbeefdeadbeef02c0ffee +} + +neighbor 127.0.0.7 { + remote-as 7 + local-address 127.0.0.1 + ipsec esp in spi 12742 sha1 deadbeefdeadbeefdeadbeefdeadbeef01c0ffee \ + aes deadbeefdeadbeefdeadbeefdeadbeef + ipsec esp out spi 12743 sha1 deadbeefdeadbeefdeadbeefdeadbeef02c0ffee \ + aes deadbeefdeadbeefdeadbeefdeadbeef +} diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.17.ok b/regress/usr.sbin/bgpd/config/bgpd.conf.17.ok new file mode 100644 index 000000000..b5dcb6c24 --- /dev/null +++ b/regress/usr.sbin/bgpd/config/bgpd.conf.17.ok @@ -0,0 +1,102 @@ +AS 1 +router-id 127.0.0.1 +socket "/var/run/bgpd.sock.0" +listen on 0.0.0.0 +listen on :: + +rtr 127.0.1.2 { + descr "127.0.1.2" + port 323 + tcp md5sig +} + +rtr 127.0.1.3 { + descr "127.0.1.3" + port 323 + tcp md5sig +} + +rtr 127.0.1.4 { + descr "127.0.1.4" + port 323 + ipsec ah ike +} + +rtr 127.0.1.5 { + descr "127.0.1.5" + port 323 + ipsec esp ike +} + +rtr 127.0.1.6 { + descr "127.0.1.6" + port 323 + ipsec ah in spi 12706 sha1 XXXXXX + ipsec ah out spi 12707 sha1 XXXXXX +} + +rtr 127.0.1.7 { + descr "127.0.1.7" + port 323 + ipsec esp in spi 12742 sha1 XXXXXX aes XXXXXX + ipsec esp out spi 12743 sha1 XXXXXX aes XXXXXX +} + + +rde rib Adj-RIB-In no evaluate +rde rib Loc-RIB rtable 0 fib-update yes + +neighbor 127.0.0.2 { + remote-as 2 + enforce neighbor-as yes + enforce local-as yes + tcp md5sig + announce IPv4 unicast + announce policy no +} +neighbor 127.0.0.3 { + remote-as 3 + enforce neighbor-as yes + enforce local-as yes + tcp md5sig + announce IPv4 unicast + announce policy no +} +neighbor 127.0.0.4 { + remote-as 4 + local-address 127.0.0.1 + enforce neighbor-as yes + enforce local-as yes + ipsec ah ike + announce IPv4 unicast + announce policy no +} +neighbor 127.0.0.5 { + remote-as 5 + local-address 127.0.0.1 + enforce neighbor-as yes + enforce local-as yes + ipsec esp ike + announce IPv4 unicast + announce policy no +} +neighbor 127.0.0.6 { + remote-as 6 + local-address 127.0.0.1 + enforce neighbor-as yes + enforce local-as yes + ipsec ah in spi 12706 sha1 XXXXXX + ipsec ah out spi 12707 sha1 XXXXXX + announce IPv4 unicast + announce policy no +} +neighbor 127.0.0.7 { + remote-as 7 + local-address 127.0.0.1 + enforce neighbor-as yes + enforce local-as yes + ipsec esp in spi 12742 sha1 XXXXXX aes XXXXXX + ipsec esp out spi 12743 sha1 XXXXXX aes XXXXXX + announce IPv4 unicast + announce policy no +} diff --git a/sys/arch/amd64/pci/acpipci.c b/sys/arch/amd64/pci/acpipci.c index f4fb49b4c..3e8172825 100644 --- a/sys/arch/amd64/pci/acpipci.c +++ b/sys/arch/amd64/pci/acpipci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpipci.c,v 1.8 2024/05/13 01:15:50 jsg Exp $ */ +/* $OpenBSD: acpipci.c,v 1.9 2024/10/10 05:51:23 jsg Exp $ */ /* * Copyright (c) 2018 Mark Kettenis * @@ -194,12 +194,18 @@ acpipci_attach_bus(struct device *parent, struct acpipci_softc *sc) (sc->sc_acpi->sc_fadt->iapc_boot_arch & FADT_NO_MSI) == 0) pba.pba_flags |= PCI_FLAGS_MSI_ENABLED; + /* Enable MSI for QEMU claiming ACPI 1.0 */ + tag = pci_make_tag(pba.pba_pc, sc->sc_bus, 0, 0); + id = pci_conf_read(pba.pba_pc, tag, PCI_SUBSYS_ID_REG); + if (sc->sc_acpi->sc_fadt->hdr.revision == 1 && + PCI_VENDOR(id) == PCI_VENDOR_QUMRANET) + pba.pba_flags |= PCI_FLAGS_MSI_ENABLED; + /* * Don't enable MSI on chipsets from low-end manufacturers * like VIA and SiS. We do this by looking at the host * bridge, which should be device 0 function 0. */ - tag = pci_make_tag(pba.pba_pc, sc->sc_bus, 0, 0); id = pci_conf_read(pba.pba_pc, tag, PCI_ID_REG); class = pci_conf_read(pba.pba_pc, tag, PCI_CLASS_REG); if (PCI_CLASS(class) == PCI_CLASS_BRIDGE && diff --git a/sys/arch/i386/pci/pci_machdep.c b/sys/arch/i386/pci/pci_machdep.c index 0e507af47..ada3ba282 100644 --- a/sys/arch/i386/pci/pci_machdep.c +++ b/sys/arch/i386/pci/pci_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_machdep.c,v 1.87 2021/03/11 11:16:57 jsg Exp $ */ +/* $OpenBSD: pci_machdep.c,v 1.88 2024/10/10 06:00:42 jsg Exp $ */ /* $NetBSD: pci_machdep.c,v 1.28 1997/06/06 23:29:17 thorpej Exp $ */ /*- @@ -324,6 +324,11 @@ pci_attach_hook(struct device *parent, struct device *self, break; } + /* Enable MSI for QEMU */ + id = pci_conf_read(pc, tag, PCI_SUBSYS_ID_REG); + if (PCI_VENDOR(id) == PCI_VENDOR_QUMRANET) + pba->pba_flags |= PCI_FLAGS_MSI_ENABLED; + /* * Don't enable MSI on a HyperTransport bus. In order to * determine that bus 0 is a HyperTransport bus, we look at diff --git a/sys/dev/pci/agp_i810.c b/sys/dev/pci/agp_i810.c index 7f4444ffb..7253d4cd7 100644 --- a/sys/dev/pci/agp_i810.c +++ b/sys/dev/pci/agp_i810.c @@ -1,4 +1,4 @@ -/* $OpenBSD: agp_i810.c,v 1.97 2024/05/24 06:02:53 jsg Exp $ */ +/* $OpenBSD: agp_i810.c,v 1.98 2024/10/10 03:36:10 jsg Exp $ */ /*- * Copyright (c) 2000 Doug Rabson @@ -515,7 +515,6 @@ agp_i810_attach(struct device *parent, struct device *self, void *aux) isc->agpdev = (struct agp_softc *)agp_attach_bus(pa, &agp_i810_methods, isc->isc_apaddr, isc->isc_apsize, &isc->dev); - isc->agpdev->sc_stolen_entries = isc->stolen; return; out: diff --git a/sys/dev/pci/agpvar.h b/sys/dev/pci/agpvar.h index 4d28e7804..36eff5f73 100644 --- a/sys/dev/pci/agpvar.h +++ b/sys/dev/pci/agpvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: agpvar.h,v 1.37 2024/07/02 04:29:01 jsg Exp $ */ +/* $OpenBSD: agpvar.h,v 1.40 2024/10/10 03:36:10 jsg Exp $ */ /* $NetBSD: agpvar.h,v 1.4 2001/10/01 21:54:48 fvdl Exp $ */ /*- @@ -32,15 +32,6 @@ #ifndef _PCI_AGPVAR_H_ #define _PCI_AGPVAR_H_ -/* #define AGP_DEBUG */ -#ifdef AGP_DEBUG -#define AGP_DPF(fmt, arg...) do { printf("agp: " fmt ,##arg); } while (0) -#else -#define AGP_DPF(fmt, arg...) do {} while (0) -#endif - -#define AGPUNIT(x) minor(x) - struct agp_attach_args { char *aa_busname; struct pci_attach_args *aa_pa; @@ -72,13 +63,6 @@ struct agp_info { u_int32_t ai_devid; }; -struct agp_memory_info { - vsize_t ami_size; /* size in bytes */ - bus_addr_t ami_physical; /* bogus hack for i810 */ - off_t ami_offset; /* page offset if bound */ - int ami_is_bound; /* non-zero if bound */ -}; - struct agp_methods { void (*bind_page)(void *, bus_addr_t, paddr_t, int); void (*unbind_page)(void *, bus_addr_t); @@ -101,12 +85,9 @@ struct agp_softc { pcitag_t sc_pcitag; bus_addr_t sc_apaddr; bus_size_t sc_apsize; - uint32_t sc_stolen_entries; pcireg_t sc_id; - int sc_opened; int sc_capoff; - int sc_nextid; /* next mem block id */ enum agp_acquire_state sc_state; u_int32_t sc_maxmem; /* mem upper bound */ diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c index 246a30096..f25e3c239 100644 --- a/sys/net/if_tun.c +++ b/sys/net/if_tun.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_tun.c,v 1.240 2023/12/23 10:52:54 bluhm Exp $ */ +/* $OpenBSD: if_tun.c,v 1.241 2024/10/10 06:50:58 dlg Exp $ */ /* $NetBSD: if_tun.c,v 1.24 1996/05/07 02:40:48 thorpej Exp $ */ /* @@ -101,8 +101,8 @@ int tundebug = TUN_DEBUG; #define TUNDEBUG(a) /* (tundebug? printf a : 0) */ #endif -/* Only these IFF flags are changeable by TUNSIFINFO */ -#define TUN_IFF_FLAGS (IFF_UP|IFF_POINTOPOINT|IFF_MULTICAST|IFF_BROADCAST) +/* Pretend that these IFF flags are changeable by TUNSIFINFO */ +#define TUN_IFF_FLAGS (IFF_POINTOPOINT|IFF_MULTICAST|IFF_BROADCAST) void tunattach(int); @@ -709,17 +709,18 @@ tun_dev_ioctl(dev_t dev, u_long cmd, void *data) error = EINVAL; break; } + if (tunp->flags != (sc->sc_if.if_flags & TUN_IFF_FLAGS)) { + error = EINVAL; + break; + } sc->sc_if.if_mtu = tunp->mtu; - sc->sc_if.if_flags = - (tunp->flags & TUN_IFF_FLAGS) | - (sc->sc_if.if_flags & ~TUN_IFF_FLAGS); sc->sc_if.if_baudrate = tunp->baudrate; break; case TUNGIFINFO: tunp = (struct tuninfo *)data; tunp->mtu = sc->sc_if.if_mtu; tunp->type = sc->sc_if.if_type; - tunp->flags = sc->sc_if.if_flags; + tunp->flags = sc->sc_if.if_flags & TUN_IFF_FLAGS; tunp->baudrate = sc->sc_if.if_baudrate; break; #ifdef TUN_DEBUG @@ -731,13 +732,7 @@ tun_dev_ioctl(dev_t dev, u_long cmd, void *data) break; #endif case TUNSIFMODE: - switch (*(int *)data & (IFF_POINTOPOINT|IFF_BROADCAST)) { - case IFF_POINTOPOINT: - case IFF_BROADCAST: - sc->sc_if.if_flags &= ~TUN_IFF_FLAGS; - sc->sc_if.if_flags |= *(int *)data & TUN_IFF_FLAGS; - break; - default: + if (*(int *)data != (sc->sc_if.if_flags & TUN_IFF_FLAGS)) { error = EINVAL; break; } diff --git a/usr.bin/tmux/format.c b/usr.bin/tmux/format.c index 10283c597..a39649184 100644 --- a/usr.bin/tmux/format.c +++ b/usr.bin/tmux/format.c @@ -1,4 +1,4 @@ -/* $OpenBSD: format.c,v 1.320 2024/08/26 07:14:40 nicm Exp $ */ +/* $OpenBSD: format.c,v 1.321 2024/10/10 10:41:33 nicm Exp $ */ /* * Copyright (c) 2011 Nicholas Marriott @@ -2320,6 +2320,13 @@ format_cb_version(__unused struct format_tree *ft) return (xstrdup(getversion())); } +/* Callback for sixel_support. */ +static void * +format_cb_sixel_support(__unused struct format_tree *ft) +{ + return (xstrdup("0")); +} + /* Callback for active_window_index. */ static void * format_cb_active_window_index(struct format_tree *ft) @@ -3147,6 +3154,9 @@ static const struct format_table_entry format_table[] = { { "session_windows", FORMAT_TABLE_STRING, format_cb_session_windows }, + { "sixel_support", FORMAT_TABLE_STRING, + format_cb_sixel_support + }, { "socket_path", FORMAT_TABLE_STRING, format_cb_socket_path }, diff --git a/usr.bin/tmux/tmux.1 b/usr.bin/tmux/tmux.1 index bd93f8466..99e4f0311 100644 --- a/usr.bin/tmux/tmux.1 +++ b/usr.bin/tmux/tmux.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: tmux.1,v 1.964 2024/10/07 12:58:36 nicm Exp $ +.\" $OpenBSD: tmux.1,v 1.965 2024/10/10 10:41:33 nicm Exp $ .\" .\" Copyright (c) 2007 Nicholas Marriott .\" @@ -14,7 +14,7 @@ .\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: October 7 2024 $ +.Dd $Mdocdate: October 10 2024 $ .Dt TMUX 1 .Os .Sh NAME @@ -5954,6 +5954,7 @@ The following variables are available, where appropriate: .It Li "session_stack" Ta "" Ta "Window indexes in most recent order" .It Li "session_windows" Ta "" Ta "Number of windows in session" .It Li "socket_path" Ta "" Ta "Server socket path" +.It Li "sixel_support" Ta "" Ta "1 if server has support for SIXEL" .It Li "start_time" Ta "" Ta "Server start time" .It Li "uid" Ta "" Ta "Server UID" .It Li "user" Ta "" Ta "Server user" diff --git a/usr.sbin/acme-client/netproc.c b/usr.sbin/acme-client/netproc.c index 79dcadf38..f67f8abc0 100644 --- a/usr.sbin/acme-client/netproc.c +++ b/usr.sbin/acme-client/netproc.c @@ -1,4 +1,4 @@ -/* $Id: netproc.c,v 1.36 2024/10/07 23:47:00 sthen Exp $ */ +/* $Id: netproc.c,v 1.37 2024/10/10 09:39:35 florian Exp $ */ /* * Copyright (c) 2016 Kristaps Dzonsons * @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -386,7 +387,7 @@ donewacc(struct conn *c, const struct capaths *p, const char *contact) if (c->kid != NULL) { if (stravis(&accturi, c->kid, VIS_SAFE) != -1) - dodbg("account key: %s", accturi); + printf("account key: %s\n", accturi); free(accturi); }