Clean up changes no longer needed.

we had several hunks left over from merges with upstream that are no longer needed.
Clean up the upstream diff.

diff --git a/raddb/sites-available/chbind b/raddb/sites-available/chbind
deleted file mode 100644 (file)
index 4b07bd3..0000000
--- a/raddb/sites-available/chbind
+++ /dev/null
@@ -1,19 +0,0 @@
-server chbind{
-    authorize {
-       if (GSS-Acceptor-Service-Name && outer.request:GSS-Acceptor-Service-Name != GSS-Acceptor-Service-Name ) {
-           reject
-       }
-       update reply {
-           GSS-Acceptor-Service-NAME == "%{GSS-ACCEPTOR-SERVICE-Name}"
-           GSS-ACCEPTOR-Host-Name == "%{GSS-Acceptor-Host-Name}"
-           GSS-Acceptor-Realm-Name == "%{GSS-Acceptor-Realm-Name}"
-       }
-       if (GSS-Acceptor-Service-Name || GSS-Acceptor-Realm-Name || GSS-Acceptor-Host-Name) {
-           update control {
-               Chbind-Response-Code := success
-           }
-       }
-       handled
-    }
-}
-

diff --git a/share/dictionary.abfab b/share/dictionary.abfab
deleted file mode 100644 (file)
index da4ee67..0000000
--- a/share/dictionary.abfab
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- text -*-
-# Copyright (C) 2011 The FreeRADIUS Server project and contributors
-
-# Attributes defined in approved draft-ietf-abfab-gss-eap
-ATTRIBUTE GSS-Acceptor-Service-Name                    164     string
-ATTRIBUTE GSS-Acceptor-Host-Name                       165     string
-ATTRIBUTE GSS-Acceptor-Service-Specifics               166     string
-ATTRIBUTE GSS-Acceptor-Realm-Name                      167     string

diff --git a/share/dictionary.freeradius.internal b/share/dictionary.freeradius.internal
index 35a4526..48f507a 100644 (file)
--- a/share/dictionary.freeradius.internal
+++ b/share/dictionary.freeradius.internal
@@ -248,13 +248,6 @@ ATTRIBUTE  Chbind-Response-Code                    1147    integer
 VALUE  Chbind-Response-Code            success                 2
 VALUE  Chbind-Response-Code            failure                 3
 
-#      For EAP channel binding
-
-ATTRIBUTE      Chbind-Response-Code                    1147    integer
-
-VALUE  Chbind-Response-Code            success                 2
-VALUE  Chbind-Response-Code            failure                 3
-
 ATTRIBUTE      Acct-Input-Octets64                     1148    integer64
 ATTRIBUTE      Acct-Output-Octets64                    1149    integer64
 

diff --git a/src/include/radius.h b/src/include/radius.h
index fe89884..eaf2cc2 100644 (file)
--- a/src/include/radius.h
+++ b/src/include/radius.h
@@ -151,7 +151,6 @@ typedef enum {
  */
 #include <freeradius-devel/attributes.h>
 
-#define PW_CHBIND_RESPONSE_CODE                1147
 /*
  *     Integer Translations
  */

diff --git a/src/main/tls.c b/src/main/tls.c
index 94597d7..5a33201 100644 (file)
--- a/src/main/tls.c
+++ b/src/main/tls.c
@@ -170,7 +170,7 @@ static unsigned int psk_server_callback(SSL *ssl, const char *identity,
                return 0;
        }
 
-               psk_len = strlen(conf->psk_password);
+       psk_len = strlen(conf->psk_password);
        if (psk_len > (2 * max_psk_len)) return 0;
 
        return fr_hex2bin(psk, max_psk_len, conf->psk_password, psk_len);