2 files changed, 29 insertions, 0 deletions
diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5
index 475eae8c7e..869dbf9ffd 100644
--- a/docs/manpages/smb.conf.5
+++ b/docs/manpages/smb.conf.5
@@ -477,6 +477,8 @@ time server
 
 unix realname
 
+username level
+
 username map
 
 use rhosts
@@ -3199,6 +3201,26 @@ on how this parameter determines access to the services.
  	username = fred
  	username = fred, mary, jack, jane, @users, @pcgroup
 
+.SS username level (G)
+
+This option helps Samba to try and 'guess' at the real UNIX username,
+as many DOS clients send an all-uppercase username. By default Samba
+tries all lowercase, followed by the username with the first letter
+capitalized, and fails if the username is not found on the UNIX machine.
+
+If this parameter is set to non-zero the behaviour changes. This 
+parameter is a number that specifies the number of uppercase combinations 
+to try whilst trying to determine the UNIX user name. The higher the number
+the more combinations will be tried, but the slower the discovery
+of usernames will be. Use this parameter when you have strange
+usernames on your UNIX machine, such as 'AstrangeUser'.
+
+.B Default:
+    username level = 0
+
+.B Example:
+    username level = 5
+
 .SS username map (G)
 
 This option allows you to to specify a file containing a mapping of
diff --git a/docs/manpages/smbclient.1 b/docs/manpages/smbclient.1
index 6ae454f2f2..af36e4a376 100644
--- a/docs/manpages/smbclient.1
+++ b/docs/manpages/smbclient.1
@@ -257,6 +257,13 @@ If no
 is supplied and neither environment variable exists the user name will
 be empty.
 
+If the USER environment variable containts a '%' character, everything
+after that will be treated as a password. This allows you to set the
+environment variable to be
+.B USER=username%password
+so that a password is not passed on the command line (where it may
+be seen by the ps command).
+
 If the service you are connecting to requires a password, it can be supplied
 using the
 .B \-U