[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  6104b1f samba-tool classicupgrade: Remove unsued upgrade_smbconf
       via  6c6c3fa samba-tool classicupgrade: Remove unsued reference to samba3sam
      from  7638f52 s3: Don't open the dir for stat/attr/acl related mask

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 6104b1fe98798f275d0fe5f81a678941ab29b184
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Jan 16 15:08:16 2014 +1300

    samba-tool classicupgrade: Remove unsued upgrade_smbconf
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-By: Jelmer Vernooij <jelmer at samba.org>
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Thu Jan 23 23:51:56 CET 2014 on sn-devel-104

commit 6c6c3fa7ccb1415addd9553c68fc21115b7c23da
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Jan 16 15:07:31 2014 +1300

    samba-tool classicupgrade: Remove unsued reference to samba3sam
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-By: Jelmer Vernooij <jelmer at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 python/samba/upgrade.py |  133 -----------------------------------------------
 1 files changed, 0 insertions(+), 133 deletions(-)


Changeset truncated at 500 lines:

diff --git a/python/samba/upgrade.py b/python/samba/upgrade.py
index ff5990c..c06454a 100644
--- a/python/samba/upgrade.py
+++ b/python/samba/upgrade.py
@@ -371,139 +371,6 @@ def import_wins(samba4_winsdb, samba3_winsdb):
                        "maxVersion": str(version_id)})
 
 
-def enable_samba3sam(samdb, ldapurl):
-    """Enable Samba 3 LDAP URL database.
-
-    :param samdb: SAM Database.
-    :param ldapurl: Samba 3 LDAP URL
-    """
-    samdb.modify_ldif("""
-dn: @MODULES
-changetype: modify
-replace: @LIST
- at LIST: samldb,operational,objectguid,rdn_name,samba3sam
-""")
-
-    samdb.add({"dn": "@MAP=samba3sam", "@MAP_URL": ldapurl})
-
-
-smbconf_keep = [
-    "dos charset",
-    "unix charset",
-    "display charset",
-    "comment",
-    "path",
-    "directory",
-    "workgroup",
-    "realm",
-    "netbios name",
-    "netbios aliases",
-    "netbios scope",
-    "server string",
-    "interfaces",
-    "bind interfaces only",
-    "security",
-    "auth methods",
-    "encrypt passwords",
-    "null passwords",
-    "obey pam restrictions",
-    "password server",
-    "smb passwd file",
-    "private dir",
-    "passwd chat",
-    "lanman auth",
-    "ntlm auth",
-    "client NTLMv2 auth",
-    "client lanman auth",
-    "client plaintext auth",
-    "read only",
-    "hosts allow",
-    "hosts deny",
-    "log level",
-    "debuglevel",
-    "log file",
-    "smb ports",
-    "large readwrite",
-    "max protocol",
-    "min protocol",
-    "unicode",
-    "read raw",
-    "write raw",
-    "disable netbios",
-    "nt status support",
-    "max mux",
-    "max xmit",
-    "name resolve order",
-    "max wins ttl",
-    "min wins ttl",
-    "time server",
-    "unix extensions",
-    "use spnego",
-    "server signing",
-    "client signing",
-    "max connections",
-    "paranoid server security",
-    "socket options",
-    "strict sync",
-    "max print jobs",
-    "printable",
-    "print ok",
-    "printer name",
-    "printer",
-    "map system",
-    "map hidden",
-    "map archive",
-    "preferred master",
-    "prefered master",
-    "local master",
-    "browseable",
-    "browsable",
-    "wins server",
-    "wins support",
-    "csc policy",
-    "strict locking",
-    "preload",
-    "auto services",
-    "lock dir",
-    "lock directory",
-    "pid directory",
-    "socket address",
-    "copy",
-    "include",
-    "available",
-    "volume",
-    "fstype",
-    "panic action",
-    "msdfs root",
-    "host msdfs",
-    "winbind separator"]
-
-
-def upgrade_smbconf(oldconf, mark):
-    """Remove configuration variables not present in Samba4
-
-    :param oldconf: Old configuration structure
-    :param mark: Whether removed configuration variables should be
-        kept in the new configuration as "samba3:<name>"
-    """
-    data = oldconf.data()
-    newconf = LoadParm()
-
-    for s in data:
-        for p in data[s]:
-            keep = False
-            for k in smbconf_keep:
-                if smbconf_keep[k] == p:
-                    keep = True
-                    break
-
-            if keep:
-                newconf.set(s, p, oldconf.get(s, p))
-            elif mark:
-                newconf.set(s, "samba3:" + p, oldconf.get(s, p))
-
-    return newconf
-
 SAMBA3_PREDEF_NAMES = {
         'HKLM': registry.HKEY_LOCAL_MACHINE,
 }


-- 
Samba Shared Repository