os: unexport local client creds handling

these functions aren't used by modules, 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>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-02-28 18:33:44 +01:00 committed by Alan Coopersmith
parent cbc9f557e5
commit 5f19eab1ee
9 changed files with 29 additions and 21 deletions

View File

@ -44,6 +44,7 @@ in this Software without prior written authorization from The Open Group.
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xproto.h> #include <X11/Xproto.h>
#include "os/auth.h"
#include "os/busfault.h" #include "os/busfault.h"
#include "misc.h" #include "misc.h"

View File

@ -55,6 +55,7 @@ SOFTWARE.
#include <X11/extensions/XI2.h> #include <X11/extensions/XI2.h>
#include "dix/dix_priv.h" #include "dix/dix_priv.h"
#include "os/auth.h"
#include "windowstr.h" #include "windowstr.h"
#include "inputstr.h" #include "inputstr.h"

View File

@ -100,6 +100,8 @@ Equipment Corporation.
#include <dix-config.h> #include <dix-config.h>
#endif #endif
#include "os/auth.h"
#include "misc.h" #include "misc.h"
#include "scrnintstr.h" #include "scrnintstr.h"
#include "os.h" #include "os.h"

View File

@ -354,27 +354,6 @@ typedef struct sockaddr *sockaddrPtr;
extern _X_EXPORT int extern _X_EXPORT int
InvalidHost(sockaddrPtr /*saddr */ , int /*len */ , ClientPtr client); InvalidHost(sockaddrPtr /*saddr */ , int /*len */ , ClientPtr client);
#define LCC_UID_SET (1 << 0)
#define LCC_GID_SET (1 << 1)
#define LCC_PID_SET (1 << 2)
#define LCC_ZID_SET (1 << 3)
typedef struct {
int fieldsSet; /* Bit mask of fields set */
int euid; /* Effective uid */
int egid; /* Primary effective group id */
int nSuppGids; /* Number of supplementary group ids */
int *pSuppGids; /* Array of supplementary group ids */
int pid; /* Process id */
int zoneid; /* Only set on Solaris 10 & later */
} LocalClientCredRec;
extern _X_EXPORT int
GetLocalClientCreds(ClientPtr, LocalClientCredRec **);
extern _X_EXPORT void
FreeLocalClientCreds(LocalClientCredRec *);
extern _X_EXPORT int extern _X_EXPORT int
ChangeAccessControl(ClientPtr /*client */ , int /*fEnabled */ ); ChangeAccessControl(ClientPtr /*client */ , int /*fEnabled */ );

View File

@ -187,6 +187,8 @@ SOFTWARE.
#define X_INCLUDE_NETDB_H #define X_INCLUDE_NETDB_H
#include <X11/Xos_r.h> #include <X11/Xos_r.h>
#include "os/auth.h"
#include "dixstruct.h" #include "dixstruct.h"
#include "osdep.h" #include "osdep.h"

View File

@ -48,6 +48,8 @@ from The Open Group.
#endif #endif
#include <stdlib.h> /* for arc4random_buf() */ #include <stdlib.h> /* for arc4random_buf() */
#include "os/auth.h"
#include "rpcauth.h" #include "rpcauth.h"
#include "xdmcp.h" #include "xdmcp.h"
#include "xdmauth.h" #include "xdmauth.h"

View File

@ -30,4 +30,22 @@ int set_font_authorizations(char **authorizations,
int *authlen, int *authlen,
void *client); void *client);
#define LCC_UID_SET (1 << 0)
#define LCC_GID_SET (1 << 1)
#define LCC_PID_SET (1 << 2)
#define LCC_ZID_SET (1 << 3)
typedef struct {
int fieldsSet; /* Bit mask of fields set */
int euid; /* Effective uid */
int egid; /* Primary effective group id */
int nSuppGids; /* Number of supplementary group ids */
int *pSuppGids; /* Array of supplementary group ids */
int pid; /* Process id */
int zoneid; /* Only set on Solaris 10 & later */
} LocalClientCredRec;
int GetLocalClientCreds(ClientPtr, LocalClientCredRec **);
void FreeLocalClientCreds(LocalClientCredRec *);
#endif /* _XSERVER_OS_AUTH_H */ #endif /* _XSERVER_OS_AUTH_H */

View File

@ -84,6 +84,8 @@
#include <sys/sysctl.h> #include <sys/sysctl.h>
#endif #endif
#include "os/auth.h"
/** /**
* Try to determine a PID for a client from its connection * Try to determine a PID for a client from its connection
* information. This should be called only once when new client has * information. This should be called only once when new client has

View File

@ -100,6 +100,7 @@ SOFTWARE.
#include "dix/dix_priv.h" #include "dix/dix_priv.h"
#include "os/audit.h" #include "os/audit.h"
#include "os/auth.h"
#include "misc.h" /* for typedef of pointer */ #include "misc.h" /* for typedef of pointer */
#include "osdep.h" #include "osdep.h"