From 3f00c1b6cfde161a4ef17812d8d7b3081c445224 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Wed, 28 Feb 2024 20:26:54 +0100
Subject: [PATCH] os: unexport host control functions

these aren't used by modules/drivers, so no need to export them.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1344>
---
 dix/dispatch.c |  1 +
 include/os.h   | 45 ---------------------------------------------
 os/auth.h      | 18 ++++++++++++++++++
 3 files changed, 19 insertions(+), 45 deletions(-)

diff --git a/dix/dispatch.c b/dix/dispatch.c
index 41dffd631..71c3aea4d 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -103,6 +103,7 @@ Equipment Corporation.
 
 #include "dix/dix_priv.h"
 #include "dix/registry_priv.h"
+#include "os/auth.h"
 
 #include "windowstr.h"
 #include <X11/fonts/fontstruct.h>
diff --git a/include/os.h b/include/os.h
index c4e27a4cb..4b4a896ab 100644
--- a/include/os.h
+++ b/include/os.h
@@ -320,37 +320,6 @@ OsAbort(void)
 extern _X_EXPORT Bool
 PrivsElevated(void);
 
-extern _X_EXPORT int
-AddHost(ClientPtr /*client */ ,
-        int /*family */ ,
-        unsigned /*length */ ,
-        const void * /*pAddr */ );
-
-extern _X_EXPORT Bool
-ForEachHostInFamily(int family,
-                    Bool (*func)(
-                                           unsigned char *addr,
-                                           short len,
-                                           void *closure),
-                    void *closure);
-
-extern _X_EXPORT int
-RemoveHost(ClientPtr client,
-           int family,
-           unsigned length,
-           void *pAddr);
-
-extern _X_EXPORT int
-GetHosts(void ** /*data */ ,
-         int * /*pnHosts */ ,
-         int * /*pLen */ ,
-         BOOL * /*pEnabled */ );
-
-typedef struct sockaddr *sockaddrPtr;
-
-extern _X_EXPORT int
-InvalidHost(sockaddrPtr /*saddr */ , int /*len */ , ClientPtr client);
-
 extern _X_EXPORT int
 ChangeAccessControl(ClientPtr /*client */ , int /*fEnabled */ );
 
@@ -360,23 +329,9 @@ GetClientFd(ClientPtr);
 extern _X_EXPORT Bool
 ClientIsLocal(ClientPtr client);
 
-extern _X_EXPORT void
-AddLocalHosts(void);
-
-extern _X_EXPORT void
-ResetHosts(const char *display);
-
 extern _X_EXPORT void
 AccessUsingXdmcp(void);
 
-extern _X_EXPORT void
-DefineSelf(int /*fd */ );
-
-#ifdef XDMCP
-extern _X_EXPORT void
-AugmentSelf(void *from, int len);
-#endif
-
 extern _X_EXPORT int
 ddxProcessArgument(int /*argc */ , char * /*argv */ [], int /*i */ );
 
diff --git a/os/auth.h b/os/auth.h
index baad9fda9..a4f096887 100644
--- a/os/auth.h
+++ b/os/auth.h
@@ -89,4 +89,22 @@ void RegisterAuthorizations(void);
 
 void CheckUserAuthorization(void);
 
+typedef struct sockaddr *sockaddrPtr;
+
+int AddHost(ClientPtr client, int family, unsigned length, const void *pAddr);
+Bool ForEachHostInFamily(int family,
+                         Bool (*func)(unsigned char *addr, short len, void *closure),
+                         void *closure);
+int RemoveHost(ClientPtr client, int family, unsigned length, void *pAddr);
+int GetHosts(void **data, int *pnHosts, int *pLen, BOOL *pEnabled);
+int InvalidHost(sockaddrPtr saddr, int len, ClientPtr client);
+void AddLocalHosts(void);
+void ResetHosts(const char *display);
+
+/* register local hosts entries for outself, based on listening fd */
+void DefineSelf(int fd);
+
+/* check whether given addr belongs to ourself */
+void AugmentSelf(void *from, int len);
+
 #endif /* _XSERVER_OS_AUTH_H */