From 07d08231415655cc10068182b4cc51f6974dfcb3 Mon Sep 17 00:00:00 2001
From: Howard Chu <hyc@openldap.org>
Date: Mon, 1 Jun 2026 16:26:09 +0100
Subject: [PATCH] ITS#10515 slapd/config: Windows compat

Newer gcc insists on arguments matching prototypes
---
 servers/slapd/config.c     | 4 +++-
 servers/slapd/proxyp.c     | 6 +++---
 tests/progs/slapd-tester.c | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index 359cade34c..1a377009e0 100644
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -54,9 +54,11 @@
 #ifdef _WIN32
 #define	LUTIL_ATOULX	lutil_atoullx
 #define	Z	"I"
+#define	ULTYPE	unsigned long long
 #else
 #define	LUTIL_ATOULX	lutil_atoulx
 #define	Z	"z"
+#define	ULTYPE	unsigned long
 #endif
 
 #define ARGS_STEP	512
@@ -151,7 +153,7 @@ int config_check_vals(ConfigTable *Conf, ConfigArgs *c, int check_only ) {
 	int rc, arg_user, arg_type, arg_syn, iarg;
 	unsigned uiarg;
 	long larg;
-	unsigned long ularg;
+	ULTYPE ularg;
 	ber_len_t barg;
 	
 	if(Conf->arg_type == ARG_IGNORED) {
diff --git a/servers/slapd/proxyp.c b/servers/slapd/proxyp.c
index c8915ecc51..56064a3bbc 100644
--- a/servers/slapd/proxyp.c
+++ b/servers/slapd/proxyp.c
@@ -71,7 +71,7 @@ proxyp( ber_socket_t sfd, Sockaddr *from, ber_socklen_t *salen ) {
 	peername[0] = '\0';
 
 	do {
-		ret = tcp_read( SLAP_FD2SOCK( sfd ), &pph, sizeof(pph) );
+		ret = tcp_read( SLAP_FD2SOCK( sfd ), (char *)&pph, sizeof(pph) );
 	} while ( ret == -1 && errno == EINTR );
 
 	if ( ret == -1 ) {
@@ -127,7 +127,7 @@ proxyp( ber_socket_t sfd, Sockaddr *from, ber_socklen_t *salen ) {
 		}
 
 		do {
-			ret = tcp_read( SLAP_FD2SOCK (sfd), &ppa, addr_len );
+			ret = tcp_read( SLAP_FD2SOCK (sfd), (char *)&ppa, addr_len );
 		} while ( ret == -1 && errno == EINTR );
 
 		if ( ret == -1 ) {
@@ -204,7 +204,7 @@ proxyp( ber_socket_t sfd, Sockaddr *from, ber_socklen_t *salen ) {
 		}
 
 		do {
-			ret = tcp_read( SLAP_FD2SOCK (sfd), &proxyp_options, pph_len );
+			ret = tcp_read( SLAP_FD2SOCK (sfd), (char *)&proxyp_options, pph_len );
 		} while ( ret == -1 && errno == EINTR );
 
 		if ( ret == -1 ) {
diff --git a/tests/progs/slapd-tester.c b/tests/progs/slapd-tester.c
index 20bfea8048..b8bd5112b1 100644
--- a/tests/progs/slapd-tester.c
+++ b/tests/progs/slapd-tester.c
@@ -1135,7 +1135,7 @@ fork_child( char *prog, char **args )
 
 	wait4kids( maxkids );
 
-	rc = _spawnvp( _P_NOWAIT, prog, args );
+	rc = _spawnvp( _P_NOWAIT, prog, (const char *const *)args );
 
 	if ( rc == -1 ) {
 		tester_perror( "_spawnvp", NULL );