Ensure we leave room for the trailing NUL

[freeradius.git] / raddb / users

diff --git a/raddb/users b/raddb/users
index e533df0..1c17b50 100644 (file)
--- a/raddb/users
+++ b/raddb/users
@@ -1,7 +1,3 @@
-bob    User-Password = "hello", Gandalf-Around-The-Corner = "foo"
-       Gandalf-Around-The-Corner = "foo",
-       Reply-Message = "Hello %u"
-
 #
 #      Please read the documentation file ../doc/processing_users_file,
 #      or 'man 5 users' (after installing the server) for more information.
@@ -35,10 +31,6 @@ bob  User-Password = "hello", Gandalf-Around-The-Corner = "foo"
 #      file, the DEFAULT entries _have_ to be at the end of this file and
 #      you can't have multiple entries for one username.
 #
-#      You don't need to specify a password if you set Auth-Type += System
-#      on the list of authentication requirements. The RADIUS server
-#      will then check the system password file.
-#
 #      Indented (with the tab character) lines following the first
 #      line indicate the configuration values to be passed back to
 #      the comm server to allow the initiation of a user session.
@@ -81,7 +73,7 @@ bob   User-Password = "hello", Gandalf-Around-The-Corner = "foo"
 # entry so that no DEFAULT entry will be used, and the user will NOT
 # get any attributes in addition to the ones listed here.
 #
-#steve Auth-Type := Local, User-Password == "testing"
+#steve Cleartext-Password := "testing"
 #      Service-Type = Framed-User,
 #      Framed-Protocol = PPP,
 #      Framed-IP-Address = 172.16.3.33,
@@ -95,13 +87,13 @@ bob User-Password = "hello", Gandalf-Around-The-Corner = "foo"
 # This is an entry for a user with a space in their name.
 # Note the double quotes surrounding the name.
 #
-#"John Doe"    Auth-Type := Local, User-Password == "hello"
-#              Reply-Message = "Hello, %u"
+#"John Doe"    Cleartext-Password := "hello"
+#              Reply-Message = "Hello, %{User-Name}"
 
 #
 # Dial user back and telnet to the default host for that port
 #
-#Deg   Auth-Type := Local, User-Password == "ge55ged"
+#Deg   Cleartext-Password := "ge55ged"
 #      Service-Type = Callback-Login-User,
 #      Login-IP-Host = 0.0.0.0,
 #      Callback-Number = "9,5551212",
@@ -113,7 +105,7 @@ bob User-Password = "hello", Gandalf-Around-The-Corner = "foo"
 # connection will be broken and the user will be dialed back after which
 # he will get a connection to the host "timeshare1".
 #
-#dialbk        Auth-Type := Local, User-Password == "callme"
+#dialbk        Cleartext-Password := "callme"
 #      Service-Type = Callback-Login-User,
 #      Login-IP-Host = timeshare1,
 #      Login-Service = PortMaster,
@@ -132,10 +124,10 @@ bob       User-Password = "hello", Gandalf-Around-The-Corner = "foo"
 
 #
 # If the user logs in as 'username.shell', then authenticate them
-# against the system database, give them shell access, and stop processing
+# using the default method, give them shell access, and stop processing
 # the rest of the file.
 #
-#DEFAULT       Suffix == ".shell", Auth-Type := System
+#DEFAULT       Suffix == ".shell"
 #              Service-Type = Login-User,
 #              Login-Service = Telnet,
 #              Login-IP-Host = your.shell.machine
@@ -150,13 +142,6 @@ bob        User-Password = "hello", Gandalf-Around-The-Corner = "foo"
 #
 
 #
-# First setup all accounts to be checked against the UNIX /etc/passwd.
-# (Unless a password was already given earlier in this file).
-#
-DEFAULT        Auth-Type = System
-       Fall-Through = 1
-
-#
 # Set up different IP address pools for the terminal servers.
 # Note that the "+" behind the IP address means that this is the "base"
 # IP address. The Port-Id (S0, S1 etc) will be added to it.
@@ -213,6 +198,6 @@ DEFAULT     Hint == "SLIP"
 # # Last default: shell on the local terminal server.
 # #
 # DEFAULT
-#      Service-Type = Shell-User
+#      Service-Type = Administrative-User
 
 # On no match, the user is denied access.