diff options
author | Adam Jackson <ajax@benzedrine.nwnk.net> | 2007-06-04 18:07:00 -0400 |
---|---|---|
committer | Adam Jackson <ajax@benzedrine.nwnk.net> | 2007-06-04 18:07:00 -0400 |
commit | dfbe32b5b828cc4e3da36a0e2e6ad641164eaa5e (patch) | |
tree | 1b08018adca275fe5ee38eb12366ac8d256f191a /os/access.c | |
parent | 75dece08fb72803d5116e6776e9f1534ff20e37b (diff) |
Remove the old Kerberos 5 authentication code.
Before you complain, this code hasn't seen material change since at least
X11R6. It certainly does not build with any modern version of Kerberos.
Anybody wanting krb5 auth to their X server should probably be using
GSSAPI instead of internal krb5 API anyway.
Diffstat (limited to 'os/access.c')
-rw-r--r-- | os/access.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/os/access.c b/os/access.c index 221b8cbcd..2de0ead43 100644 --- a/os/access.c +++ b/os/access.c @@ -1169,10 +1169,6 @@ ResetHosts (char *display) struct nodeent *np; struct dn_naddr dnaddr, *dnaddrp, *dnet_addr(); #endif -#ifdef K5AUTH - krb5_principal princ; - krb5_data kbuf; -#endif int family = 0; pointer addr; int len; @@ -1252,13 +1248,6 @@ ResetHosts (char *display) hostname = ohostname + 4; } #endif -#ifdef K5AUTH - else if (!strncmp("krb:", lhostname, 4)) - { - family = FamilyKrb5Principal; - hostname = ohostname + 4; - } -#endif else if (!strncmp("si:", lhostname, 3)) { family = FamilyServerInterpreted; @@ -1301,16 +1290,6 @@ ResetHosts (char *display) } else #endif /* DNETCONN */ -#ifdef K5AUTH - if (family == FamilyKrb5Principal) - { - krb5_parse_name(hostname, &princ); - XauKrb5Encode(princ, &kbuf); - (void) NewHost(FamilyKrb5Principal, kbuf.data, kbuf.length, FALSE); - krb5_free_principal(princ); - } - else -#endif #ifdef SECURE_RPC if ((family == FamilyNetname) || (strchr(hostname, '@'))) { @@ -1552,11 +1531,6 @@ AddHost (ClientPtr client, len = length; LocalHostEnabled = TRUE; break; -#ifdef K5AUTH - case FamilyKrb5Principal: - len = length; - break; -#endif #ifdef SECURE_RPC case FamilyNetname: len = length; @@ -1655,11 +1629,6 @@ RemoveHost ( len = length; LocalHostEnabled = FALSE; break; -#ifdef K5AUTH - case FamilyKrb5Principal: - len = length; - break; -#endif #ifdef SECURE_RPC case FamilyNetname: len = length; |