diff options
| author | Linus Nordberg <linus@nordberg.se> | 2013-05-15 15:39:20 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@nordberg.se> | 2013-05-15 15:39:20 +0200 |
| commit | f8207d6d51b665d6af54262c593372dd73eae0d0 (patch) | |
| tree | 2cb6ac122f8566566ca9bfb4efd5b0e4c1eddbfb /lib/radius | |
| parent | fba1c7d1a6418221a94965d0431bf7df0a9a74a0 (diff) | |
| parent | 65b62d83ee72012d1171f1813b8f989f8805497c (diff) | |
Merge branch 'libradsec' into libradsec-server-support
Conflicts:
lib/HACKING
lib/Makefile.am
lib/README
lib/compat.h
lib/conf.c
lib/configure.ac
lib/conn.c
lib/conn.h
lib/err.c
lib/err.h
lib/event.c
lib/event.h
lib/examples/Makefile.am
lib/examples/client-blocking.c
lib/examples/client.conf
lib/include/radsec/radsec-impl.h
lib/include/radsec/radsec.h
lib/include/radsec/request-impl.h
lib/include/radsec/request.h
lib/packet.c
lib/packet.h
lib/peer.c
lib/peer.h
lib/request.c
lib/send.c
lib/tcp.c
lib/tests/Makefile.am
lib/tls.c
lib/udp.c
lib/util.c
Diffstat (limited to 'lib/radius')
| -rw-r--r-- | lib/radius/Makefile.am | 8 | ||||
| -rw-r--r-- | lib/radius/share/dictionary.abfab.ietf | 4 | ||||
| -rw-r--r-- | lib/radius/share/dictionary.ukerna | 8 |
3 files changed, 14 insertions, 6 deletions
diff --git a/lib/radius/Makefile.am b/lib/radius/Makefile.am index 92a12cf..c827465 100644 --- a/lib/radius/Makefile.am +++ b/lib/radius/Makefile.am @@ -18,13 +18,18 @@ libradsec_radius_la_SOURCES = \ static.c \ valuepair.c +libradsec_radius_la_SOURCES += client.h + libradsec_radius_la_CFLAGS = $(AM_CFLAGS) -DHAVE_CONFIG_H DICTIONARIES = \ share/dictionary.txt \ share/dictionary.juniper \ share/dictionary.microsoft \ - share/dictionary.ukerna + share/dictionary.ukerna \ + share/dictionary.abfab.ietf + +EXTRA_DIST = dictionaries.c $(DICTIONARIES) common.pl convert.pl $(top_srcdir)/include/radsec/radius.h dictionaries.c: ${DICTIONARIES} convert.pl common.pl $(srcdir)/convert.pl ${DICTIONARIES} @@ -35,4 +40,3 @@ clean-local: rm -f dictionaries.c $(libradsec_radius_la_SOURCES): $(top_srcdir)/include/radsec/radius.h - diff --git a/lib/radius/share/dictionary.abfab.ietf b/lib/radius/share/dictionary.abfab.ietf new file mode 100644 index 0000000..b60702c --- /dev/null +++ b/lib/radius/share/dictionary.abfab.ietf @@ -0,0 +1,4 @@ +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/lib/radius/share/dictionary.ukerna b/lib/radius/share/dictionary.ukerna index 0e35d43..7d9d22d 100644 --- a/lib/radius/share/dictionary.ukerna +++ b/lib/radius/share/dictionary.ukerna @@ -9,10 +9,10 @@ VENDOR UKERNA 25622 BEGIN-VENDOR UKERNA -ATTRIBUTE GSS-Acceptor-Service-Name 128 string -ATTRIBUTE GSS-Acceptor-Host-Name 129 string -ATTRIBUTE GSS-Acceptor-Service-Specific 130 string -ATTRIBUTE GSS-Acceptor-Realm-Name 131 string +ATTRIBUTE GSS-Acceptor-Service-Name-VS 128 string +ATTRIBUTE GSS-Acceptor-Host-Name-VS 129 string +ATTRIBUTE GSS-Acceptor-Service-Specific-VS 130 string +ATTRIBUTE GSS-Acceptor-Realm-Name-VS 131 string ATTRIBUTE SAML-AAA-Assertion 132 string ATTRIBUTE MS-Windows-Auth-Data 133 octets ATTRIBUTE MS-Windows-Group-Sid 134 string |