frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

os: move xdmauth prototypes to separate header 

The xdmcp authentication handling isn't really OS specific, and only few sites
actually need to call it, so at least it's prototypes are better off in some
separate header.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1311>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-02-14 19:24:31 +01:00 committed by Marge Bot
parent 194a7c2032
commit 8c4759a68e
5 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
os/auth.c
View File

@ -50,6 +50,7 @@ from The Open Group.
#include "rpcauth.h" #include "rpcauth.h"
#include "xdmcp.h" #include "xdmcp.h"
#include "xdmauth.h"
struct protocol { struct protocol {
unsigned short name_length; unsigned short name_length;

10
os/osdep.h
View File

@ -162,14 +162,4 @@ extern int MitFromID(AuthFromIDArgs);
extern int MitRemoveCookie(AuthRemCArgs); extern int MitRemoveCookie(AuthRemCArgs);
extern int MitResetCookie(AuthRstCArgs); extern int MitResetCookie(AuthRstCArgs);
/* in xdmauth.c */
#ifdef HASXDMAUTH
extern XID XdmCheckCookie(AuthCheckArgs);
extern int XdmAddCookie(AuthAddCArgs);
extern int XdmFromID(AuthFromIDArgs);
extern int XdmRemoveCookie(AuthRemCArgs);
extern int XdmResetCookie(AuthRstCArgs);
extern void XdmAuthenticationInit(const char *cookie, int cookie_length);
#endif
#endif /* _OSDEP_H_ */ #endif /* _OSDEP_H_ */

1
os/xdmauth.c
View File

@ -46,6 +46,7 @@ from The Open Group.
#include "os.h" #include "os.h"
#include "osdep.h" #include "osdep.h"
#include "xdmcp.h" #include "xdmcp.h"
#include "xdmauth.h"
#include "dixstruct.h" #include "dixstruct.h"
#ifdef HASXDMAUTH #ifdef HASXDMAUTH

13
os/xdmauth.h Normal file
View File

@ -0,0 +1,13 @@
#ifndef _XSERVER_OS_XDMAUTH_H
#define _XSERVER_OS_XDMAUTH_H
#include "osdep.h"
XID XdmCheckCookie(AuthCheckArgs);
int XdmAddCookie(AuthAddCArgs);
int XdmFromID(AuthFromIDArgs);
int XdmRemoveCookie(AuthRemCArgs);
int XdmResetCookie(AuthRstCArgs);
void XdmAuthenticationInit(const char *cookie, int cookie_length);
#endif /* _XSERVER_OS_XDMAUTH_H */

1
os/xdmcp.c
View File

@ -41,6 +41,7 @@
#include "misc.h" #include "misc.h"
#include "osdep.h" #include "osdep.h"
#include "xdmcp.h" #include "xdmcp.h"
#include "xdmauth.h"
#include "input.h" #include "input.h"
#include "dixstruct.h" #include "dixstruct.h"
#include "opaque.h" #include "opaque.h"