~ubuntu-branches/ubuntu/dapper/freeradius/dapper-updates

« back to all changes in this revision

Viewing changes to share/dictionary.merit

  • Committer: Bazaar Package Importer
  • Author(s): Paul Hampson
  • Date: 2006-01-15 13:34:13 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20060115133413-92geefww41y7hqi8
Tags: 1.1.0-1
* ReDebianise upstream tarball:
  - Deleted RFCs: 2243 2289 2433 2548 2618 2619 2620 2621 2716 2759 2809 2865
                  2866 2867 2868 2869 2882 2924 3162 3575 3576 3579 3580
                  draft-kamath-pppext-eap-mschapv2-00

* New FreeRADIUS modules marked stable by new upstream release
  - rlm_perl
  - rlm_sqlcounter
  - rlm_sql_log + radsqlrelay
  - rlm_otp (formerly rlm_x99_token, not built as it depends on OpenSSL)

* Remove upstream-integrated patches:
  - 02_EAP-SIM_doesnt_need_openssl
  - 03_X99_is_not_stable
  - 07_manpage_fixups
  - 09_use_crypth_if_we_have_it
  - 10_escape_entire_ldap_string
  - 11_dont_xlat_possibly_bad_usernames_in_bad_accounting_packets
  - 12_dialup_admin_various_fixes

* More dialup-admin fixes from Arve Seljebu
  - Fix redirects in dialup-admin pages on servers with
    register_globals turned off.
    Closes: #333704
  - HTTP form fields will always fail is_int, use in_numeric instead
    Closes: #335149
  - Created 12_more_dialup_admin_various_fixes

* Update to Policy 3.6.2.0
* Upgrade Debhelper support to V5
* Don't install the .in files with the examples
* Prefer libmysqlclient15-dev
  Closes: #343779
* Shared secrets can only be 31 characters long, note this in clients.conf
  - Created 02_document_actual_shared_secret_maximum_length
  Closes: 344606
* Added support for lsb-init functions

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
# -*- text -*-
1
2
#
2
3
#       For Merit.
3
4
#
4
 
#       $Id: dictionary.merit,v 1.1 2004/05/08 14:32:13 aland Exp $
 
5
#       $Id: dictionary.merit,v 1.1.4.1 2005/11/30 22:17:27 aland Exp $
5
6
#
6
 
VENDOR          Merit   61
7
 
 
8
 
ATTRIBUTE       Merit-Proxy-Action              211     string  Merit
9
 
ATTRIBUTE       Merit-User-Id                   222     string  Merit
10
 
ATTRIBUTE       Merit-User-Realm                223     string  Merit
11
 
 
12
 
 
13
 
 
 
7
VENDOR          Merit                           61
 
8
 
 
9
BEGIN-VENDOR    Merit
 
10
 
 
11
ATTRIBUTE       Merit-Proxy-Action                      211     string
 
12
ATTRIBUTE       Merit-User-Id                           222     string
 
13
ATTRIBUTE       Merit-User-Realm                        223     string
 
14
 
 
15
END-VENDOR      Merit