From 54874de6d4585cea4fa0427dcf5ee70fbbfe93b2 Mon Sep 17 00:00:00 2001
From: Jeremy Andrews <athenian200@outlook.com>
Date: Fri, 1 Dec 2023 19:01:18 -0600
Subject: [PATCH] Issue #2399 - Fix LDAP on Linux.

---
 ldap/c-sdk/include/lber.h          | 25 +++++++++++++------------
 ldap/c-sdk/include/ldap-platform.h |  8 ++++----
 ldap/c-sdk/include/ldap-standard.h |  8 ++++----
 ldap/c-sdk/include/regex.h         |  3 ++-
 ldap/c-sdk/liblber/lber-int.h      |  8 ++++----
 5 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/ldap/c-sdk/include/lber.h b/ldap/c-sdk/include/lber.h
index 4ad1daafd4..8e33d46b7e 100644
--- a/ldap/c-sdk/include/lber.h
+++ b/ldap/c-sdk/include/lber.h
@@ -38,12 +38,23 @@
 #ifndef _LBER_H
 #define _LBER_H
 
+#include <stdlib.h>	/* to pick up size_t typedef */
+
+#ifndef macintosh
+#if defined( _WINDOWS ) || defined( _WIN32) || defined( _CONSOLE )
+#include <winsock.h> /* for SOCKET */
+typedef SOCKET LBER_SOCKET;
+#else
+typedef long LBER_SOCKET;
+#endif /* _WINDOWS */
+#else /* macintosh */
+typedef void *LBER_SOCKET;
+#endif /* macintosh */
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <stdlib.h>	/* to pick up size_t typedef */
-
 /*
  * Note that LBER_ERROR and LBER_DEFAULT are values that can never appear
  * as valid BER tags, and so it is safe to use them to report errors.  In
@@ -130,16 +141,6 @@ typedef struct berelement BerElement;
 typedef struct sockbuf Sockbuf;
 typedef int (*BERTranslateProc)( char **bufp, ber_uint_t *buflenp,
 	int free_input );
-#ifndef macintosh
-#if defined( _WINDOWS ) || defined( _WIN32) || defined( _CONSOLE )
-#include <winsock.h> /* for SOCKET */
-typedef SOCKET LBER_SOCKET;
-#else
-typedef long LBER_SOCKET;
-#endif /* _WINDOWS */
-#else /* macintosh */
-typedef void *LBER_SOCKET;
-#endif /* macintosh */
 
 /* calling conventions used by library */
 #ifndef LDAP_CALL
diff --git a/ldap/c-sdk/include/ldap-platform.h b/ldap/c-sdk/include/ldap-platform.h
index fee8fcf664..cdc3c184ec 100644
--- a/ldap/c-sdk/include/ldap-platform.h
+++ b/ldap/c-sdk/include/ldap-platform.h
@@ -40,10 +40,6 @@
 #ifndef _LDAP_PLATFORM_H
 #define _LDAP_PLATFORM_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #if defined (WIN32) || defined (_WIN32) || defined( _CONSOLE ) 
 #include <windows.h>
 #  if defined( _WINDOWS )
@@ -74,6 +70,10 @@ extern "C" {
 #include <sys/select.h>
 #endif /* XP_OS2 */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * LDAP_API macro definition:
  */
diff --git a/ldap/c-sdk/include/ldap-standard.h b/ldap/c-sdk/include/ldap-standard.h
index 7e632cb1e7..f10e108d58 100644
--- a/ldap/c-sdk/include/ldap-standard.h
+++ b/ldap/c-sdk/include/ldap-standard.h
@@ -42,14 +42,14 @@
 #ifndef _LDAP_STANDARD_H
 #define _LDAP_STANDARD_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "ldap-platform.h"
 
 #include "lber.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define LDAP_PORT       	389
 #define LDAPS_PORT      	636
 #define LDAP_VERSION2   	2
diff --git a/ldap/c-sdk/include/regex.h b/ldap/c-sdk/include/regex.h
index 8d2c609625..335102ccab 100644
--- a/ldap/c-sdk/include/regex.h
+++ b/ldap/c-sdk/include/regex.h
@@ -52,11 +52,12 @@
  * 13 August 1993 Mark C Smith
  */
 
+#include "ldap.h" 
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "ldap.h" 
 
 #if !defined( NEEDPROTOS ) && defined( __STDC__ )
 #define NEEDPROTOS
diff --git a/ldap/c-sdk/liblber/lber-int.h b/ldap/c-sdk/liblber/lber-int.h
index e9efba345c..3e80a5d28d 100644
--- a/ldap/c-sdk/liblber/lber-int.h
+++ b/ldap/c-sdk/liblber/lber-int.h
@@ -51,10 +51,6 @@
 #ifndef _LBERINT_H
 #define _LBERINT_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <stdio.h>
 #include <ctype.h>
 #include <stdarg.h>
@@ -115,6 +111,10 @@ extern "C" {
 
 #include "lber.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifdef macintosh
 #define NSLDAPI_LBER_SOCKET_IS_PTR
 #endif