From 5805f96b0650abfe0d60eb19da9b080a456e215a Mon Sep 17 00:00:00 2001
From: Theo Buehler <tb@openbsd.org>
Date: Sun, 3 Nov 2024 08:55:11 +0100
Subject: Simplify patch and use %llu

---
 patches/tls_config.c.patch | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/patches/tls_config.c.patch b/patches/tls_config.c.patch
index 38c667f..1342a60 100644
--- a/patches/tls_config.c.patch
+++ b/patches/tls_config.c.patch
@@ -1,21 +1,15 @@
+uid_t can be 64-bit
+
 --- tls/tls_config.c.orig	2024-11-02 21:19:47.090322191 +0100
 +++ tls/tls_config.c	2024-11-02 21:38:22.527071689 +0100
-@@ -20,6 +20,7 @@
- #include <ctype.h>
- #include <errno.h>
- #include <fcntl.h>
-+#include <inttypes.h>
- #include <pthread.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -742,8 +743,8 @@
+@@ -742,8 +742,8 @@
  
  	if (sb.st_uid != getuid()) {
  		tls_config_set_errorx(config, TLS_ERROR_UNKNOWN,
 -		    "session file has incorrect owner (uid %u != %u)",
 -		    sb.st_uid, getuid());
-+		    "session file has incorrect owner (uid %" PRIu64" != %" PRIu64 ")",
-+		    (uint64_t)sb.st_uid, (uint64_t)getuid());
++		    "session file has incorrect owner (uid %llu != %llu)",
++		    (unsigned long long)sb.st_uid, (unsigned long long)getuid());
  		return (-1);
  	}
  	mugo = sb.st_mode & (S_IRWXU|S_IRWXG|S_IRWXO);
-- 
cgit v1.2.3-55-g6feb