Remove remaining references to "password level" in the tree

Reviewed-by: Simo Sorce <idra@samba.org>
Autobuild-User(master): Simo Sorce <idra@samba.org>
Autobuild-Date(master): Tue Jun 11 16:25:54 CEST 2013 on sn-devel-104

diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-Diagnosis.xml b/docs-xml/Samba3-HOWTO/TOSHARG-Diagnosis.xml
index 5ea2db26416e38ddbd6f5bbb8ea9ed7ed53d605d..657cc971c5fd530d149652b2c13fbac57ae6fe67 100644 (file)
--- a/docs-xml/Samba3-HOWTO/TOSHARG-Diagnosis.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-Diagnosis.xml
@@ -446,7 +446,7 @@ If it says <quote><errorname>bad password,</errorname></quote> then the likely c
 <listitem>
        <para>
        You have explicitly disabled encrypted passwords with
 <listitem>
        <para>
        You have explicitly disabled encrypted passwords with

-       <smbconfoption name="encrypt passwords">no</smbconfoption> have a mixed-case password and you haven't enabled the <smbconfoption name="password level"/> option at a high enough level.
+       <smbconfoption name="encrypt passwords">no</smbconfoption> have a mixed-case password.

        </para>
 </listitem>
 
        </para>
 </listitem>
 

diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-ServerType.xml b/docs-xml/Samba3-HOWTO/TOSHARG-ServerType.xml
index f0c07d208120cc28d45ca51ed471cebf78952440..4d672c6dd18116e0fd37821dc427122fcbb6a59f 100644 (file)
--- a/docs-xml/Samba3-HOWTO/TOSHARG-ServerType.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-ServerType.xml
@@ -494,7 +494,6 @@ when using clear-text authentication:
 
 <?latex \newpage ?>
 <smbconfblock>
 
 <?latex \newpage ?>
 <smbconfblock>

-<smbconfoption name="password level"><replaceable>integer</replaceable></smbconfoption>

 <smbconfoption name="username level"><replaceable>integer</replaceable></smbconfoption>
 </smbconfblock>
 
 <smbconfoption name="username level"><replaceable>integer</replaceable></smbconfoption>
 </smbconfblock>
 


@@ -509,11 +508,7 @@ is rarely needed.
 <indexterm><primary>clear-text</primary></indexterm>
 However, passwords on UNIX systems often make use of mixed-case characters.  This means that in order for a
 user on a Windows 9x/Me client to connect to a Samba server using clear-text authentication, the
 <indexterm><primary>clear-text</primary></indexterm>
 However, passwords on UNIX systems often make use of mixed-case characters.  This means that in order for a
 user on a Windows 9x/Me client to connect to a Samba server using clear-text authentication, the

-<smbconfoption name="password level"/> must be set to the maximum number of uppercase letters that
-<emphasis>could</emphasis> appear in a password. Note that if the Server OS uses the traditional DES version
-of crypt(), a <smbconfoption name="password level"/> of 8 will result in case-insensitive passwords as seen
-from Windows users. This will also result in longer login times because Samba has to compute the permutations
-of the password string and try them one by one until a match is located (or all combinations fail).
+password must be in lower case.

 </para>
 
 <para>
 </para>
 
 <para>

diff --git a/docs-xml/using_samba/appc.xml b/docs-xml/using_samba/appc.xml
index 69330ffd3bb08eec07b23fb5faa3585d13e25a1d..08a49955a361a95e984d5be2e9fc8b621413271e 100644 (file)
--- a/docs-xml/using_samba/appc.xml
+++ b/docs-xml/using_samba/appc.xml
@@ -1858,20 +1858,6 @@ options.</para>
 </refsynopsisdiv>
 </refentry>
 
 </refsynopsisdiv>
 </refentry>
 

-<refentry id="appc-refentry-134">
-<refmeta>
-<refmiscinfo class="allowable values">number</refmiscinfo>
-<refmiscinfo class="default">0</refmiscinfo>
-</refmeta>
-<refnamediv>
-<refname>[global] password level = number</refname>
-</refnamediv>
-<refsynopsisdiv>
-<para>Specifies the number of uppercase letter permutations used to match passwords. Workaround for clients that change passwords to a single case before sending them to the Samba server. Causes repeated login attempts with passwords in different cases, which can trigger account lockouts.</para>
-
-</refsynopsisdiv>
-</refentry>
-

 <refentry id="appc-refentry-135">
 <refmeta>
 <refmiscinfo class="allowable values">list of NetBIOS names</refmiscinfo>
 <refentry id="appc-refentry-135">
 <refmeta>
 <refmiscinfo class="allowable values">list of NetBIOS names</refmiscinfo>

diff --git a/docs-xml/using_samba/ch06.xml b/docs-xml/using_samba/ch06.xml
index b099e96071240dbb1fcd267a7a887ce7a8886d31..a4a9160e081003db2c11a260b981a1b30c46dbda 100644 (file)
--- a/docs-xml/using_samba/ch06.xml
+++ b/docs-xml/using_samba/ch06.xml
@@ -1578,20 +1578,6 @@ Password changed for user dave</programlisting>
 
 <row>
 
 
 <row>
 

-<entry colname="col1"><para><literal>password level</literal></para></entry>
-
-<entry colname="col2"><para>numeric</para></entry>
-
-<entry colname="col3"><para>Sets the number of capital letter permutations to attempt when matching a client's password.</para></entry>
-
-<entry colname="col4"><para>None</para></entry>
-
-<entry colname="col5"><para>Global</para></entry>
-
-</row>
-
-<row>
-

 <entry colname="col1"><para><literal>null passwords</literal></para></entry>
 
 <entry colname="col2"><para>boolean</para></entry>
 <entry colname="col1"><para><literal>null passwords</literal></para></entry>
 
 <entry colname="col2"><para>boolean</para></entry>

diff --git a/examples/dce-dfs/smb.conf b/examples/dce-dfs/smb.conf
index f5f155b8e6ce298289861561adce8383f418aaa5..1f060282c370e891be54bfdc1839b3cf3279225e 100644 (file)
--- a/examples/dce-dfs/smb.conf
+++ b/examples/dce-dfs/smb.conf
@@ -5,7 +5,6 @@
    guest account = guest
    log file = /usr/local/samba/var/log.%m
    log level = 8
    guest account = guest
    log file = /usr/local/samba/var/log.%m
    log level = 8

-   password level = 8

 
 [homes]
    comment = Home Directories
 
 [homes]
    comment = Home Directories

diff --git a/examples/scripts/shares/python/smbparm.py b/examples/scripts/shares/python/smbparm.py
index 287b3572c01058b0396e20c22f45e8d8fcdbc82e..f182f57b4b38245823a5b70c6a34f50bbb9019ee 100644 (file)
--- a/examples/scripts/shares/python/smbparm.py
+++ b/examples/scripts/shares/python/smbparm.py
@@ -197,7 +197,6 @@ parm_table = {
        "WINBINDUID"             : ("idmap uid", SambaParmString, P_GLOBAL, ""),
        "READRAW"                : ("read raw", SambaParmBool, P_GLOBAL, "Yes"),
        "WINBINDENUMGROUPS"      : ("winbind enum groups", SambaParmBool, P_GLOBAL, "Yes"),
        "WINBINDUID"             : ("idmap uid", SambaParmString, P_GLOBAL, ""),
        "READRAW"                : ("read raw", SambaParmBool, P_GLOBAL, "Yes"),
        "WINBINDENUMGROUPS"      : ("winbind enum groups", SambaParmBool, P_GLOBAL, "Yes"),

-       "PASSWORDLEVEL"          : ("password level", SambaParmString, P_GLOBAL, "0"),

        "MAXPRINTJOBS"           : ("max print jobs", SambaParmString, P_LOCAL, "1000"),
        "PRINTCAP"               : ("printcap name", SambaParmString, P_GLOBAL, ""),
        "LOADPRINTERS"           : ("load printers", SambaParmBool, P_GLOBAL, "Yes"),
        "MAXPRINTJOBS"           : ("max print jobs", SambaParmString, P_LOCAL, "1000"),
        "PRINTCAP"               : ("printcap name", SambaParmString, P_GLOBAL, ""),
        "LOADPRINTERS"           : ("load printers", SambaParmBool, P_GLOBAL, "Yes"),

diff --git a/examples/tridge/smb.conf b/examples/tridge/smb.conf
index 4aa40d8e0bbb8bee96a5cee81a37465453ce7000..d1d18db50a39e13516d3b4b32a50f0c6d99aecb7 100644 (file)
--- a/examples/tridge/smb.conf
+++ b/examples/tridge/smb.conf
@@ -9,7 +9,6 @@
    log file = /usr/local/samba/var/log.%m
    guest account = pcguest
    hosts allow = 192.0.2. localhost 
    log file = /usr/local/samba/var/log.%m
    guest account = pcguest
    hosts allow = 192.0.2. localhost 

-   password level = 2

    auto services = tridge susan
    message command = csh -c '/usr/bin/X11/xedit -display :0 %s;rm %s' &
    read prediction = yes
    auto services = tridge susan
    message command = csh -c '/usr/bin/X11/xedit -display :0 %s;rm %s' &
    read prediction = yes

diff --git a/examples/tridge/smb.conf.fjall b/examples/tridge/smb.conf.fjall
index 76f4d0e3cad5d458d16b4578b961d12055c2a08b..840659640f0c119548140f7fba39ca18e6947527 100644 (file)
--- a/examples/tridge/smb.conf.fjall
+++ b/examples/tridge/smb.conf.fjall
@@ -1,7 +1,6 @@
 ;log level = 4
 ;readraw = no
 ;writeraw = no
 ;log level = 4
 ;readraw = no
 ;writeraw = no

-;password level = 4

 ;mangled map = (;1 )
 ;protocol = lanman1
 ;user = susan
 ;mangled map = (;1 )
 ;protocol = lanman1
 ;user = susan

diff --git a/packaging/LSB/smb.conf b/packaging/LSB/smb.conf
index d08cd20ec4a9d796db4b0b53fc40112e8e024c1a..36c9839346ebf29cadb4cb1acd27213e1f9197a0 100644 (file)
--- a/packaging/LSB/smb.conf
+++ b/packaging/LSB/smb.conf
@@ -56,7 +56,6 @@
 
 # Password Level allows matching of _n_ characters of the password for
 # all combinations of upper and lower case.
 
 # Password Level allows matching of _n_ characters of the password for
 # all combinations of upper and lower case.

-;  password level = 8

 ;  username level = 8
 
 # You may wish to use password encryption. Please read
 ;  username level = 8
 
 # You may wish to use password encryption. Please read

diff --git a/python/samba/upgrade.py b/python/samba/upgrade.py
index 817981edcd56a94864e0bfaef23c7b556d4ad3a4..532e1dee81ae21405e48b3222d0e0cb12603c0bd 100644 (file)
--- a/python/samba/upgrade.py
+++ b/python/samba/upgrade.py
@@ -410,7 +410,6 @@ smbconf_keep = [
     "smb passwd file",
     "private dir",
     "passwd chat",
     "smb passwd file",
     "private dir",
     "passwd chat",

-    "password level",

     "lanman auth",
     "ntlm auth",
     "client NTLMv2 auth",
     "lanman auth",
     "ntlm auth",
     "client NTLMv2 auth",