s3-passdb: Implement new pdb trust calls for the default backend
[idra/samba.git] / source3 / passdb / pdb_interface.c
index a42f8325f65f11d9dadebaddc825c59d06cafb46..94ed355e2c57dff373ddf45c455a135ea38bda6c 100644 (file)
@@ -8,7 +8,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
+#include "system/passwd.h"
+#include "passdb.h"
+#include "secrets.h"
+#include "../librpc/gen_ndr/samr.h"
+#include "../librpc/gen_ndr/drsblobs.h"
+#include "../librpc/gen_ndr/ndr_drsblobs.h"
+#include "memcache.h"
+#include "nsswitch/winbind_client.h"
+#include "../libcli/security/security.h"
+#include "../lib/util/util_pw.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_PASSDB
 
-/* Cache of latest SAM lookup query */
-
-static struct samu *csamuser = NULL;
-
 static_decl_pdb;
 
 static struct pdb_init_function_entry *backends = NULL;
 
 static void lazy_initialize_passdb(void)
 {
-       static BOOL initialized = False;
+       static bool initialized = False;
        if(initialized) {
                return;
        }
@@ -44,47 +49,10 @@ static void lazy_initialize_passdb(void)
        initialized = True;
 }
 
-static BOOL lookup_global_sam_rid(TALLOC_CTX *mem_ctx, uint32 rid,
+static bool lookup_global_sam_rid(TALLOC_CTX *mem_ctx, uint32 rid,
                                  const char **name,
-                                 enum SID_NAME_USE *psid_name_use,
+                                 enum lsa_SidType *psid_name_use,
                                  union unid_t *unix_id);
-/*******************************************************************
- Clean up uninitialised passwords.  The only way to tell 
- that these values are not 'real' is that they do not
- have a valid last set time.  Instead, the value is fixed at 0. 
- Therefore we use that as the key for 'is this a valid password'.
- However, it is perfectly valid to have a 'default' last change
- time, such LDAP with a missing attribute would produce.
-********************************************************************/
-
-static void pdb_force_pw_initialization(struct samu *pass) 
-{
-       const uint8 *lm_pwd, *nt_pwd;
-       
-       /* only reset a password if the last set time has been 
-          explicitly been set to zero.  A default last set time 
-          is ignored */
-
-       if ( (pdb_get_init_flags(pass, PDB_PASSLASTSET) != PDB_DEFAULT) 
-               && (pdb_get_pass_last_set_time(pass) == 0) ) 
-       {
-               
-               if (pdb_get_init_flags(pass, PDB_LMPASSWD) != PDB_DEFAULT) 
-               {
-                       lm_pwd = pdb_get_lanman_passwd(pass);
-                       if (lm_pwd) 
-                               pdb_set_lanman_passwd(pass, NULL, PDB_CHANGED);
-               }
-               if (pdb_get_init_flags(pass, PDB_NTPASSWD) != PDB_DEFAULT) 
-               {
-                       nt_pwd = pdb_get_nt_passwd(pass);
-                       if (nt_pwd) 
-                               pdb_set_nt_passwd(pass, NULL, PDB_CHANGED);
-               }
-       }
-
-       return;
-}
 
 NTSTATUS smb_register_passdb(int version, const char *name, pdb_init_function init) 
 {
@@ -131,6 +99,23 @@ struct pdb_init_function_entry *pdb_find_backend_entry(const char *name)
        return NULL;
 }
 
+/*
+ * The event context for the passdb backend. I know this is a bad hack and yet
+ * another static variable, but our pdb API is a global thing per
+ * definition. The first use for this is the LDAP idle function, more might be
+ * added later.
+ *
+ * I don't feel too bad about this static variable, it replaces the
+ * smb_idle_event_list that used to exist in lib/module.c.  -- VL
+ */
+
+static struct event_context *pdb_event_ctx;
+
+struct event_context *pdb_get_event_context(void)
+{
+       return pdb_event_ctx;
+}
+
 /******************************************************************
   Make a pdb_methods from scratch
  *******************************************************************/
@@ -155,10 +140,10 @@ NTSTATUS make_pdb_method_name(struct pdb_methods **methods, const char *selected
        trim_char(module_name, ' ', ' ');
 
 
-       DEBUG(5,("Attempting to find an passdb backend to match %s (%s)\n", selected, module_name));
+       DEBUG(5,("Attempting to find a passdb backend to match %s (%s)\n", selected, module_name));
 
        entry = pdb_find_backend_entry(module_name);
-       
+
        /* Try to find a module that contains this module */
        if (!entry) { 
                DEBUG(2,("No builtin backend found, trying to load plugin\n"));
@@ -168,7 +153,7 @@ NTSTATUS make_pdb_method_name(struct pdb_methods **methods, const char *selected
                        return NT_STATUS_UNSUCCESSFUL;
                }
        }
-       
+
        /* No such backend found */
        if(!entry) { 
                DEBUG(0,("No builtin nor plugin backend for %s found\n", module_name));
@@ -193,29 +178,37 @@ NTSTATUS make_pdb_method_name(struct pdb_methods **methods, const char *selected
 }
 
 /******************************************************************
- Return an already initialised pdn_methods structure
+ Return an already initialized pdb_methods structure
 *******************************************************************/
 
-static struct pdb_methods *pdb_get_methods_reload( BOOL reload ) 
+static struct pdb_methods *pdb_get_methods_reload( bool reload ) 
 {
        static struct pdb_methods *pdb = NULL;
 
        if ( pdb && reload ) {
                pdb->free_private_data( &(pdb->private_data) );
                if ( !NT_STATUS_IS_OK( make_pdb_method_name( &pdb, lp_passdb_backend() ) ) ) {
-                       pstring msg;
-                       slprintf(msg, sizeof(msg)-1, "pdb_get_methods_reload: failed to get pdb methods for backend %s\n",
-                               lp_passdb_backend() );
-                       smb_panic(msg);
+                       char *msg = NULL;
+                       if (asprintf(&msg, "pdb_get_methods_reload: "
+                                       "failed to get pdb methods for backend %s\n",
+                                       lp_passdb_backend()) > 0) {
+                               smb_panic(msg);
+                       } else {
+                               smb_panic("pdb_get_methods_reload");
+                       }
                }
        }
 
        if ( !pdb ) {
                if ( !NT_STATUS_IS_OK( make_pdb_method_name( &pdb, lp_passdb_backend() ) ) ) {
-                       pstring msg;
-                       slprintf(msg, sizeof(msg)-1, "pdb_get_methods_reload: failed to get pdb methods for backend %s\n",
-                               lp_passdb_backend() );
-                       smb_panic(msg);
+                       char *msg = NULL;
+                       if (asprintf(&msg, "pdb_get_methods_reload: "
+                                       "failed to get pdb methods for backend %s\n",
+                                       lp_passdb_backend()) > 0) {
+                               smb_panic(msg);
+                       } else {
+                               smb_panic("pdb_get_methods_reload");
+                       }
                }
        }
 
@@ -227,75 +220,150 @@ static struct pdb_methods *pdb_get_methods(void)
        return pdb_get_methods_reload(False);
 }
 
-/******************************************************************
- Backward compatibility functions for the original passdb interface
-*******************************************************************/
-
-BOOL pdb_setsampwent(BOOL update, uint16 acb_mask) 
+struct pdb_domain_info *pdb_get_domain_info(TALLOC_CTX *mem_ctx)
 {
        struct pdb_methods *pdb = pdb_get_methods();
-       return NT_STATUS_IS_OK(pdb->setsampwent(pdb, update, acb_mask));
-}
-
-void pdb_endsampwent(void) 
-{
-       struct pdb_methods *pdb = pdb_get_methods();
-       pdb->endsampwent(pdb);
-}
+       return pdb->get_domain_info(pdb, mem_ctx);
+}
+
+/**
+ * @brief Check if the user account has been locked out and try to unlock it.
+ *
+ * If the user has been automatically locked out and a lockout duration is set,
+ * then check if we can unlock the account and reset the bad password values.
+ *
+ * @param[in]  sampass  The sam user to check.
+ *
+ * @return              True if the function was successfull, false on an error.
+ */
+static bool pdb_try_account_unlock(struct samu *sampass)
+{
+       uint32_t acb_info = pdb_get_acct_ctrl(sampass);
+
+       if ((acb_info & ACB_NORMAL) && (acb_info & ACB_AUTOLOCK)) {
+               uint32_t lockout_duration;
+               time_t bad_password_time;
+               time_t now = time(NULL);
+               bool ok;
+
+               ok = pdb_get_account_policy(PDB_POLICY_LOCK_ACCOUNT_DURATION,
+                                           &lockout_duration);
+               if (!ok) {
+                       DEBUG(0, ("pdb_try_account_unlock: "
+                                 "pdb_get_account_policy failed.\n"));
+                       return false;
+               }
 
-BOOL pdb_getsampwent(struct samu *user) 
-{
-       struct pdb_methods *pdb = pdb_get_methods();
+               if (lockout_duration == (uint32_t) -1 ||
+                   lockout_duration == 0) {
+                       DEBUG(9, ("pdb_try_account_unlock: No reset duration, "
+                                 "can't reset autolock\n"));
+                       return false;
+               }
+               lockout_duration *= 60;
+
+               bad_password_time = pdb_get_bad_password_time(sampass);
+               if (bad_password_time == (time_t) 0) {
+                       DEBUG(2, ("pdb_try_account_unlock: Account %s "
+                                 "administratively locked out "
+                                 "with no bad password "
+                                 "time. Leaving locked out.\n",
+                                 pdb_get_username(sampass)));
+                       return true;
+               }
 
-       if ( !NT_STATUS_IS_OK(pdb->getsampwent(pdb, user) ) ) {
-               return False;
+               if ((bad_password_time +
+                    convert_uint32_t_to_time_t(lockout_duration)) < now) {
+                       NTSTATUS status;
+
+                       pdb_set_acct_ctrl(sampass, acb_info & ~ACB_AUTOLOCK,
+                                         PDB_CHANGED);
+                       pdb_set_bad_password_count(sampass, 0, PDB_CHANGED);
+                       pdb_set_bad_password_time(sampass, 0, PDB_CHANGED);
+
+                       become_root();
+                       status = pdb_update_sam_account(sampass);
+                       unbecome_root();
+                       if (!NT_STATUS_IS_OK(status)) {
+                               DEBUG(0, ("_samr_OpenUser: Couldn't "
+                                         "update account %s - %s\n",
+                                         pdb_get_username(sampass),
+                                         nt_errstr(status)));
+                               return false;
+                       }
+               }
        }
-       pdb_force_pw_initialization( user );
-       return True;
+
+       return true;
 }
 
-BOOL pdb_getsampwnam(struct samu *sam_acct, const char *username) 
+/**
+ * @brief Get a sam user structure by the given username.
+ *
+ * This functions also checks if the account has been automatically locked out
+ * and unlocks it if a lockout duration time has been defined and the time has
+ * elapsed.
+ *
+ * @param[in]  sam_acct  The sam user structure to fill.
+ *
+ * @param[in]  username  The username to look for.
+ *
+ * @return               True on success, false on error.
+ */
+bool pdb_getsampwnam(struct samu *sam_acct, const char *username) 
 {
        struct pdb_methods *pdb = pdb_get_methods();
+       struct samu *for_cache;
+       const struct dom_sid *user_sid;
+       NTSTATUS status;
+       bool ok;
 
-       if (!NT_STATUS_IS_OK(pdb->getsampwnam(pdb, sam_acct, username))) {
-               return False;
+       status = pdb->getsampwnam(pdb, sam_acct, username);
+       if (!NT_STATUS_IS_OK(status)) {
+               return false;
        }
 
-       if ( csamuser ) {
-               TALLOC_FREE(csamuser);
+       ok = pdb_try_account_unlock(sam_acct);
+       if (!ok) {
+               DEBUG(1, ("pdb_getsampwnam: Failed to unlock account %s\n",
+                         username));
        }
 
-       pdb_force_pw_initialization( sam_acct );
-       
-       csamuser = samu_new( NULL );
-       if (!csamuser) {
+       for_cache = samu_new(NULL);
+       if (for_cache == NULL) {
                return False;
        }
 
-       if (!pdb_copy_sam_account(csamuser, sam_acct)) {
-               TALLOC_FREE(csamuser);
+       if (!pdb_copy_sam_account(for_cache, sam_acct)) {
+               TALLOC_FREE(for_cache);
                return False;
        }
 
+       user_sid = pdb_get_user_sid(for_cache);
+
+       memcache_add_talloc(NULL, PDB_GETPWSID_CACHE,
+                           data_blob_const(user_sid, sizeof(*user_sid)),
+                           &for_cache);
+
        return True;
 }
 
 /**********************************************************************
 **********************************************************************/
 
-BOOL guest_user_info( struct samu *user )
+static bool guest_user_info( struct samu *user )
 {
        struct passwd *pwd;
        NTSTATUS result;
        const char *guestname = lp_guestaccount();
-       
-       if ( !(pwd = getpwnam_alloc( NULL, guestname ) ) ) {
+
+       pwd = Get_Pwnam_alloc(talloc_tos(), guestname);
+       if (pwd == NULL) {
                DEBUG(0,("guest_user_info: Unable to locate guest account [%s]!\n", 
                        guestname));
                return False;
        }
-       
+
        result = samu_set_unix(user, pwd );
 
        TALLOC_FREE( pwd );
@@ -303,35 +371,67 @@ BOOL guest_user_info( struct samu *user )
        return NT_STATUS_IS_OK( result );
 }
 
-/**********************************************************************
-**********************************************************************/
-
-BOOL pdb_getsampwsid(struct samu *sam_acct, const DOM_SID *sid) 
+/**
+ * @brief Get a sam user structure by the given username.
+ *
+ * This functions also checks if the account has been automatically locked out
+ * and unlocks it if a lockout duration time has been defined and the time has
+ * elapsed.
+ *
+ *
+ * @param[in]  sam_acct  The sam user structure to fill.
+ *
+ * @param[in]  sid       The user SDI to look up.
+ *
+ * @return               True on success, false on error.
+ */
+bool pdb_getsampwsid(struct samu *sam_acct, const struct dom_sid *sid)
 {
        struct pdb_methods *pdb = pdb_get_methods();
-       uint32 rid;
+       uint32_t rid;
+       void *cache_data;
+       bool ok = false;
 
        /* hard code the Guest RID of 501 */
 
        if ( !sid_peek_check_rid( get_global_sam_sid(), sid, &rid ) )
                return False;
 
-       if ( rid == DOMAIN_USER_RID_GUEST ) {
+       if ( rid == DOMAIN_RID_GUEST ) {
                DEBUG(6,("pdb_getsampwsid: Building guest account\n"));
                return guest_user_info( sam_acct );
        }
-       
+
        /* check the cache first */
-       
-       if ( csamuser && sid_equal(sid, pdb_get_user_sid(csamuser) ) )
-               return pdb_copy_sam_account(sam_acct, csamuser);
 
-       return NT_STATUS_IS_OK(pdb->getsampwsid(pdb, sam_acct, sid));
+       cache_data = memcache_lookup_talloc(
+               NULL, PDB_GETPWSID_CACHE, data_blob_const(sid, sizeof(*sid)));
+
+       if (cache_data != NULL) {
+               struct samu *cache_copy = talloc_get_type_abort(
+                       cache_data, struct samu);
+
+               ok = pdb_copy_sam_account(sam_acct, cache_copy);
+       } else {
+               ok = NT_STATUS_IS_OK(pdb->getsampwsid(pdb, sam_acct, sid));
+       }
+
+       if (!ok) {
+               return false;
+       }
+
+       ok = pdb_try_account_unlock(sam_acct);
+       if (!ok) {
+               DEBUG(1, ("pdb_getsampwsid: Failed to unlock account %s\n",
+                         sam_acct->username));
+       }
+
+       return true;
 }
 
 static NTSTATUS pdb_default_create_user(struct pdb_methods *methods,
                                        TALLOC_CTX *tmp_ctx, const char *name,
-                                       uint32 acb_info, uint32 *rid)
+                                       uint32_t acb_info, uint32_t *rid)
 {
        struct samu *sam_pass;
        NTSTATUS status;
@@ -342,17 +442,19 @@ static NTSTATUS pdb_default_create_user(struct pdb_methods *methods,
        }
 
        if ( !(pwd = Get_Pwnam_alloc(tmp_ctx, name)) ) {
-               pstring add_script;
+               char *add_script = NULL;
                int add_ret;
                fstring name2;
 
                if ((acb_info & ACB_NORMAL) && name[strlen(name)-1] != '$') {
-                       pstrcpy(add_script, lp_adduser_script());
+                       add_script = talloc_strdup(tmp_ctx,
+                                       lp_adduser_script());
                } else {
-                       pstrcpy(add_script, lp_addmachine_script());
+                       add_script = talloc_strdup(tmp_ctx,
+                                       lp_addmachine_script());
                }
 
-               if (add_script[0] == '\0') {
+               if (!add_script || add_script[0] == '\0') {
                        DEBUG(3, ("Could not find user %s and no add script "
                                  "defined\n", name));
                        return NT_STATUS_NO_SUCH_USER;
@@ -362,22 +464,28 @@ static NTSTATUS pdb_default_create_user(struct pdb_methods *methods,
                   compatibility with previous Samba releases */
                fstrcpy( name2, name );
                strlower_m( name2 );
-               all_string_sub(add_script, "%u", name2, sizeof(add_script));
+               add_script = talloc_all_string_sub(tmp_ctx,
+                                       add_script,
+                                       "%u",
+                                       name2);
+               if (!add_script) {
+                       return NT_STATUS_NO_MEMORY;
+               }
                add_ret = smbrun(add_script,NULL);
                DEBUG(add_ret ? 0 : 3, ("_samr_create_user: Running the command `%s' gave %d\n",
                                        add_script, add_ret));
-
-#ifdef ENABLE_BUILD_FARM_HACKS
-               if (add_ret != 0) {
-                       DEBUG(1, ("Creating a faked user %s for build farm "
-                                 "purposes\n", name));
-                       faked_create_user(name);
+               if (add_ret == 0) {
+                       smb_nscd_flush_user_cache();
                }
-#endif
 
                flush_pwnam_cache();
 
                pwd = Get_Pwnam_alloc(tmp_ctx, name);
+
+               if(pwd == NULL) {
+                       DEBUG(3, ("Could not find user %s, add script did not work\n", name));
+                       return NT_STATUS_NO_SUCH_USER;
+               }
        }
 
        /* we have a valid SID coming out of this call */
@@ -414,8 +522,8 @@ static NTSTATUS pdb_default_create_user(struct pdb_methods *methods,
        return status;
 }
 
-NTSTATUS pdb_create_user(TALLOC_CTX *mem_ctx, const char *name, uint32 flags,
-                        uint32 *rid)
+NTSTATUS pdb_create_user(TALLOC_CTX *mem_ctx, const char *name, uint32_t flags,
+                        uint32_t *rid)
 {
        struct pdb_methods *pdb = pdb_get_methods();
        return pdb->create_user(pdb, mem_ctx, name, flags, rid);
@@ -427,7 +535,7 @@ NTSTATUS pdb_create_user(TALLOC_CTX *mem_ctx, const char *name, uint32 flags,
 
 static int smb_delete_user(const char *unix_user)
 {
-       pstring del_script;
+       char *del_script = NULL;
        int ret;
 
        /* safety check */
@@ -437,12 +545,22 @@ static int smb_delete_user(const char *unix_user)
                return -1;
        }
 
-       pstrcpy(del_script, lp_deluser_script());
-       if (! *del_script)
+       del_script = talloc_strdup(talloc_tos(), lp_deluser_script());
+       if (!del_script || !*del_script) {
                return -1;
-       all_string_sub(del_script, "%u", unix_user, sizeof(del_script));
+       }
+       del_script = talloc_all_string_sub(talloc_tos(),
+                               del_script,
+                               "%u",
+                               unix_user);
+       if (!del_script) {
+               return -1;
+       }
        ret = smbrun(del_script,NULL);
        flush_pwnam_cache();
+       if (ret == 0) {
+               smb_nscd_flush_user_cache();
+       }
        DEBUG(ret ? 0 : 3,("smb_delete_user: Running the command `%s' gave %d\n",del_script,ret));
 
        return ret;
@@ -474,7 +592,7 @@ static NTSTATUS pdb_default_delete_user(struct pdb_methods *methods,
        strlower_m( username );
 
        smb_delete_user( username );
-       
+
        return status;
 }
 
@@ -506,10 +624,7 @@ NTSTATUS pdb_update_sam_account(struct samu *sam_acct)
 {
        struct pdb_methods *pdb = pdb_get_methods();
 
-       if (csamuser != NULL) {
-               TALLOC_FREE(csamuser);
-               csamuser = NULL;
-       }
+       memcache_flush(NULL, PDB_GETPWSID_CACHE);
 
        return pdb->update_sam_account(pdb, sam_acct);
 }
@@ -518,10 +633,7 @@ NTSTATUS pdb_delete_sam_account(struct samu *sam_acct)
 {
        struct pdb_methods *pdb = pdb_get_methods();
 
-       if (csamuser != NULL) {
-               TALLOC_FREE(csamuser);
-               csamuser = NULL;
-       }
+       memcache_flush(NULL, PDB_GETPWSID_CACHE);
 
        return pdb->delete_sam_account(pdb, sam_acct);
 }
@@ -532,10 +644,7 @@ NTSTATUS pdb_rename_sam_account(struct samu *oldname, const char *newname)
        uid_t uid;
        NTSTATUS status;
 
-       if (csamuser != NULL) {
-               TALLOC_FREE(csamuser);
-               csamuser = NULL;
-       }
+       memcache_flush(NULL, PDB_GETPWSID_CACHE);
 
        /* sanity check to make sure we don't rename root */
 
@@ -555,25 +664,25 @@ NTSTATUS pdb_rename_sam_account(struct samu *oldname, const char *newname)
        return status;
 }
 
-NTSTATUS pdb_update_login_attempts(struct samu *sam_acct, BOOL success)
+NTSTATUS pdb_update_login_attempts(struct samu *sam_acct, bool success)
 {
        struct pdb_methods *pdb = pdb_get_methods();
        return pdb->update_login_attempts(pdb, sam_acct, success);
 }
 
-BOOL pdb_getgrsid(GROUP_MAP *map, DOM_SID sid)
+bool pdb_getgrsid(GROUP_MAP *map, struct dom_sid sid)
 {
        struct pdb_methods *pdb = pdb_get_methods();
        return NT_STATUS_IS_OK(pdb->getgrsid(pdb, map, sid));
 }
 
-BOOL pdb_getgrgid(GROUP_MAP *map, gid_t gid)
+bool pdb_getgrgid(GROUP_MAP *map, gid_t gid)
 {
        struct pdb_methods *pdb = pdb_get_methods();
        return NT_STATUS_IS_OK(pdb->getgrgid(pdb, map, gid));
 }
 
-BOOL pdb_getgrnam(GROUP_MAP *map, const char *name)
+bool pdb_getgrnam(GROUP_MAP *map, const char *name)
 {
        struct pdb_methods *pdb = pdb_get_methods();
        return NT_STATUS_IS_OK(pdb->getgrnam(pdb, map, name));
@@ -582,10 +691,11 @@ BOOL pdb_getgrnam(GROUP_MAP *map, const char *name)
 static NTSTATUS pdb_default_create_dom_group(struct pdb_methods *methods,
                                             TALLOC_CTX *mem_ctx,
                                             const char *name,
-                                            uint32 *rid)
+                                            uint32_t *rid)
 {
-       DOM_SID group_sid;
+       struct dom_sid group_sid;
        struct group *grp;
+       fstring tmp;
 
        grp = getgrnam(name);
 
@@ -603,22 +713,22 @@ static NTSTATUS pdb_default_create_dom_group(struct pdb_methods *methods,
                return NT_STATUS_ACCESS_DENIED;
        }
 
-       if (pdb_rid_algorithm()) {
-               *rid = algorithmic_pdb_gid_to_group_rid( grp->gr_gid );
-       } else {
+       if (pdb_capabilities() & PDB_CAP_STORE_RIDS) {
                if (!pdb_new_rid(rid)) {
                        return NT_STATUS_ACCESS_DENIED;
                }
+       } else {
+               *rid = algorithmic_pdb_gid_to_group_rid( grp->gr_gid );
        }
 
        sid_compose(&group_sid, get_global_sam_sid(), *rid);
-               
-       return add_initial_entry(grp->gr_gid, sid_string_static(&group_sid),
+
+       return add_initial_entry(grp->gr_gid, sid_to_fstring(tmp, &group_sid),
                                 SID_NAME_DOM_GRP, name, NULL);
 }
 
 NTSTATUS pdb_create_dom_group(TALLOC_CTX *mem_ctx, const char *name,
-                             uint32 *rid)
+                             uint32_t *rid)
 {
        struct pdb_methods *pdb = pdb_get_methods();
        return pdb->create_dom_group(pdb, mem_ctx, name, rid);
@@ -626,14 +736,17 @@ NTSTATUS pdb_create_dom_group(TALLOC_CTX *mem_ctx, const char *name,
 
 static NTSTATUS pdb_default_delete_dom_group(struct pdb_methods *methods,
                                             TALLOC_CTX *mem_ctx,
-                                            uint32 rid)
+                                            uint32_t rid)
 {
-       DOM_SID group_sid;
+       struct dom_sid group_sid;
        GROUP_MAP map;
        NTSTATUS status;
        struct group *grp;
        const char *grp_name;
 
+       /* coverity */
+       map.gid = (gid_t) -1;
+
        sid_compose(&group_sid, get_global_sam_sid(), rid);
 
        if (!get_domain_group_from_sid(group_sid, &map)) {
@@ -666,13 +779,13 @@ static NTSTATUS pdb_default_delete_dom_group(struct pdb_methods *methods,
        }
 
        /* Don't check the result of smb_delete_group */
-       
+
        smb_delete_group(grp_name);
 
        return NT_STATUS_OK;
 }
 
-NTSTATUS pdb_delete_dom_group(TALLOC_CTX *mem_ctx, uint32 rid)
+NTSTATUS pdb_delete_dom_group(TALLOC_CTX *mem_ctx, uint32_t rid)
 {
        struct pdb_methods *pdb = pdb_get_methods();
        return pdb->delete_dom_group(pdb, mem_ctx, rid);
@@ -690,14 +803,14 @@ NTSTATUS pdb_update_group_mapping_entry(GROUP_MAP *map)
        return pdb->update_group_mapping_entry(pdb, map);
 }
 
-NTSTATUS pdb_delete_group_mapping_entry(DOM_SID sid)
+NTSTATUS pdb_delete_group_mapping_entry(struct dom_sid sid)
 {
        struct pdb_methods *pdb = pdb_get_methods();
        return pdb->delete_group_mapping_entry(pdb, sid);
 }
 
-BOOL pdb_enum_group_mapping(const DOM_SID *sid, enum SID_NAME_USE sid_name_use, GROUP_MAP **pp_rmap,
-                           size_t *p_num_entries, BOOL unix_only)
+bool pdb_enum_group_mapping(const struct dom_sid *sid, enum lsa_SidType sid_name_use, GROUP_MAP **pp_rmap,
+                           size_t *p_num_entries, bool unix_only)
 {
        struct pdb_methods *pdb = pdb_get_methods();
        return NT_STATUS_IS_OK(pdb-> enum_group_mapping(pdb, sid, sid_name_use,
@@ -705,8 +818,8 @@ BOOL pdb_enum_group_mapping(const DOM_SID *sid, enum SID_NAME_USE sid_name_use,
 }
 
 NTSTATUS pdb_enum_group_members(TALLOC_CTX *mem_ctx,
-                               const DOM_SID *sid,
-                               uint32 **pp_member_rids,
+                               const struct dom_sid *sid,
+                               uint32_t **pp_member_rids,
                                size_t *p_num_members)
 {
        struct pdb_methods *pdb = pdb_get_methods();
@@ -714,28 +827,28 @@ NTSTATUS pdb_enum_group_members(TALLOC_CTX *mem_ctx,
 
        result = pdb->enum_group_members(pdb, mem_ctx, 
                        sid, pp_member_rids, p_num_members);
-               
+
        /* special check for rid 513 */
-               
+
        if ( !NT_STATUS_IS_OK( result ) ) {
-               uint32 rid;
-               
+               uint32_t rid;
+
                sid_peek_rid( sid, &rid );
-               
-               if ( rid == DOMAIN_GROUP_RID_USERS ) {
+
+               if ( rid == DOMAIN_RID_USERS ) {
                        *p_num_members = 0;
                        *pp_member_rids = NULL;
-                       
+
                        return NT_STATUS_OK;
                }
        }
-       
+
        return result;
 }
 
 NTSTATUS pdb_enum_group_memberships(TALLOC_CTX *mem_ctx, struct samu *user,
-                                   DOM_SID **pp_sids, gid_t **pp_gids,
-                                   size_t *p_num_groups)
+                                   struct dom_sid **pp_sids, gid_t **pp_gids,
+                                   uint32_t *p_num_groups)
 {
        struct pdb_methods *pdb = pdb_get_methods();
        return pdb->enum_group_memberships(
@@ -775,12 +888,12 @@ NTSTATUS pdb_set_unix_primary_group(TALLOC_CTX *mem_ctx, struct samu *user)
  * fulfil.
  */
 
-static BOOL pdb_user_in_group(TALLOC_CTX *mem_ctx, struct samu *account,
-                             const DOM_SID *group_sid)
+static bool pdb_user_in_group(TALLOC_CTX *mem_ctx, struct samu *account,
+                             const struct dom_sid *group_sid)
 {
-       DOM_SID *sids;
+       struct dom_sid *sids;
        gid_t *gids;
-       size_t i, num_groups;
+       uint32_t i, num_groups;
 
        if (!NT_STATUS_IS_OK(pdb_enum_group_memberships(mem_ctx, account,
                                                        &sids, &gids,
@@ -789,7 +902,7 @@ static BOOL pdb_user_in_group(TALLOC_CTX *mem_ctx, struct samu *account,
        }
 
        for (i=0; i<num_groups; i++) {
-               if (sid_equal(group_sid, &sids[i])) {
+               if (dom_sid_equal(group_sid, &sids[i])) {
                        return True;
                }
        }
@@ -798,10 +911,10 @@ static BOOL pdb_user_in_group(TALLOC_CTX *mem_ctx, struct samu *account,
 
 static NTSTATUS pdb_default_add_groupmem(struct pdb_methods *methods,
                                         TALLOC_CTX *mem_ctx,
-                                        uint32 group_rid,
-                                        uint32 member_rid)
+                                        uint32_t group_rid,
+                                        uint32_t member_rid)
 {
-       DOM_SID group_sid, member_sid;
+       struct dom_sid group_sid, member_sid;
        struct samu *account = NULL;
        GROUP_MAP map;
        struct group *grp;
@@ -809,6 +922,9 @@ static NTSTATUS pdb_default_add_groupmem(struct pdb_methods *methods,
        const char *group_name;
        uid_t uid;
 
+       /* coverity */
+       map.gid = (gid_t) -1;
+
        sid_compose(&group_sid, get_global_sam_sid(), group_rid);
        sid_compose(&member_sid, get_global_sam_sid(), member_rid);
 
@@ -851,8 +967,8 @@ static NTSTATUS pdb_default_add_groupmem(struct pdb_methods *methods,
        return NT_STATUS_OK;
 }
 
-NTSTATUS pdb_add_groupmem(TALLOC_CTX *mem_ctx, uint32 group_rid,
-                         uint32 member_rid)
+NTSTATUS pdb_add_groupmem(TALLOC_CTX *mem_ctx, uint32_t group_rid,
+                         uint32_t member_rid)
 {
        struct pdb_methods *pdb = pdb_get_methods();
        return pdb->add_groupmem(pdb, mem_ctx, group_rid, member_rid);
@@ -860,10 +976,10 @@ NTSTATUS pdb_add_groupmem(TALLOC_CTX *mem_ctx, uint32 group_rid,
 
 static NTSTATUS pdb_default_del_groupmem(struct pdb_methods *methods,
                                         TALLOC_CTX *mem_ctx,
-                                        uint32 group_rid,
-                                        uint32 member_rid)
+                                        uint32_t group_rid,
+                                        uint32_t member_rid)
 {
-       DOM_SID group_sid, member_sid;
+       struct dom_sid group_sid, member_sid;
        struct samu *account = NULL;
        GROUP_MAP map;
        struct group *grp;
@@ -913,67 +1029,61 @@ static NTSTATUS pdb_default_del_groupmem(struct pdb_methods *methods,
        return NT_STATUS_OK;
 }
 
-NTSTATUS pdb_del_groupmem(TALLOC_CTX *mem_ctx, uint32 group_rid,
-                         uint32 member_rid)
+NTSTATUS pdb_del_groupmem(TALLOC_CTX *mem_ctx, uint32_t group_rid,
+                         uint32_t member_rid)
 {
        struct pdb_methods *pdb = pdb_get_methods();
        return pdb->del_groupmem(pdb, mem_ctx, group_rid, member_rid);
 }
 
-BOOL pdb_find_alias(const char *name, DOM_SID *sid)
-{
-       struct pdb_methods *pdb = pdb_get_methods();
-       return NT_STATUS_IS_OK(pdb->find_alias(pdb, name, sid));
-}
-
-NTSTATUS pdb_create_alias(const char *name, uint32 *rid)
+NTSTATUS pdb_create_alias(const char *name, uint32_t *rid)
 {
        struct pdb_methods *pdb = pdb_get_methods();
        return pdb->create_alias(pdb, name, rid);
 }
 
-BOOL pdb_delete_alias(const DOM_SID *sid)
+NTSTATUS pdb_delete_alias(const struct dom_sid *sid)
 {
        struct pdb_methods *pdb = pdb_get_methods();
-       return NT_STATUS_IS_OK(pdb->delete_alias(pdb, sid));
-                                                           
+       return pdb->delete_alias(pdb, sid);
 }
 
-BOOL pdb_get_aliasinfo(const DOM_SID *sid, struct acct_info *info)
+NTSTATUS pdb_get_aliasinfo(const struct dom_sid *sid, struct acct_info *info)
 {
        struct pdb_methods *pdb = pdb_get_methods();
-       return NT_STATUS_IS_OK(pdb->get_aliasinfo(pdb, sid, info));
+       return pdb->get_aliasinfo(pdb, sid, info);
 }
 
-BOOL pdb_set_aliasinfo(const DOM_SID *sid, struct acct_info *info)
+NTSTATUS pdb_set_aliasinfo(const struct dom_sid *sid, struct acct_info *info)
 {
        struct pdb_methods *pdb = pdb_get_methods();
-       return NT_STATUS_IS_OK(pdb->set_aliasinfo(pdb, sid, info));
+       return pdb->set_aliasinfo(pdb, sid, info);
 }
 
-NTSTATUS pdb_add_aliasmem(const DOM_SID *alias, const DOM_SID *member)
+NTSTATUS pdb_add_aliasmem(const struct dom_sid *alias, const struct dom_sid *member)
 {
        struct pdb_methods *pdb = pdb_get_methods();
        return pdb->add_aliasmem(pdb, alias, member);
 }
 
-NTSTATUS pdb_del_aliasmem(const DOM_SID *alias, const DOM_SID *member)
+NTSTATUS pdb_del_aliasmem(const struct dom_sid *alias, const struct dom_sid *member)
 {
        struct pdb_methods *pdb = pdb_get_methods();
        return pdb->del_aliasmem(pdb, alias, member);
 }
 
-NTSTATUS pdb_enum_aliasmem(const DOM_SID *alias,
-                          DOM_SID **pp_members, size_t *p_num_members)
+NTSTATUS pdb_enum_aliasmem(const struct dom_sid *alias, TALLOC_CTX *mem_ctx,
+                          struct dom_sid **pp_members, size_t *p_num_members)
 {
        struct pdb_methods *pdb = pdb_get_methods();
-       return pdb->enum_aliasmem(pdb, alias, pp_members, p_num_members);
+       return pdb->enum_aliasmem(pdb, alias, mem_ctx, pp_members,
+                                 p_num_members);
 }
 
 NTSTATUS pdb_enum_alias_memberships(TALLOC_CTX *mem_ctx,
-                                   const DOM_SID *domain_sid,
-                                   const DOM_SID *members, size_t num_members,
-                                   uint32 **pp_alias_rids,
+                                   const struct dom_sid *domain_sid,
+                                   const struct dom_sid *members, size_t num_members,
+                                   uint32_t **pp_alias_rids,
                                    size_t *p_num_alias_rids)
 {
        struct pdb_methods *pdb = pdb_get_methods();
@@ -984,67 +1094,92 @@ NTSTATUS pdb_enum_alias_memberships(TALLOC_CTX *mem_ctx,
                                                       p_num_alias_rids);
 }
 
-NTSTATUS pdb_lookup_rids(const DOM_SID *domain_sid,
+NTSTATUS pdb_lookup_rids(const struct dom_sid *domain_sid,
                         int num_rids,
-                        uint32 *rids,
+                        uint32_t *rids,
                         const char **names,
-                        enum SID_NAME_USE *attrs)
+                        enum lsa_SidType *attrs)
 {
        struct pdb_methods *pdb = pdb_get_methods();
        return pdb->lookup_rids(pdb, domain_sid, num_rids, rids, names, attrs);
 }
 
-NTSTATUS pdb_lookup_names(const DOM_SID *domain_sid,
+/* 
+ * NOTE: pdb_lookup_names is currently (2007-01-12) not used anywhere 
+ *       in the samba code.
+ *       Unlike _lsa_lookup_sids and _samr_lookup_rids, which eventually 
+ *       also ask pdb_lookup_rids, thus looking up a bunch of rids at a time, 
+ *       the pdb_ calls _lsa_lookup_names and _samr_lookup_names come
+ *       down to are pdb_getsampwnam and pdb_getgrnam instead of
+ *       pdb_lookup_names.
+ *       But in principle, it the call belongs to the API and might get
+ *       used in this context some day. 
+ */
+#if 0
+NTSTATUS pdb_lookup_names(const struct dom_sid *domain_sid,
                          int num_names,
                          const char **names,
-                         uint32 *rids,
-                         enum SID_NAME_USE *attrs)
+                         uint32_t *rids,
+                         enum lsa_SidType *attrs)
 {
        struct pdb_methods *pdb = pdb_get_methods();
        return pdb->lookup_names(pdb, domain_sid, num_names, names, rids, attrs);
 }
+#endif
 
-BOOL pdb_get_account_policy(int policy_index, uint32 *value)
+bool pdb_get_account_policy(enum pdb_policy_type type, uint32_t *value)
 {
        struct pdb_methods *pdb = pdb_get_methods();
-       return NT_STATUS_IS_OK(pdb->get_account_policy(pdb, policy_index, value));
+       NTSTATUS status;
+
+       become_root();
+       status = pdb->get_account_policy(pdb, type, value);
+       unbecome_root();
+
+       return NT_STATUS_IS_OK(status); 
 }
 
-BOOL pdb_set_account_policy(int policy_index, uint32 value)
+bool pdb_set_account_policy(enum pdb_policy_type type, uint32_t value)
 {
        struct pdb_methods *pdb = pdb_get_methods();
-       return NT_STATUS_IS_OK(pdb->set_account_policy(pdb, policy_index, value));
+       NTSTATUS status;
+
+       become_root();
+       status = pdb->set_account_policy(pdb, type, value);
+       unbecome_root();
+
+       return NT_STATUS_IS_OK(status);
 }
 
-BOOL pdb_get_seq_num(time_t *seq_num)
+bool pdb_get_seq_num(time_t *seq_num)
 {
        struct pdb_methods *pdb = pdb_get_methods();
        return NT_STATUS_IS_OK(pdb->get_seq_num(pdb, seq_num));
 }
 
-BOOL pdb_uid_to_rid(uid_t uid, uint32 *rid)
+bool pdb_uid_to_sid(uid_t uid, struct dom_sid *sid)
 {
        struct pdb_methods *pdb = pdb_get_methods();
-       return pdb->uid_to_rid(pdb, uid, rid);
+       return pdb->uid_to_sid(pdb, uid, sid);
 }
 
-BOOL pdb_gid_to_sid(gid_t gid, DOM_SID *sid)
+bool pdb_gid_to_sid(gid_t gid, struct dom_sid *sid)
 {
        struct pdb_methods *pdb = pdb_get_methods();
        return pdb->gid_to_sid(pdb, gid, sid);
 }
 
-BOOL pdb_sid_to_id(const DOM_SID *sid, union unid_t *id,
-                  enum SID_NAME_USE *type)
+bool pdb_sid_to_id(const struct dom_sid *sid, union unid_t *id,
+                  enum lsa_SidType *type)
 {
        struct pdb_methods *pdb = pdb_get_methods();
        return pdb->sid_to_id(pdb, sid, id, type);
 }
 
-BOOL pdb_rid_algorithm(void)
+uint32_t pdb_capabilities(void)
 {
        struct pdb_methods *pdb = pdb_get_methods();
-       return pdb->rid_algorithm(pdb);
+       return pdb->capabilities(pdb);
 }
 
 /********************************************************************
@@ -1054,16 +1189,16 @@ BOOL pdb_rid_algorithm(void)
  with add RIDs (assigned from previous algorithmic mappings)
 ********************************************************************/
 
-BOOL pdb_new_rid(uint32 *rid)
+bool pdb_new_rid(uint32_t *rid)
 {
        struct pdb_methods *pdb = pdb_get_methods();
        const char *name = NULL;
-       enum SID_NAME_USE type;
-       uint32 allocated_rid = 0;
+       enum lsa_SidType type;
+       uint32_t allocated_rid = 0;
        int i;
        TALLOC_CTX *ctx;
 
-       if (pdb_rid_algorithm()) {
+       if ((pdb_capabilities() & PDB_CAP_STORE_RIDS) == 0) {
                DEBUG(0, ("Trying to allocate a RID when algorithmic RIDs "
                          "are active\n"));
                return False;
@@ -1073,8 +1208,8 @@ BOOL pdb_new_rid(uint32 *rid)
                DEBUG(0, ("'algorithmic rid base' is set but a passdb backend "
                          "without algorithmic RIDs is chosen.\n"));
                DEBUGADD(0, ("Please map all used groups using 'net groupmap "
-                            "add', set the maximum used RID using\n"));
-               DEBUGADD(0, ("'net setmaxrid' and remove the parameter\n"));
+                            "add', set the maximum used RID\n"));
+               DEBUGADD(0, ("and remove the parameter\n"));
                return False;
        }
 
@@ -1118,8 +1253,9 @@ BOOL pdb_new_rid(uint32 *rid)
   If uninitialised, context will auto-init on first use.
  ***************************************************************/
 
-BOOL initialize_password_db(BOOL reload)
-{      
+bool initialize_password_db(bool reload, struct event_context *event_ctx)
+{
+       pdb_event_ctx = event_ctx;
        return (pdb_get_methods_reload(reload) != NULL);
 }
 
@@ -1133,7 +1269,7 @@ static NTSTATUS pdb_default_getsampwnam (struct pdb_methods *methods, struct sam
        return NT_STATUS_NO_SUCH_USER;
 }
 
-static NTSTATUS pdb_default_getsampwsid(struct pdb_methods *my_methods, struct samu * user, const DOM_SID *sid)
+static NTSTATUS pdb_default_getsampwsid(struct pdb_methods *my_methods, struct samu * user, const struct dom_sid *sid)
 {
        return NT_STATUS_NO_SUCH_USER;
 }
@@ -1158,34 +1294,21 @@ static NTSTATUS pdb_default_rename_sam_account (struct pdb_methods *methods, str
        return NT_STATUS_NOT_IMPLEMENTED;
 }
 
-static NTSTATUS pdb_default_update_login_attempts (struct pdb_methods *methods, struct samu *newpwd, BOOL success)
+static NTSTATUS pdb_default_update_login_attempts (struct pdb_methods *methods, struct samu *newpwd, bool success)
 {
+       /* Only the pdb_nds backend implements this, by
+        * default just return ok. */
        return NT_STATUS_OK;
 }
 
-static NTSTATUS pdb_default_setsampwent(struct pdb_methods *methods, BOOL update, uint32 acb_mask)
+static NTSTATUS pdb_default_get_account_policy(struct pdb_methods *methods, enum pdb_policy_type type, uint32_t *value)
 {
-       return NT_STATUS_NOT_IMPLEMENTED;
+       return account_policy_get(type, value) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
 }
 
-static NTSTATUS pdb_default_getsampwent(struct pdb_methods *methods, struct samu *user)
+static NTSTATUS pdb_default_set_account_policy(struct pdb_methods *methods, enum pdb_policy_type type, uint32_t value)
 {
-       return NT_STATUS_NOT_IMPLEMENTED;
-}
-
-static void pdb_default_endsampwent(struct pdb_methods *methods)
-{
-       return; /* NT_STATUS_NOT_IMPLEMENTED; */
-}
-
-static NTSTATUS pdb_default_get_account_policy(struct pdb_methods *methods, int policy_index, uint32 *value)
-{
-       return account_policy_get(policy_index, value) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
-}
-
-static NTSTATUS pdb_default_set_account_policy(struct pdb_methods *methods, int policy_index, uint32 value)
-{
-       return account_policy_set(policy_index, value) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+       return account_policy_set(type, value) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
 }
 
 static NTSTATUS pdb_default_get_seq_num(struct pdb_methods *methods, time_t *seq_num)
@@ -1194,23 +1317,23 @@ static NTSTATUS pdb_default_get_seq_num(struct pdb_methods *methods, time_t *seq
        return NT_STATUS_OK;
 }
 
-static BOOL pdb_default_uid_to_rid(struct pdb_methods *methods, uid_t uid,
-                                  uint32 *rid)
+static bool pdb_default_uid_to_sid(struct pdb_methods *methods, uid_t uid,
+                                  struct dom_sid *sid)
 {
        struct samu *sampw = NULL;
        struct passwd *unix_pw;
-       BOOL ret;
-       
+       bool ret;
+
        unix_pw = sys_getpwuid( uid );
 
        if ( !unix_pw ) {
-               DEBUG(4,("pdb_default_uid_to_rid: host has no idea of uid "
+               DEBUG(4,("pdb_default_uid_to_sid: host has no idea of uid "
                         "%lu\n", (unsigned long)uid));
                return False;
        }
-       
+
        if ( !(sampw = samu_new( NULL )) ) {
-               DEBUG(0,("pdb_default_uid_to_rid: samu_new() failed!\n"));
+               DEBUG(0,("pdb_default_uid_to_sid: samu_new() failed!\n"));
                return False;
        }
 
@@ -1220,26 +1343,21 @@ static BOOL pdb_default_uid_to_rid(struct pdb_methods *methods, uid_t uid,
        unbecome_root();
 
        if (!ret) {
-               DEBUG(5, ("pdb_default_uid_to_rid: Did not find user "
-                         "%s (%d)\n", unix_pw->pw_name, uid));
+               DEBUG(5, ("pdb_default_uid_to_sid: Did not find user "
+                         "%s (%u)\n", unix_pw->pw_name, (unsigned int)uid));
                TALLOC_FREE(sampw);
                return False;
        }
 
-       ret = sid_peek_check_rid(get_global_sam_sid(),
-                                pdb_get_user_sid(sampw), rid);
-
-       if (!ret) {
-               DEBUG(1, ("Could not peek rid out of sid %s\n",
-                         sid_string_static(pdb_get_user_sid(sampw))));
-       }
+       sid_copy(sid, pdb_get_user_sid(sampw));
 
        TALLOC_FREE(sampw);
-       return ret;
+
+       return True;
 }
 
-static BOOL pdb_default_gid_to_sid(struct pdb_methods *methods, gid_t gid,
-                                  DOM_SID *sid)
+static bool pdb_default_gid_to_sid(struct pdb_methods *methods, gid_t gid,
+                                  struct dom_sid *sid)
 {
        GROUP_MAP map;
 
@@ -1251,14 +1369,14 @@ static BOOL pdb_default_gid_to_sid(struct pdb_methods *methods, gid_t gid,
        return True;
 }
 
-static BOOL pdb_default_sid_to_id(struct pdb_methods *methods,
-                                 const DOM_SID *sid,
-                                 union unid_t *id, enum SID_NAME_USE *type)
+static bool pdb_default_sid_to_id(struct pdb_methods *methods,
+                                 const struct dom_sid *sid,
+                                 union unid_t *id, enum lsa_SidType *type)
 {
        TALLOC_CTX *mem_ctx;
-       BOOL ret = False;
+       bool ret = False;
        const char *name;
-       uint32 rid;
+       uint32_t rid;
 
        mem_ctx = talloc_new(NULL);
 
@@ -1273,18 +1391,39 @@ static BOOL pdb_default_sid_to_id(struct pdb_methods *methods,
                goto done;
        }
 
-       if (sid_peek_check_rid(&global_sid_Builtin, sid, &rid)) {
+       /* check for "Unix User" */
+
+       if ( sid_peek_check_rid(&global_sid_Unix_Users, sid, &rid) ) {
+               id->uid = rid;
+               *type = SID_NAME_USER;
+               ret = True;             
+               goto done;              
+       }
+
+       /* check for "Unix Group" */
+
+       if ( sid_peek_check_rid(&global_sid_Unix_Groups, sid, &rid) ) {
+               id->gid = rid;
+               *type = SID_NAME_ALIAS;
+               ret = True;             
+               goto done;              
+       }
+
+       /* BUILTIN */
+
+       if (sid_check_is_in_builtin(sid) ||
+           sid_check_is_in_wellknown_domain(sid)) {
                /* Here we only have aliases */
                GROUP_MAP map;
                if (!NT_STATUS_IS_OK(methods->getgrsid(methods, &map, *sid))) {
                        DEBUG(10, ("Could not find map for sid %s\n",
-                                  sid_string_static(sid)));
+                                  sid_string_dbg(sid)));
                        goto done;
                }
                if ((map.sid_name_use != SID_NAME_ALIAS) &&
                    (map.sid_name_use != SID_NAME_WKN_GRP)) {
                        DEBUG(10, ("Map for sid %s is a %s, expected an "
-                                  "alias\n", sid_string_static(sid),
+                                  "alias\n", sid_string_dbg(sid),
                                   sid_type_lookup(map.sid_name_use)));
                        goto done;
                }
@@ -1295,8 +1434,8 @@ static BOOL pdb_default_sid_to_id(struct pdb_methods *methods,
                goto done;
        }
 
-       DEBUG(5, ("Sid %s is neither ours nor builtin, don't know it\n",
-                 sid_string_static(sid)));
+       DEBUG(5, ("Sid %s is neither ours, a Unix SID, nor builtin\n",
+                 sid_string_dbg(sid)));
 
  done:
 
@@ -1304,88 +1443,70 @@ static BOOL pdb_default_sid_to_id(struct pdb_methods *methods,
        return ret;
 }
 
-static void add_uid_to_array_unique(TALLOC_CTX *mem_ctx,
-                                   uid_t uid, uid_t **pp_uids, size_t *p_num)
-{
-       size_t i;
-
-       for (i=0; i<*p_num; i++) {
-               if ((*pp_uids)[i] == uid)
-                       return;
-       }
-       
-       *pp_uids = TALLOC_REALLOC_ARRAY(mem_ctx, *pp_uids, uid_t, *p_num+1);
-
-       if (*pp_uids == NULL)
-               return;
-
-       (*pp_uids)[*p_num] = uid;
-       *p_num += 1;
-}
-
-static BOOL get_memberuids(TALLOC_CTX *mem_ctx, gid_t gid, uid_t **pp_uids, size_t *p_num)
+static bool get_memberuids(TALLOC_CTX *mem_ctx, gid_t gid, uid_t **pp_uids, uint32_t *p_num)
 {
        struct group *grp;
        char **gr;
        struct passwd *pwd;
-       char *winbindd_env;
+       bool winbind_env;
+       bool ret = False;
  
        *pp_uids = NULL;
        *p_num = 0;
 
        /* We only look at our own sam, so don't care about imported stuff */
-
-       winbindd_env = getenv(WINBINDD_DONT_ENV);
-       winbind_off();
+       winbind_env = winbind_env_set();
+       (void)winbind_off();
 
        if ((grp = getgrgid(gid)) == NULL) {
                /* allow winbindd lookups, but only if they weren't already disabled */
-               if ( !(winbindd_env && strequal(winbindd_env, "1")) ) {
-                       winbind_on();
-               }
-
-               return False;
+               goto done;
        }
 
        /* Primary group members */
-
        setpwent();
        while ((pwd = getpwent()) != NULL) {
                if (pwd->pw_gid == gid) {
-                       add_uid_to_array_unique(mem_ctx, pwd->pw_uid,
-                                               pp_uids, p_num);
+                       if (!add_uid_to_array_unique(mem_ctx, pwd->pw_uid,
+                                               pp_uids, p_num)) {
+                               goto done;
+                       }
                }
        }
        endpwent();
 
        /* Secondary group members */
-
        for (gr = grp->gr_mem; (*gr != NULL) && ((*gr)[0] != '\0'); gr += 1) {
                struct passwd *pw = getpwnam(*gr);
 
                if (pw == NULL)
                        continue;
-               add_uid_to_array_unique(mem_ctx, pw->pw_uid, pp_uids, p_num);
+               if (!add_uid_to_array_unique(mem_ctx, pw->pw_uid, pp_uids, p_num)) {
+                       goto done;
+               }
        }
 
-       /* allow winbindd lookups, but only if they weren't already disabled */
+       ret = True;
 
-       if ( !(winbindd_env && strequal(winbindd_env, "1")) ) {
-               winbind_on();
+  done:
+
+       /* allow winbindd lookups, but only if they weren't already disabled */
+       if (!winbind_env) {
+               (void)winbind_on();
        }
 
-       return True;
+       return ret;
 }
 
-NTSTATUS pdb_default_enum_group_members(struct pdb_methods *methods,
-                                       TALLOC_CTX *mem_ctx,
-                                       const DOM_SID *group,
-                                       uint32 **pp_member_rids,
-                                       size_t *p_num_members)
+static NTSTATUS pdb_default_enum_group_members(struct pdb_methods *methods,
+                                              TALLOC_CTX *mem_ctx,
+                                              const struct dom_sid *group,
+                                              uint32_t **pp_member_rids,
+                                              size_t *p_num_members)
 {
        gid_t gid;
        uid_t *uids;
-       size_t i, num_uids;
+       uint32_t i, num_uids;
 
        *pp_member_rids = NULL;
        *p_num_members = 0;
@@ -1399,10 +1520,10 @@ NTSTATUS pdb_default_enum_group_members(struct pdb_methods *methods,
        if (num_uids == 0)
                return NT_STATUS_OK;
 
-       *pp_member_rids = TALLOC_ZERO_ARRAY(mem_ctx, uint32, num_uids);
+       *pp_member_rids = talloc_zero_array(mem_ctx, uint32_t, num_uids);
 
        for (i=0; i<num_uids; i++) {
-               DOM_SID sid;
+               struct dom_sid sid;
 
                uid_to_sid(&sid, uids[i]);
 
@@ -1419,28 +1540,28 @@ NTSTATUS pdb_default_enum_group_members(struct pdb_methods *methods,
        return NT_STATUS_OK;
 }
 
-NTSTATUS pdb_default_enum_group_memberships(struct pdb_methods *methods,
-                                           TALLOC_CTX *mem_ctx,
-                                           struct samu *user,
-                                           DOM_SID **pp_sids,
-                                           gid_t **pp_gids,
-                                           size_t *p_num_groups)
+static NTSTATUS pdb_default_enum_group_memberships(struct pdb_methods *methods,
+                                                  TALLOC_CTX *mem_ctx,
+                                                  struct samu *user,
+                                                  struct dom_sid **pp_sids,
+                                                  gid_t **pp_gids,
+                                                  uint32_t *p_num_groups)
 {
        size_t i;
        gid_t gid;
        struct passwd *pw;
        const char *username = pdb_get_username(user);
-       
+
 
        /* Ignore the primary group SID.  Honor the real Unix primary group.
           The primary group SID is only of real use to Windows clients */
-          
-       if ( !(pw = getpwnam_alloc(mem_ctx, username)) ) {
+
+       if ( !(pw = Get_Pwnam_alloc(mem_ctx, username)) ) {
                return NT_STATUS_NO_SUCH_USER;
        }
-       
+
        gid = pw->pw_gid;
-       
+
        TALLOC_FREE( pw );
 
        if (!getgroups_unix_user(mem_ctx, username, gid, pp_gids, p_num_groups)) {
@@ -1451,7 +1572,7 @@ NTSTATUS pdb_default_enum_group_memberships(struct pdb_methods *methods,
                smb_panic("primary group missing");
        }
 
-       *pp_sids = TALLOC_ARRAY(mem_ctx, DOM_SID, *p_num_groups);
+       *pp_sids = talloc_array(mem_ctx, struct dom_sid, *p_num_groups);
 
        if (*pp_sids == NULL) {
                TALLOC_FREE(*pp_gids);
@@ -1469,31 +1590,30 @@ NTSTATUS pdb_default_enum_group_memberships(struct pdb_methods *methods,
  Look up a rid in the SAM we're responsible for (i.e. passdb)
  ********************************************************************/
 
-static BOOL lookup_global_sam_rid(TALLOC_CTX *mem_ctx, uint32 rid,
+static bool lookup_global_sam_rid(TALLOC_CTX *mem_ctx, uint32_t rid,
                                  const char **name,
-                                 enum SID_NAME_USE *psid_name_use,
+                                 enum lsa_SidType *psid_name_use,
                                  union unid_t *unix_id)
 {
        struct samu *sam_account = NULL;
        GROUP_MAP map;
-       BOOL ret;
-       DOM_SID sid;
+       bool ret;
+       struct dom_sid sid;
 
        *psid_name_use = SID_NAME_UNKNOWN;
-       
+
        DEBUG(5,("lookup_global_sam_rid: looking up RID %u.\n",
                 (unsigned int)rid));
 
-       sid_copy(&sid, get_global_sam_sid());
-       sid_append_rid(&sid, rid);
-       
+       sid_compose(&sid, get_global_sam_sid(), rid);
+
        /* see if the passdb can help us with the name of the user */
 
        if ( !(sam_account = samu_new( NULL )) ) {
                return False;
        }
 
-       /* BEING ROOT BLLOCK */
+       /* BEING ROOT BLOCK */
        become_root();
        if (pdb_getsampwsid(sam_account, &sid)) {
                struct passwd *pw;
@@ -1513,22 +1633,23 @@ static BOOL lookup_global_sam_rid(TALLOC_CTX *mem_ctx, uint32 rid,
                        return True;
                }
 
-               pw = Get_Pwnam(*name);
+               pw = Get_Pwnam_alloc(talloc_tos(), *name);
                if (pw == NULL) {
                        return False;
                }
                unix_id->uid = pw->pw_uid;
+               TALLOC_FREE(pw);
                return True;
        }
        TALLOC_FREE(sam_account);
-       
+
        ret = pdb_getgrsid(&map, sid);
        unbecome_root();
        /* END BECOME_ROOT BLOCK */
-  
+
        /* do not resolve SIDs to a name unless there is a valid 
           gid associated with it */
-                  
+
        if ( ret && (map.gid != (gid_t)-1) ) {
                *name = talloc_strdup(mem_ctx, map.nt_name);
                *psid_name_use = map.sid_name_use;
@@ -1539,7 +1660,7 @@ static BOOL lookup_global_sam_rid(TALLOC_CTX *mem_ctx, uint32 rid,
 
                return True;
        }
-       
+
        /* Windows will always map RID 513 to something.  On a non-domain 
           controller, this gets mapped to SERVER\None. */
 
@@ -1547,28 +1668,28 @@ static BOOL lookup_global_sam_rid(TALLOC_CTX *mem_ctx, uint32 rid,
                DEBUG(5, ("Can't find a unix id for an unmapped group\n"));
                return False;
        }
-       
-       if ( rid == DOMAIN_GROUP_RID_USERS ) {
+
+       if ( rid == DOMAIN_RID_USERS ) {
                *name = talloc_strdup(mem_ctx, "None" );
                *psid_name_use = SID_NAME_DOM_GRP;
-               
+
                return True;
        }
 
        return False;
 }
 
-NTSTATUS pdb_default_lookup_rids(struct pdb_methods *methods,
-                                const DOM_SID *domain_sid,
-                                int num_rids,
-                                uint32 *rids,
-                                const char **names,
-                                enum SID_NAME_USE *attrs)
+static NTSTATUS pdb_default_lookup_rids(struct pdb_methods *methods,
+                                       const struct dom_sid *domain_sid,
+                                       int num_rids,
+                                       uint32_t *rids,
+                                       const char **names,
+                                       enum lsa_SidType *attrs)
 {
        int i;
        NTSTATUS result;
-       BOOL have_mapped = False;
-       BOOL have_unmapped = False;
+       bool have_mapped = False;
+       bool have_unmapped = False;
 
        if (sid_check_is_builtin(domain_sid)) {
 
@@ -1621,22 +1742,23 @@ NTSTATUS pdb_default_lookup_rids(struct pdb_methods *methods,
        return result;
 }
 
-NTSTATUS pdb_default_lookup_names(struct pdb_methods *methods,
-                                 const DOM_SID *domain_sid,
-                                 int num_names,
-                                 const char **names,
-                                 uint32 *rids,
-                                 enum SID_NAME_USE *attrs)
+#if 0
+static NTSTATUS pdb_default_lookup_names(struct pdb_methods *methods,
+                                        const struct dom_sid *domain_sid,
+                                        int num_names,
+                                        const char **names,
+                                        uint32_t *rids,
+                                        enum lsa_SidType *attrs)
 {
        int i;
        NTSTATUS result;
-       BOOL have_mapped = False;
-       BOOL have_unmapped = False;
+       bool have_mapped = False;
+       bool have_unmapped = False;
 
        if (sid_check_is_builtin(domain_sid)) {
 
                for (i=0; i<num_names; i++) {
-                       uint32 rid;
+                       uint32_t rid;
 
                        if (lookup_builtin_name(names[i], &rid)) {
                                attrs[i] = SID_NAME_ALIAS;
@@ -1677,40 +1799,45 @@ NTSTATUS pdb_default_lookup_names(struct pdb_methods *methods,
 
        return result;
 }
+#endif
 
-static struct pdb_search *pdb_search_init(enum pdb_search_type type)
+static int pdb_search_destructor(struct pdb_search *search)
 {
-       TALLOC_CTX *mem_ctx;
-       struct pdb_search *result;
-
-       mem_ctx = talloc_init("pdb_search");
-       if (mem_ctx == NULL) {
-               DEBUG(0, ("talloc_init failed\n"));
-               return NULL;
+       if ((!search->search_ended) && (search->search_end != NULL)) {
+               search->search_end(search);
        }
+       return 0;
+}
+
+struct pdb_search *pdb_search_init(TALLOC_CTX *mem_ctx,
+                                  enum pdb_search_type type)
+{
+       struct pdb_search *result;
 
-       result = TALLOC_P(mem_ctx, struct pdb_search);
+       result = talloc(mem_ctx, struct pdb_search);
        if (result == NULL) {
                DEBUG(0, ("talloc failed\n"));
                return NULL;
        }
 
-       result->mem_ctx = mem_ctx;
        result->type = type;
        result->cache = NULL;
        result->num_entries = 0;
        result->cache_size = 0;
        result->search_ended = False;
+       result->search_end = NULL;
 
        /* Segfault appropriately if not initialized */
        result->next_entry = NULL;
        result->search_end = NULL;
 
+       talloc_set_destructor(result, pdb_search_destructor);
+
        return result;
 }
 
-static void fill_displayentry(TALLOC_CTX *mem_ctx, uint32 rid,
-                             uint16 acct_flags,
+static void fill_displayentry(TALLOC_CTX *mem_ctx, uint32_t rid,
+                             uint16_t acct_flags,
                              const char *account_name,
                              const char *fullname,
                              const char *description,
@@ -1735,91 +1862,16 @@ static void fill_displayentry(TALLOC_CTX *mem_ctx, uint32 rid,
                entry->description = "";
 }
 
-static BOOL user_search_in_progress = False;
-struct user_search {
-       uint16 acct_flags;
-};
-
-static BOOL next_entry_users(struct pdb_search *s,
-                            struct samr_displayentry *entry)
-{
-       struct user_search *state = (struct user_search *)s->private_data;
-       struct samu *user = NULL;
-
- next:
-       if ( !(user = samu_new( NULL )) ) {
-               DEBUG(0, ("next_entry_users: samu_new() failed!\n"));
-               return False;
-       }
-
-       if (!pdb_getsampwent(user)) {
-               TALLOC_FREE(user);
-               return False;
-       }
-
-       if ((state->acct_flags != 0) &&
-           ((pdb_get_acct_ctrl(user) & state->acct_flags) == 0)) {
-               TALLOC_FREE(user);
-               goto next;
-       }
-
-       fill_displayentry(s->mem_ctx, pdb_get_user_rid(user),
-                         pdb_get_acct_ctrl(user), pdb_get_username(user),
-                         pdb_get_fullname(user), pdb_get_acct_desc(user),
-                         entry);
-
-       TALLOC_FREE(user);
-       return True;
-}
-
-static void search_end_users(struct pdb_search *search)
-{
-       pdb_endsampwent();
-       user_search_in_progress = False;
-}
-
-static BOOL pdb_default_search_users(struct pdb_methods *methods,
-                                    struct pdb_search *search,
-                                    uint32 acct_flags)
-{
-       struct user_search *state;
-
-       if (user_search_in_progress) {
-               DEBUG(1, ("user search in progress\n"));
-               return False;
-       }
-
-       if (!pdb_setsampwent(False, acct_flags)) {
-               DEBUG(5, ("Could not start search\n"));
-               return False;
-       }
-
-       user_search_in_progress = True;
-
-       state = TALLOC_P(search->mem_ctx, struct user_search);
-       if (state == NULL) {
-               DEBUG(0, ("talloc failed\n"));
-               return False;
-       }
-
-       state->acct_flags = acct_flags;
-
-       search->private_data = state;
-       search->next_entry = next_entry_users;
-       search->search_end = search_end_users;
-       return True;
-}
-
 struct group_search {
        GROUP_MAP *groups;
        size_t num_groups, current_group;
 };
 
-static BOOL next_entry_groups(struct pdb_search *s,
+static bool next_entry_groups(struct pdb_search *s,
                              struct samr_displayentry *entry)
 {
        struct group_search *state = (struct group_search *)s->private_data;
-       uint32 rid;
+       uint32_t rid;
        GROUP_MAP *map = &state->groups[state->current_group];
 
        if (state->current_group == state->num_groups)
@@ -1827,8 +1879,7 @@ static BOOL next_entry_groups(struct pdb_search *s,
 
        sid_peek_rid(&map->sid, &rid);
 
-       fill_displayentry(s->mem_ctx, rid, 0, map->nt_name, NULL, map->comment,
-                         entry);
+       fill_displayentry(s, rid, 0, map->nt_name, NULL, map->comment, entry);
 
        state->current_group += 1;
        return True;
@@ -1841,12 +1892,12 @@ static void search_end_groups(struct pdb_search *search)
        SAFE_FREE(state->groups);
 }
 
-static BOOL pdb_search_grouptype(struct pdb_search *search,
-                                const DOM_SID *sid, enum SID_NAME_USE type)
+static bool pdb_search_grouptype(struct pdb_search *search,
+                                const struct dom_sid *sid, enum lsa_SidType type)
 {
        struct group_search *state;
 
-       state = TALLOC_P(search->mem_ctx, struct group_search);
+       state = talloc(search, struct group_search);
        if (state == NULL) {
                DEBUG(0, ("talloc failed\n"));
                return False;
@@ -1865,22 +1916,22 @@ static BOOL pdb_search_grouptype(struct pdb_search *search,
        return True;
 }
 
-static BOOL pdb_default_search_groups(struct pdb_methods *methods,
+static bool pdb_default_search_groups(struct pdb_methods *methods,
                                      struct pdb_search *search)
 {
        return pdb_search_grouptype(search, get_global_sam_sid(), SID_NAME_DOM_GRP);
 }
 
-static BOOL pdb_default_search_aliases(struct pdb_methods *methods,
+static bool pdb_default_search_aliases(struct pdb_methods *methods,
                                       struct pdb_search *search,
-                                      const DOM_SID *sid)
+                                      const struct dom_sid *sid)
 {
 
        return pdb_search_grouptype(search, sid, SID_NAME_ALIAS);
 }
 
 static struct samr_displayentry *pdb_search_getentry(struct pdb_search *search,
-                                                    uint32 idx)
+                                                    uint32_t idx)
 {
        if (idx < search->num_entries)
                return &search->cache[idx];
@@ -1897,7 +1948,7 @@ static struct samr_displayentry *pdb_search_getentry(struct pdb_search *search,
                        break;
                }
 
-               ADD_TO_LARGE_ARRAY(search->mem_ctx, struct samr_displayentry,
+               ADD_TO_LARGE_ARRAY(search, struct samr_displayentry,
                                   entry, &search->cache, &search->num_entries,
                                   &search->cache_size);
        }
@@ -1905,63 +1956,65 @@ static struct samr_displayentry *pdb_search_getentry(struct pdb_search *search,
        return (search->num_entries > idx) ? &search->cache[idx] : NULL;
 }
 
-struct pdb_search *pdb_search_users(uint32 acct_flags)
+struct pdb_search *pdb_search_users(TALLOC_CTX *mem_ctx, uint32_t acct_flags)
 {
        struct pdb_methods *pdb = pdb_get_methods();
        struct pdb_search *result;
 
-       result = pdb_search_init(PDB_USER_SEARCH);
+       result = pdb_search_init(mem_ctx, PDB_USER_SEARCH);
        if (result == NULL) {
                return NULL;
        }
 
        if (!pdb->search_users(pdb, result, acct_flags)) {
-               talloc_destroy(result->mem_ctx);
+               TALLOC_FREE(result);
                return NULL;
        }
        return result;
 }
 
-struct pdb_search *pdb_search_groups(void)
+struct pdb_search *pdb_search_groups(TALLOC_CTX *mem_ctx)
 {
        struct pdb_methods *pdb = pdb_get_methods();
        struct pdb_search *result;
 
-       result = pdb_search_init(PDB_GROUP_SEARCH);
+       result = pdb_search_init(mem_ctx, PDB_GROUP_SEARCH);
        if (result == NULL) {
                 return NULL;
        }
 
        if (!pdb->search_groups(pdb, result)) {
-               talloc_destroy(result->mem_ctx);
+               TALLOC_FREE(result);
                return NULL;
        }
        return result;
 }
 
-struct pdb_search *pdb_search_aliases(const DOM_SID *sid)
+struct pdb_search *pdb_search_aliases(TALLOC_CTX *mem_ctx, const struct dom_sid *sid)
 {
        struct pdb_methods *pdb = pdb_get_methods();
        struct pdb_search *result;
 
        if (pdb == NULL) return NULL;
 
-       result = pdb_search_init(PDB_ALIAS_SEARCH);
-       if (result == NULL) return NULL;
+       result = pdb_search_init(mem_ctx, PDB_ALIAS_SEARCH);
+       if (result == NULL) {
+               return NULL;
+       }
 
        if (!pdb->search_aliases(pdb, result, sid)) {
-               talloc_destroy(result->mem_ctx);
+               TALLOC_FREE(result);
                return NULL;
        }
        return result;
 }
 
-uint32 pdb_search_entries(struct pdb_search *search,
-                         uint32 start_idx, uint32 max_entries,
+uint32_t pdb_search_entries(struct pdb_search *search,
+                         uint32_t start_idx, uint32_t max_entries,
                          struct samr_displayentry **result)
 {
        struct samr_displayentry *end_entry;
-       uint32 end_idx = start_idx+max_entries-1;
+       uint32_t end_idx = start_idx+max_entries-1;
 
        /* The first entry needs to be searched after the last. Otherwise the
         * first entry might have moved due to a realloc during the search for
@@ -1979,15 +2032,254 @@ uint32 pdb_search_entries(struct pdb_search *search,
        return search->num_entries - start_idx;
 }
 
-void pdb_search_destroy(struct pdb_search *search)
+/*******************************************************************
+ trustdom methods
+ *******************************************************************/
+
+bool pdb_get_trusteddom_pw(const char *domain, char** pwd, struct dom_sid *sid,
+                          time_t *pass_last_set_time)
 {
-       if (search == NULL)
-               return;
+       struct pdb_methods *pdb = pdb_get_methods();
+       return pdb->get_trusteddom_pw(pdb, domain, pwd, sid, 
+                       pass_last_set_time);
+}
 
-       if (!search->search_ended)
-               search->search_end(search);
+bool pdb_set_trusteddom_pw(const char* domain, const char* pwd,
+                          const struct dom_sid *sid)
+{
+       struct pdb_methods *pdb = pdb_get_methods();
+       return pdb->set_trusteddom_pw(pdb, domain, pwd, sid);
+}
 
-       talloc_destroy(search->mem_ctx);
+bool pdb_del_trusteddom_pw(const char *domain)
+{
+       struct pdb_methods *pdb = pdb_get_methods();
+       return pdb->del_trusteddom_pw(pdb, domain);
+}
+
+NTSTATUS pdb_enum_trusteddoms(TALLOC_CTX *mem_ctx, uint32_t *num_domains,
+                             struct trustdom_info ***domains)
+{
+       struct pdb_methods *pdb = pdb_get_methods();
+       return pdb->enum_trusteddoms(pdb, mem_ctx, num_domains, domains);
+}
+
+/*******************************************************************
+ the defaults for trustdom methods: 
+ these simply call the original passdb/secrets.c actions,
+ to be replaced by pdb_ldap.
+ *******************************************************************/
+
+static bool pdb_default_get_trusteddom_pw(struct pdb_methods *methods,
+                                         const char *domain, 
+                                         char** pwd, 
+                                         struct dom_sid *sid,
+                                         time_t *pass_last_set_time)
+{
+       return secrets_fetch_trusted_domain_password(domain, pwd,
+                               sid, pass_last_set_time);
+
+}
+
+static bool pdb_default_set_trusteddom_pw(struct pdb_methods *methods, 
+                                         const char* domain, 
+                                         const char* pwd,
+                                         const struct dom_sid *sid)
+{
+       return secrets_store_trusted_domain_password(domain, pwd, sid);
+}
+
+static bool pdb_default_del_trusteddom_pw(struct pdb_methods *methods, 
+                                         const char *domain)
+{
+       return trusted_domain_password_delete(domain);
+}
+
+static NTSTATUS pdb_default_enum_trusteddoms(struct pdb_methods *methods,
+                                            TALLOC_CTX *mem_ctx, 
+                                            uint32_t *num_domains,
+                                            struct trustdom_info ***domains)
+{
+       return secrets_trusted_domains(mem_ctx, num_domains, domains);
+}
+
+/*******************************************************************
+ trusted_domain methods
+ *******************************************************************/
+
+NTSTATUS pdb_get_trusted_domain(TALLOC_CTX *mem_ctx, const char *domain,
+                               struct pdb_trusted_domain **td)
+{
+       struct pdb_methods *pdb = pdb_get_methods();
+       return pdb->get_trusted_domain(pdb, mem_ctx, domain, td);
+}
+
+NTSTATUS pdb_get_trusted_domain_by_sid(TALLOC_CTX *mem_ctx, struct dom_sid *sid,
+                               struct pdb_trusted_domain **td)
+{
+       struct pdb_methods *pdb = pdb_get_methods();
+       return pdb->get_trusted_domain_by_sid(pdb, mem_ctx, sid, td);
+}
+
+NTSTATUS pdb_set_trusted_domain(const char* domain,
+                               const struct pdb_trusted_domain *td)
+{
+       struct pdb_methods *pdb = pdb_get_methods();
+       return pdb->set_trusted_domain(pdb, domain, td);
+}
+
+NTSTATUS pdb_del_trusted_domain(const char *domain)
+{
+       struct pdb_methods *pdb = pdb_get_methods();
+       return pdb->del_trusted_domain(pdb, domain);
+}
+
+NTSTATUS pdb_enum_trusted_domains(TALLOC_CTX *mem_ctx, uint32_t *num_domains,
+                                 struct pdb_trusted_domain ***domains)
+{
+       struct pdb_methods *pdb = pdb_get_methods();
+       return pdb->enum_trusted_domains(pdb, mem_ctx, num_domains, domains);
+}
+
+static NTSTATUS pdb_default_get_trusted_domain(struct pdb_methods *methods,
+                                              TALLOC_CTX *mem_ctx,
+                                              const char *domain,
+                                              struct pdb_trusted_domain **td)
+{
+       struct trustAuthInOutBlob taiob;
+       struct AuthenticationInformation aia;
+       struct pdb_trusted_domain *tdom;
+       enum ndr_err_code ndr_err;
+       time_t last_set_time;
+       char *pwd;
+       bool ok;
+
+       tdom = talloc(mem_ctx, struct pdb_trusted_domain);
+       if (!tdom) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       tdom->domain_name = talloc_strdup(tdom, domain);
+       tdom->netbios_name = talloc_strdup(tdom, domain);
+       if (!tdom->domain_name || !tdom->netbios_name) {
+               talloc_free(tdom);
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       tdom->trust_auth_incoming = data_blob_null;
+
+       ok = pdb_get_trusteddom_pw(domain, &pwd, &tdom->security_identifier,
+                                  &last_set_time);
+       if (!ok) {
+               talloc_free(tdom);
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+
+       ZERO_STRUCT(taiob);
+       ZERO_STRUCT(aia);
+       taiob.count = 1;
+       taiob.current.count = 1;
+       taiob.current.array = &aia;
+       unix_to_nt_time(&aia.LastUpdateTime, last_set_time);
+       aia.AuthType = TRUST_AUTH_TYPE_CLEAR;
+       aia.AuthInfo.clear.password = (uint8_t *) pwd;
+       aia.AuthInfo.clear.size = strlen(pwd);
+       taiob.previous.count = 0;
+       taiob.previous.array = NULL;
+
+       ndr_err = ndr_push_struct_blob(&tdom->trust_auth_outgoing,
+                                       tdom, &taiob,
+                       (ndr_push_flags_fn_t)ndr_push_trustAuthInOutBlob);
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+               talloc_free(tdom);
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+
+       tdom->trust_direction = LSA_TRUST_DIRECTION_OUTBOUND;
+       tdom->trust_type = LSA_TRUST_TYPE_DOWNLEVEL;
+       tdom->trust_attributes = 0;
+       tdom->trust_forest_trust_info = data_blob_null;
+
+       *td = tdom;
+       return NT_STATUS_OK;
+}
+
+static NTSTATUS pdb_default_get_trusted_domain_by_sid(struct pdb_methods *methods,
+                                                     TALLOC_CTX *mem_ctx,
+                                                     struct dom_sid *sid,
+                                                     struct pdb_trusted_domain **td)
+{
+       return NT_STATUS_NOT_IMPLEMENTED;
+}
+
+#define IS_NULL_DATA_BLOB(d) ((d).data == NULL && (d).length == 0)
+
+static NTSTATUS pdb_default_set_trusted_domain(struct pdb_methods *methods,
+                                              const char* domain,
+                                              const struct pdb_trusted_domain *td)
+{
+       struct trustAuthInOutBlob taiob;
+       struct AuthenticationInformation *aia;
+       enum ndr_err_code ndr_err;
+       char *pwd;
+       bool ok;
+
+       if (td->trust_attributes != 0 ||
+           td->trust_type != LSA_TRUST_TYPE_DOWNLEVEL ||
+           td->trust_direction != LSA_TRUST_DIRECTION_OUTBOUND ||
+           !IS_NULL_DATA_BLOB(td->trust_auth_incoming) ||
+           !IS_NULL_DATA_BLOB(td->trust_forest_trust_info)) {
+           return NT_STATUS_NOT_IMPLEMENTED;
+       }
+
+       ZERO_STRUCT(taiob);
+       ndr_err = ndr_pull_struct_blob(&td->trust_auth_outgoing, talloc_tos(),
+                             &taiob,
+                             (ndr_pull_flags_fn_t)ndr_pull_trustAuthInOutBlob);
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+
+       aia = (struct AuthenticationInformation *) taiob.current.array;
+
+       if (taiob.count != 1 || taiob.current.count != 1 ||
+           taiob.previous.count != 0 ||
+           aia->AuthType != TRUST_AUTH_TYPE_CLEAR) {
+           return NT_STATUS_NOT_IMPLEMENTED;
+       }
+
+       pwd = talloc_strndup(talloc_tos(), (char *) aia->AuthInfo.clear.password,
+                            aia->AuthInfo.clear.size);
+       if (!pwd) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       ok = pdb_set_trusteddom_pw(domain, pwd, &td->security_identifier);
+       if (!ok) {
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+
+       return NT_STATUS_OK;
+}
+
+static NTSTATUS pdb_default_del_trusted_domain(struct pdb_methods *methods,
+                                              const char *domain)
+{
+       return NT_STATUS_NOT_IMPLEMENTED;
+}
+
+static NTSTATUS pdb_default_enum_trusted_domains(struct pdb_methods *methods,
+                                                TALLOC_CTX *mem_ctx,
+                                                uint32_t *num_domains,
+                                                struct pdb_trusted_domain ***domains)
+{
+       return NT_STATUS_NOT_IMPLEMENTED;
+}
+
+static struct pdb_domain_info *pdb_default_get_domain_info(
+       struct pdb_methods *m, TALLOC_CTX *mem_ctx)
+{
+       return NULL;
 }
 
 /*******************************************************************
@@ -2001,13 +2293,12 @@ NTSTATUS make_pdb_method( struct pdb_methods **methods )
 {
        /* allocate memory for the structure as its own talloc CTX */
 
-       if ( !(*methods = TALLOC_ZERO_P(NULL, struct pdb_methods) ) ) {
+       *methods = talloc_zero(NULL, struct pdb_methods);
+       if (*methods == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
 
-       (*methods)->setsampwent = pdb_default_setsampwent;
-       (*methods)->endsampwent = pdb_default_endsampwent;
-       (*methods)->getsampwent = pdb_default_getsampwent;
+       (*methods)->get_domain_info = pdb_default_get_domain_info;
        (*methods)->getsampwnam = pdb_default_getsampwnam;
        (*methods)->getsampwsid = pdb_default_getsampwsid;
        (*methods)->create_user = pdb_default_create_user;
@@ -2032,7 +2323,6 @@ NTSTATUS make_pdb_method( struct pdb_methods **methods )
        (*methods)->set_unix_primary_group = pdb_default_set_unix_primary_group;
        (*methods)->add_groupmem = pdb_default_add_groupmem;
        (*methods)->del_groupmem = pdb_default_del_groupmem;
-       (*methods)->find_alias = pdb_default_find_alias;
        (*methods)->create_alias = pdb_default_create_alias;
        (*methods)->delete_alias = pdb_default_delete_alias;
        (*methods)->get_aliasinfo = pdb_default_get_aliasinfo;
@@ -2045,13 +2335,23 @@ NTSTATUS make_pdb_method( struct pdb_methods **methods )
        (*methods)->get_account_policy = pdb_default_get_account_policy;
        (*methods)->set_account_policy = pdb_default_set_account_policy;
        (*methods)->get_seq_num = pdb_default_get_seq_num;
-       (*methods)->uid_to_rid = pdb_default_uid_to_rid;
+       (*methods)->uid_to_sid = pdb_default_uid_to_sid;
        (*methods)->gid_to_sid = pdb_default_gid_to_sid;
        (*methods)->sid_to_id = pdb_default_sid_to_id;
 
-       (*methods)->search_users = pdb_default_search_users;
        (*methods)->search_groups = pdb_default_search_groups;
        (*methods)->search_aliases = pdb_default_search_aliases;
 
+       (*methods)->get_trusteddom_pw = pdb_default_get_trusteddom_pw;
+       (*methods)->set_trusteddom_pw = pdb_default_set_trusteddom_pw;
+       (*methods)->del_trusteddom_pw = pdb_default_del_trusteddom_pw;
+       (*methods)->enum_trusteddoms  = pdb_default_enum_trusteddoms;
+
+       (*methods)->get_trusted_domain = pdb_default_get_trusted_domain;
+       (*methods)->get_trusted_domain_by_sid = pdb_default_get_trusted_domain_by_sid;
+       (*methods)->set_trusted_domain = pdb_default_set_trusted_domain;
+       (*methods)->del_trusted_domain = pdb_default_del_trusted_domain;
+       (*methods)->enum_trusted_domains = pdb_default_enum_trusted_domains;
+
        return NT_STATUS_OK;
 }