Merge remote-tracking branch 'origin/master'

diff --git a/build-aux/compile b/build-aux/compile
index 5360806..c0096a7 100755 (executable)
--- a/build-aux/compile
+++ b/build-aux/compile
@@ -18,8 +18,7 @@ scriptversion=2009-10-06.20; # UTC
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a

diff --git a/mech_eap/dictionary.ukerna b/mech_eap/dictionary.ukerna
index 1694566..0e35d43 100644 (file)
--- a/mech_eap/dictionary.ukerna
+++ b/mech_eap/dictionary.ukerna
@@ -15,5 +15,6 @@ ATTRIBUTE     GSS-Acceptor-Service-Specific   130     string
 ATTRIBUTE      GSS-Acceptor-Realm-Name         131     string
 ATTRIBUTE      SAML-AAA-Assertion              132     string
 ATTRIBUTE      MS-Windows-Auth-Data            133     octets
+ATTRIBUTE      MS-Windows-Group-Sid            134     string
 
 END-VENDOR UKERNA