diff options
| author | Keith Packard <keithp@keithp.com> | 2015-06-22 09:36:08 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-12-28 12:54:40 +0100 |
| commit | 68dd0b52e13c844d662192654fb10cb993257a59 (patch) | |
| tree | a97ab98a06147cd5fb194063a9984dc3973fba55 /nx-X11/programs/Xserver/os/k5auth.c | |
| parent | e9f44221b2520a1d894b3c125269b5d10438453b (diff) | |
| download | nx-libs-68dd0b52e13c844d662192654fb10cb993257a59.tar.gz nx-libs-68dd0b52e13c844d662192654fb10cb993257a59.tar.bz2 nx-libs-68dd0b52e13c844d662192654fb10cb993257a59.zip | |
Replace 'pointer' type with 'void *'
This lets us stop using the 'pointer' typedef in Xdefs.h as 'pointer'
is used throughout the X server for other things, and having duplicate
names generates compiler warnings.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Rebased against NX: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Diffstat (limited to 'nx-X11/programs/Xserver/os/k5auth.c')
| -rw-r--r-- | nx-X11/programs/Xserver/os/k5auth.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/os/k5auth.c b/nx-X11/programs/Xserver/os/k5auth.c index 78301ad10..3c50de032 100644 --- a/nx-X11/programs/Xserver/os/k5auth.c +++ b/nx-X11/programs/Xserver/os/k5auth.c @@ -79,7 +79,7 @@ static char kerror[256]; * extract session key from a credentials struct */ krb5_error_code tgt_keyproc(keyprocarg, principal, vno, key) - krb5_pointer keyprocarg; + krb5_void * keyprocarg; krb5_principal principal; krb5_kvno vno; krb5_keyblock **key; @@ -237,15 +237,15 @@ XID K5Check(data_length, data, client, reason) client->clientState = ClientStateAuthenticating; if (ccname) { - ((OsCommPtr)client->osPrivate)->authstate.srvcreds = (pointer)creds; /* save tgt creds */ + ((OsCommPtr)client->osPrivate)->authstate.srvcreds = (void *)creds; /* save tgt creds */ ((OsCommPtr)client->osPrivate)->authstate.ktname = NULL; ((OsCommPtr)client->osPrivate)->authstate.srvname = NULL; } if (srvname) { ((OsCommPtr)client->osPrivate)->authstate.srvcreds = NULL; - ((OsCommPtr)client->osPrivate)->authstate.ktname = (pointer)ktname; - ((OsCommPtr)client->osPrivate)->authstate.srvname = (pointer)srvname; + ((OsCommPtr)client->osPrivate)->authstate.ktname = (void *)ktname; + ((OsCommPtr)client->osPrivate)->authstate.srvname = (void *)srvname; } ((OsCommPtr)client->osPrivate)->authstate.stageno = 1; /* next stage is 1 */ return krb5_id; @@ -476,7 +476,7 @@ int k5_stage1(client) /* * Now check to see if the principal we got is one that we want to let in */ - if (ForEachHostInFamily(FamilyKrb5Principal, k5_cmpenc, (pointer)&buf)) + if (ForEachHostInFamily(FamilyKrb5Principal, k5_cmpenc, (void *)&buf)) { free(buf.data); /* |