s3:idmap_ldap: don't call idmap_alloc_ldap_init in idmap_ldap_init
authorMichael Adam <obnox@samba.org>
Mon, 31 May 2010 09:37:40 +0000 (11:37 +0200)
committerMichael Adam <obnox@samba.org>
Sat, 14 Aug 2010 00:10:39 +0000 (02:10 +0200)
The registering of alloc backends is being removed.
The idmap backends are responsible for initializing
their alloc code on their own if necessary.

source3/winbindd/idmap_ldap.c

index fec8c47a06b18e4d2cd2b58ce66f8e9a13bc7a31..05b660d2023437e20a263b7e3b14199fc88bc13a 100644 (file)
@@ -1313,14 +1313,6 @@ static NTSTATUS idmap_alloc_ldap_init(void)
 NTSTATUS idmap_ldap_init(void);
 NTSTATUS idmap_ldap_init(void)
 {
 NTSTATUS idmap_ldap_init(void);
 NTSTATUS idmap_ldap_init(void)
 {
-       NTSTATUS ret;
-
-       /* FIXME: bad hack to actually register also the alloc_ldap module
-        * without changining configure.in */
-       ret = idmap_alloc_ldap_init();
-       if (! NT_STATUS_IS_OK(ret)) {
-               return ret;
-       }
        return smb_register_idmap(SMB_IDMAP_INTERFACE_VERSION, "ldap",
                                  &idmap_ldap_methods);
 }
        return smb_register_idmap(SMB_IDMAP_INTERFACE_VERSION, "ldap",
                                  &idmap_ldap_methods);
 }