remove 'ldap trust ids' since there was no way for it to work now

(This used to be commit 3724063f1518c25e33ba6b65cd3bb1e36cec51fa)

diff --git a/docs/docbook/smbdotconf/ldap/ldaptrustids.xml b/docs/docbook/smbdotconf/ldap/ldaptrustids.xml
deleted file mode 100644 (file)
index 36bbcb2..0000000
--- a/docs/docbook/smbdotconf/ldap/ldaptrustids.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<samba:parameter name="ldap trust ids"
-                 context="G"
-                 advanced="1" developer="1"
-                 xmlns:samba="http://samba.org/common">
-<listitem>
-
-       <para>Normally, Samba validates each entry in the LDAP server
-       against getpwnam(). This allows LDAP to be used for Samba with
-       the unix system using NIS (for example) and also ensures that
-       Samba does not present accounts that do not otherwise exist. 
-       </para> 
-
-       <para>This option is used to disable this functionality, and    
-       instead to rely on the presence of the appropriate  attributes
-       in LDAP directly, which can result in a  significant performance
-       boost in some situations.  Setting this option to yes effectivly
-       assumes that the local machine is running <command
-       moreinfo="none">nss_ldap</command> against the same LDAP
-       server.</para>
-
-       <para>Default: <command moreinfo="none">ldap trust ids = No</command></para>
-</listitem>
-</samba:parameter>

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 5d67ae91694cc56af64d410e1a3bc9c92e71bf1a..79524c8b224019d30845b4358d85d10733b658d4 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -231,7 +231,6 @@ typedef struct
        char *szLdapSuffix;
        char *szLdapFilter;
        char *szLdapAdminDn;
-       BOOL ldap_trust_ids;
        char *szAclCompat;
        int ldap_passwd_sync; 
        BOOL ldap_delete_dn;
@@ -1073,7 +1072,6 @@ static struct parm_struct parm_table[] = {
        {"ldap admin dn", P_STRING, P_GLOBAL, &Globals.szLdapAdminDn, NULL, NULL, FLAG_ADVANCED}, 
        {"ldap ssl", P_ENUM, P_GLOBAL, &Globals.ldap_ssl, NULL, enum_ldap_ssl, FLAG_ADVANCED}, 
        {"ldap passwd sync", P_ENUM, P_GLOBAL, &Globals.ldap_passwd_sync, NULL, enum_ldap_passwd_sync, FLAG_ADVANCED}, 
-       {"ldap trust ids", P_BOOL, P_GLOBAL, &Globals.ldap_trust_ids, NULL, NULL, FLAG_ADVANCED}, 
        {"ldap delete dn", P_BOOL, P_GLOBAL, &Globals.ldap_delete_dn, NULL, NULL, FLAG_ADVANCED}, 
 
        {"Miscellaneous Options", P_SEP, P_SEPARATOR}, 
@@ -1698,7 +1696,6 @@ FN_GLOBAL_STRING(lp_ldap_filter, &Globals.szLdapFilter)
 FN_GLOBAL_STRING(lp_ldap_admin_dn, &Globals.szLdapAdminDn)
 FN_GLOBAL_INTEGER(lp_ldap_ssl, &Globals.ldap_ssl)
 FN_GLOBAL_INTEGER(lp_ldap_passwd_sync, &Globals.ldap_passwd_sync)
-FN_GLOBAL_BOOL(lp_ldap_trust_ids, &Globals.ldap_trust_ids)
 FN_GLOBAL_BOOL(lp_ldap_delete_dn, &Globals.ldap_delete_dn)
 FN_GLOBAL_STRING(lp_add_share_cmd, &Globals.szAddShareCommand)
 FN_GLOBAL_STRING(lp_change_share_cmd, &Globals.szChangeShareCommand)

diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index 66c4133c4a9365864e944c60b802dec0899f7c4d..009425c5f6c86e1c9d069113ea23738306cb17f5 100644 (file)
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -333,6 +333,8 @@ static NTSTATUS ldapsam_delete_entry(struct ldapsam_privates *ldap_state,
 
 /* New Interface is being implemented here */
 
+#if 0  /* JERRY - not uesed anymore */
+
 /**********************************************************************
 Initialize SAM_ACCOUNT from an LDAP query (unix attributes only)
 *********************************************************************/
@@ -385,6 +387,7 @@ static BOOL get_unix_attributes (struct ldapsam_privates *ldap_state,
        return True;
 }
 
+#endif
 
 /**********************************************************************
 Initialize SAM_ACCOUNT from an LDAP query
@@ -532,6 +535,7 @@ static BOOL init_sam_from_ldap (struct ldapsam_privates *ldap_state,
        }
 
 
+#if 0  /* JERRY -- not used anymore */
        /* 
         * If so configured, try and get the values from LDAP 
         */
@@ -550,6 +554,7 @@ static BOOL init_sam_from_ldap (struct ldapsam_privates *ldap_state,
                        }
                }
        }
+#endif
 
        if (!smbldap_get_single_attribute(ldap_state->smbldap_state->ldap_struct, entry, 
                get_userattr_key2string(ldap_state->schema_ver, LDAP_ATTR_PWD_LAST_SET), temp))