2003-11-14 16:54:54 +01:00
|
|
|
/*
|
|
|
|
|
|
|
|
Copyright 1988, 1998 The Open Group
|
|
|
|
|
|
|
|
Permission to use, copy, modify, distribute, and sell this software and its
|
|
|
|
documentation for any purpose is hereby granted without fee, provided that
|
|
|
|
the above copyright notice appear in all copies and that both that
|
|
|
|
copyright notice and this permission notice appear in supporting
|
|
|
|
documentation.
|
|
|
|
|
|
|
|
The above copyright notice and this permission notice shall be included
|
|
|
|
in all copies or substantial portions of the Software.
|
|
|
|
|
|
|
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
|
|
|
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
|
|
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
|
|
|
IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
|
|
|
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
|
|
|
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
|
|
OTHER DEALINGS IN THE SOFTWARE.
|
|
|
|
|
|
|
|
Except as contained in this notice, the name of The Open Group shall
|
|
|
|
not be used in advertising or otherwise to promote the sale, use or
|
|
|
|
other dealings in this Software without prior written authorization
|
|
|
|
from The Open Group.
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* authorization hooks for the server
|
|
|
|
* Author: Keith Packard, MIT X Consortium
|
|
|
|
*/
|
|
|
|
|
2005-07-03 09:02:09 +02:00
|
|
|
#ifdef HAVE_DIX_CONFIG_H
|
|
|
|
#include <dix-config.h>
|
|
|
|
#endif
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
#include <X11/X.h>
|
|
|
|
#include <X11/Xauth.h>
|
|
|
|
#include "misc.h"
|
|
|
|
#include "osdep.h"
|
|
|
|
#include "dixstruct.h"
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/stat.h>
|
2003-11-14 16:54:54 +01:00
|
|
|
#ifdef WIN32
|
2005-04-20 18:40:52 +02:00
|
|
|
#include <X11/Xw32defs.h>
|
2003-11-14 16:54:54 +01:00
|
|
|
#endif
|
|
|
|
|
|
|
|
struct protocol {
|
2012-03-21 20:55:09 +01:00
|
|
|
unsigned short name_length;
|
|
|
|
const char *name;
|
|
|
|
AuthAddCFunc Add; /* new authorization data */
|
|
|
|
AuthCheckFunc Check; /* verify client authorization data */
|
|
|
|
AuthRstCFunc Reset; /* delete all authorization data entries */
|
|
|
|
AuthToIDFunc ToID; /* convert cookie to ID */
|
|
|
|
AuthFromIDFunc FromID; /* convert ID to cookie */
|
|
|
|
AuthRemCFunc Remove; /* remove a specific cookie */
|
2003-11-14 16:54:54 +01:00
|
|
|
#ifdef XCSECURITY
|
2012-03-21 20:55:09 +01:00
|
|
|
AuthGenCFunc Generate;
|
2003-11-14 16:54:54 +01:00
|
|
|
#endif
|
|
|
|
};
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
static struct protocol protocols[] = {
|
|
|
|
{(unsigned short) 18, "MIT-MAGIC-COOKIE-1",
|
|
|
|
MitAddCookie, MitCheckCookie, MitResetCookie,
|
|
|
|
MitToID, MitFromID, MitRemoveCookie,
|
2003-11-14 16:54:54 +01:00
|
|
|
#ifdef XCSECURITY
|
2012-03-21 20:55:09 +01:00
|
|
|
MitGenerateCookie
|
2003-11-14 16:54:54 +01:00
|
|
|
#endif
|
2012-03-21 20:55:09 +01:00
|
|
|
},
|
2003-11-14 16:54:54 +01:00
|
|
|
#ifdef HASXDMAUTH
|
2012-03-21 20:55:09 +01:00
|
|
|
{(unsigned short) 19, "XDM-AUTHORIZATION-1",
|
|
|
|
XdmAddCookie, XdmCheckCookie, XdmResetCookie,
|
|
|
|
XdmToID, XdmFromID, XdmRemoveCookie,
|
2003-11-14 16:54:54 +01:00
|
|
|
#ifdef XCSECURITY
|
2012-03-21 20:55:09 +01:00
|
|
|
NULL
|
2003-11-14 16:54:54 +01:00
|
|
|
#endif
|
2012-03-21 20:55:09 +01:00
|
|
|
},
|
2003-11-14 16:54:54 +01:00
|
|
|
#endif
|
|
|
|
#ifdef SECURE_RPC
|
2012-03-21 20:55:09 +01:00
|
|
|
{(unsigned short) 9, "SUN-DES-1",
|
|
|
|
SecureRPCAdd, SecureRPCCheck, SecureRPCReset,
|
|
|
|
SecureRPCToID, SecureRPCFromID, SecureRPCRemove,
|
2003-11-14 16:54:54 +01:00
|
|
|
#ifdef XCSECURITY
|
2012-03-21 20:55:09 +01:00
|
|
|
NULL
|
2003-11-14 16:54:54 +01:00
|
|
|
#endif
|
2012-03-21 20:55:09 +01:00
|
|
|
},
|
2003-11-14 16:54:54 +01:00
|
|
|
#endif
|
|
|
|
};
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
#define NUM_AUTHORIZATION (sizeof (protocols) /\
|
2003-11-14 16:54:54 +01:00
|
|
|
sizeof (struct protocol))
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Initialize all classes of authorization by reading the
|
|
|
|
* specified authorization file
|
|
|
|
*/
|
|
|
|
|
2013-11-15 14:19:24 +01:00
|
|
|
static const char *authorization_file = NULL;
|
2003-11-14 16:54:54 +01:00
|
|
|
|
|
|
|
static Bool ShouldLoadAuth = TRUE;
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
void
|
2013-11-15 14:19:24 +01:00
|
|
|
InitAuthorization(const char *file_name)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
|
|
|
authorization_file = file_name;
|
|
|
|
}
|
|
|
|
|
2003-11-25 20:29:01 +01:00
|
|
|
static int
|
2012-03-21 20:55:09 +01:00
|
|
|
LoadAuthorization(void)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
FILE *f;
|
|
|
|
Xauth *auth;
|
|
|
|
int i;
|
|
|
|
int count = 0;
|
2003-11-14 16:54:54 +01:00
|
|
|
|
|
|
|
ShouldLoadAuth = FALSE;
|
|
|
|
if (!authorization_file)
|
2012-03-21 20:55:09 +01:00
|
|
|
return 0;
|
2003-11-25 20:29:01 +01:00
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
f = Fopen(authorization_file, "r");
|
2003-11-14 16:54:54 +01:00
|
|
|
if (!f)
|
2012-03-21 20:55:09 +01:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
while ((auth = XauReadAuth(f)) != 0) {
|
|
|
|
for (i = 0; i < NUM_AUTHORIZATION; i++) {
|
|
|
|
if (protocols[i].name_length == auth->name_length &&
|
|
|
|
memcmp(protocols[i].name, auth->name,
|
|
|
|
(int) auth->name_length) == 0 && protocols[i].Add) {
|
|
|
|
++count;
|
|
|
|
(*protocols[i].Add) (auth->data_length, auth->data,
|
|
|
|
FakeClientID(0));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
XauDisposeAuth(auth);
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
2003-11-14 17:49:22 +01:00
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
Fclose(f);
|
2003-11-14 16:54:54 +01:00
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef XDMCP
|
|
|
|
/*
|
|
|
|
* XdmcpInit calls this function to discover all authorization
|
|
|
|
* schemes supported by the display
|
|
|
|
*/
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
void
|
2012-03-21 20:55:09 +01:00
|
|
|
RegisterAuthorizations(void)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
int i;
|
2003-11-14 16:54:54 +01:00
|
|
|
|
|
|
|
for (i = 0; i < NUM_AUTHORIZATION; i++)
|
2012-03-21 20:55:09 +01:00
|
|
|
XdmcpRegisterAuthorization(protocols[i].name,
|
|
|
|
(int) protocols[i].name_length);
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
XID
|
2012-03-21 20:55:09 +01:00
|
|
|
CheckAuthorization(unsigned int name_length,
|
|
|
|
const char *name,
|
|
|
|
unsigned int data_length,
|
|
|
|
const char *data, ClientPtr client, const char **reason)
|
|
|
|
{ /* failure message. NULL for default msg */
|
|
|
|
int i;
|
2003-11-14 16:54:54 +01:00
|
|
|
struct stat buf;
|
|
|
|
static time_t lastmod = 0;
|
2003-11-14 17:49:22 +01:00
|
|
|
static Bool loaded = FALSE;
|
2003-11-14 16:54:54 +01:00
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
if (!authorization_file || stat(authorization_file, &buf)) {
|
|
|
|
if (lastmod != 0) {
|
|
|
|
lastmod = 0;
|
|
|
|
ShouldLoadAuth = TRUE; /* stat lost, so force reload */
|
|
|
|
}
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
2012-03-21 20:55:09 +01:00
|
|
|
else if (buf.st_mtime > lastmod) {
|
|
|
|
lastmod = buf.st_mtime;
|
|
|
|
ShouldLoadAuth = TRUE;
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
2012-03-21 20:55:09 +01:00
|
|
|
if (ShouldLoadAuth) {
|
|
|
|
int loadauth = LoadAuthorization();
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If the authorization file has at least one entry for this server,
|
|
|
|
* disable local host access. (loadauth > 0)
|
|
|
|
*
|
|
|
|
* If there are zero entries (either initially or when the
|
|
|
|
* authorization file is later reloaded), or if a valid
|
|
|
|
* authorization file was never loaded, enable local host access.
|
|
|
|
* (loadauth == 0 || !loaded)
|
|
|
|
*
|
|
|
|
* If the authorization file was loaded initially (with valid
|
|
|
|
* entries for this server), and reloading it later fails, don't
|
|
|
|
* change anything. (loadauth == -1 && loaded)
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (loadauth > 0) {
|
|
|
|
DisableLocalHost(); /* got at least one */
|
|
|
|
loaded = TRUE;
|
|
|
|
}
|
|
|
|
else if (loadauth == 0 || !loaded)
|
|
|
|
EnableLocalHost();
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
2003-11-14 17:49:22 +01:00
|
|
|
if (name_length) {
|
2012-03-21 20:55:09 +01:00
|
|
|
for (i = 0; i < NUM_AUTHORIZATION; i++) {
|
|
|
|
if (protocols[i].name_length == name_length &&
|
|
|
|
memcmp(protocols[i].name, name, (int) name_length) == 0) {
|
|
|
|
return (*protocols[i].Check) (data_length, data, client,
|
|
|
|
reason);
|
|
|
|
}
|
|
|
|
*reason = "Protocol not supported by server\n";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
*reason = "No protocol specified\n";
|
2003-11-14 16:54:54 +01:00
|
|
|
return (XID) ~0L;
|
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
void
|
2012-03-21 20:55:09 +01:00
|
|
|
ResetAuthorization(void)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
int i;
|
2003-11-14 16:54:54 +01:00
|
|
|
|
|
|
|
for (i = 0; i < NUM_AUTHORIZATION; i++)
|
2012-03-21 20:55:09 +01:00
|
|
|
if (protocols[i].Reset)
|
|
|
|
(*protocols[i].Reset) ();
|
2003-11-14 16:54:54 +01:00
|
|
|
ShouldLoadAuth = TRUE;
|
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
int
|
2012-03-21 20:55:09 +01:00
|
|
|
AuthorizationFromID(XID id,
|
|
|
|
unsigned short *name_lenp,
|
|
|
|
const char **namep, unsigned short *data_lenp, char **datap)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
int i;
|
2003-11-14 16:54:54 +01:00
|
|
|
|
|
|
|
for (i = 0; i < NUM_AUTHORIZATION; i++) {
|
2012-03-21 20:55:09 +01:00
|
|
|
if (protocols[i].FromID &&
|
|
|
|
(*protocols[i].FromID) (id, data_lenp, datap)) {
|
|
|
|
*name_lenp = protocols[i].name_length;
|
|
|
|
*namep = protocols[i].name;
|
|
|
|
return 1;
|
|
|
|
}
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
int
|
2012-03-21 20:55:09 +01:00
|
|
|
RemoveAuthorization(unsigned short name_length,
|
|
|
|
const char *name,
|
|
|
|
unsigned short data_length, const char *data)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
int i;
|
2003-11-14 16:54:54 +01:00
|
|
|
|
|
|
|
for (i = 0; i < NUM_AUTHORIZATION; i++) {
|
2012-03-21 20:55:09 +01:00
|
|
|
if (protocols[i].name_length == name_length &&
|
|
|
|
memcmp(protocols[i].name, name, (int) name_length) == 0 &&
|
|
|
|
protocols[i].Remove) {
|
|
|
|
return (*protocols[i].Remove) (data_length, data);
|
|
|
|
}
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
int
|
2012-03-21 20:55:09 +01:00
|
|
|
AddAuthorization(unsigned name_length, const char *name,
|
|
|
|
unsigned data_length, char *data)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
int i;
|
2003-11-14 16:54:54 +01:00
|
|
|
|
|
|
|
for (i = 0; i < NUM_AUTHORIZATION; i++) {
|
2012-03-21 20:55:09 +01:00
|
|
|
if (protocols[i].name_length == name_length &&
|
|
|
|
memcmp(protocols[i].name, name, (int) name_length) == 0 &&
|
|
|
|
protocols[i].Add) {
|
|
|
|
return (*protocols[i].Add) (data_length, data, FakeClientID(0));
|
|
|
|
}
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef XCSECURITY
|
|
|
|
|
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
2008-12-03 08:43:34 +01:00
|
|
|
XID
|
2012-03-21 20:55:09 +01:00
|
|
|
GenerateAuthorization(unsigned name_length,
|
|
|
|
const char *name,
|
|
|
|
unsigned data_length,
|
|
|
|
const char *data,
|
|
|
|
unsigned *data_length_return, char **data_return)
|
2003-11-14 16:54:54 +01:00
|
|
|
{
|
2012-03-21 20:55:09 +01:00
|
|
|
int i;
|
2003-11-14 16:54:54 +01:00
|
|
|
|
|
|
|
for (i = 0; i < NUM_AUTHORIZATION; i++) {
|
2012-03-21 20:55:09 +01:00
|
|
|
if (protocols[i].name_length == name_length &&
|
|
|
|
memcmp(protocols[i].name, name, (int) name_length) == 0 &&
|
|
|
|
protocols[i].Generate) {
|
|
|
|
return (*protocols[i].Generate) (data_length, data,
|
|
|
|
FakeClientID(0),
|
|
|
|
data_length_return, data_return);
|
|
|
|
}
|
2003-11-14 16:54:54 +01:00
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2007-11-17 01:53:11 +01:00
|
|
|
void
|
2012-03-21 20:55:09 +01:00
|
|
|
GenerateRandomData(int len, char *buf)
|
2007-11-17 01:53:11 +01:00
|
|
|
{
|
|
|
|
int fd;
|
|
|
|
|
|
|
|
fd = open("/dev/urandom", O_RDONLY);
|
|
|
|
read(fd, buf, len);
|
|
|
|
close(fd);
|
|
|
|
}
|
|
|
|
|
2012-03-21 20:55:09 +01:00
|
|
|
#endif /* XCSECURITY */
|