r6149: Fixes bugs #2498 and 2484.
[vlendec/samba-autobuild/.git] / source3 / nsswitch / winbindd_util.c
index 84f5d1956863699d216bd29c689e29c4f89ec2db..9ae24e401fdd2f1e2fddc1341370cada4527632d 100644 (file)
@@ -21,6 +21,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include "includes.h"
 #include "winbindd.h"
 
 #undef DBGC_CLASS
@@ -48,12 +49,21 @@ static const fstring name_deadbeef = "<deadbeef>";
 
 static struct winbindd_domain *_domain_list;
 
+/**
+   When was the last scan of trusted domains done?
+   
+   0 == not ever
+*/
+
+static time_t last_trustdom_scan;
+
 struct winbindd_domain *domain_list(void)
 {
        /* Initialise list */
 
-       if (!_domain_list)
-               init_domain_list();
+       if (!_domain_list) 
+               if (!init_domain_list()) 
+                       return NULL;
 
        return _domain_list;
 }
@@ -73,6 +83,22 @@ void free_domain_list(void)
        }
 }
 
+static BOOL is_internal_domain(const DOM_SID *sid)
+{
+       extern DOM_SID global_sid_Builtin;
+
+       if (sid == NULL)
+               return False;
+
+       if (sid_compare_domain(sid, get_global_sam_sid()) == 0)
+               return True;
+
+       if (sid_compare_domain(sid, &global_sid_Builtin) == 0)
+               return True;
+
+       return False;
+}
+
 
 /* Add a trusted domain to our list of domains */
 static struct winbindd_domain *add_trusted_domain(const char *domain_name, const char *alt_name,
@@ -80,17 +106,32 @@ static struct winbindd_domain *add_trusted_domain(const char *domain_name, const
                                                  DOM_SID *sid)
 {
        struct winbindd_domain *domain;
+       const char *alternative_name = NULL;
+       static const DOM_SID null_sid;
+       
+       /* ignore alt_name if we are not in an AD domain */
+       
+       if ( (lp_security() == SEC_ADS) && alt_name && *alt_name) {
+               alternative_name = alt_name;
+       }
         
        /* We can't call domain_list() as this function is called from
           init_domain_list() and we'll get stuck in a loop. */
        for (domain = _domain_list; domain; domain = domain->next) {
-               if (strcasecmp(domain_name, domain->name) == 0 ||
-                   strcasecmp(domain_name, domain->alt_name) == 0) {
+               if (strequal(domain_name, domain->name) ||
+                   strequal(domain_name, domain->alt_name)) {
                        return domain;
                }
-               if (alt_name && *alt_name) {
-                       if (strcasecmp(alt_name, domain->name) == 0 ||
-                           strcasecmp(alt_name, domain->alt_name) == 0) {
+               if (alternative_name && *alternative_name) {
+                       if (strequal(alternative_name, domain->name) ||
+                           strequal(alternative_name, domain->alt_name)) {
+                               return domain;
+                       }
+               }
+               if (sid) {
+                       if (sid_equal(sid, &null_sid) ) {
+                               
+                       } else if (sid_equal(sid, &domain->sid)) {
                                return domain;
                        }
                }
@@ -98,8 +139,7 @@ static struct winbindd_domain *add_trusted_domain(const char *domain_name, const
         
        /* Create new domain entry */
 
-       if ((domain = (struct winbindd_domain *)
-            malloc(sizeof(*domain))) == NULL)
+       if ((domain = SMB_MALLOC_P(struct winbindd_domain)) == NULL)
                return NULL;
 
        /* Fill in fields */
@@ -107,87 +147,102 @@ static struct winbindd_domain *add_trusted_domain(const char *domain_name, const
        ZERO_STRUCTP(domain);
 
        /* prioritise the short name */
-       if (strchr_m(domain_name, '.') && alt_name && *alt_name) {
-               fstrcpy(domain->name, alt_name);
+       if (strchr_m(domain_name, '.') && alternative_name && *alternative_name) {
+               fstrcpy(domain->name, alternative_name);
                fstrcpy(domain->alt_name, domain_name);
        } else {
-       fstrcpy(domain->name, domain_name);
-               if (alt_name) {
-                       fstrcpy(domain->alt_name, alt_name);
+               fstrcpy(domain->name, domain_name);
+               if (alternative_name) {
+                       fstrcpy(domain->alt_name, alternative_name);
                }
        }
 
        domain->methods = methods;
+       domain->backend = NULL;
+       domain->internal = is_internal_domain(sid);
        domain->sequence_number = DOM_SEQUENCE_NONE;
        domain->last_seq_check = 0;
+       domain->initialized = False;
        if (sid) {
                sid_copy(&domain->sid, sid);
        }
        
-       /* see if this is a native mode win2k domain */
-          
-       domain->native_mode = cm_check_for_native_mode_win2k( domain_name );
-       DEBUG(3,("add_trusted_domain: %s is a %s mode domain\n", domain_name,
-               domain->native_mode ? "native" : "mixed (or NT4)" ));
-
        /* Link to domain list */
        DLIST_ADD(_domain_list, domain);
         
-       DEBUG(1,("Added domain %s %s %s\n", 
+       DEBUG(2,("Added domain %s %s %s\n", 
                 domain->name, domain->alt_name,
-                sid?sid_string_static(&domain->sid):""));
+                &domain->sid?sid_string_static(&domain->sid):""));
         
        return domain;
 }
 
-
-/*
+/********************************************************************
   rescan our domains looking for new trusted domains
- */
-void rescan_trusted_domains(BOOL force)
+********************************************************************/
+
+static void add_trusted_domains( struct winbindd_domain *domain )
 {
-       struct winbindd_domain *domain;
+       extern struct winbindd_methods cache_methods;
        TALLOC_CTX *mem_ctx;
-       static time_t last_scan;
-       time_t t = time(NULL);
+       NTSTATUS result;
+       time_t t;
+       char **names;
+       char **alt_names;
+       int num_domains = 0;
+       DOM_SID *dom_sids, null_sid;
+       int i;
+       struct winbindd_domain *new_domain;
 
        /* trusted domains might be disabled */
        if (!lp_allow_trusted_domains()) {
                return;
        }
 
-       /* Only rescan every few minutes but force if necessary */
-
-       if (((unsigned)(t - last_scan) < WINBINDD_RESCAN_FREQ) && !force)
-               return;
-
-       last_scan = t;
-
-       DEBUG(1, ("scanning trusted domain list\n"));
+       DEBUG(5, ("scanning trusted domain list\n"));
 
        if (!(mem_ctx = talloc_init("init_domain_list")))
                return;
+          
+       ZERO_STRUCTP(&null_sid);
 
-       for (domain = _domain_list; domain; domain = domain->next) {
-               NTSTATUS result;
-               char **names;
-               char **alt_names;
-               int num_domains = 0;
-               DOM_SID *dom_sids;
-               int i;
-
-               result = domain->methods->trusted_domains(domain, mem_ctx, &num_domains,
-                                                         &names, &alt_names, &dom_sids);
-               if (!NT_STATUS_IS_OK(result)) {
-                       continue;
-               }
+       t = time(NULL);
+       
+       /* ask the DC what domains it trusts */
+       
+       result = domain->methods->trusted_domains(domain, mem_ctx, (unsigned int *)&num_domains,
+               &names, &alt_names, &dom_sids);
+               
+       if ( NT_STATUS_IS_OK(result) ) {
 
-               /* Add each domain to the trusted domain list. Each domain inherits
-                  the access methods of its parent */
+               /* Add each domain to the trusted domain list */
+               
                for(i = 0; i < num_domains; i++) {
                        DEBUG(10,("Found domain %s\n", names[i]));
                        add_trusted_domain(names[i], alt_names?alt_names[i]:NULL,
-                                          domain->methods, &dom_sids[i]);
+                                          &cache_methods, &dom_sids[i]);
+                                          
+                       /* if the SID was empty, we better set it now */
+                       
+                       if ( sid_equal(&dom_sids[i], &null_sid) ) {
+                       
+                               new_domain = find_domain_from_name(names[i]);
+                                
+                               /* this should never happen */
+                               if ( !new_domain ) {    
+                                       DEBUG(0,("rescan_trust_domains: can't find the domain I just added! [%s]\n",
+                                               names[i]));
+                                       break;
+                               }
+                                
+                               /* call the cache method; which will operate on the winbindd_domain \
+                                  passed in and choose either rpc or ads as appropriate */
+
+                               result = domain->methods->domain_sid( new_domain, &new_domain->sid );
+                                
+                               if ( NT_STATUS_IS_OK(result) )
+                                       sid_copy( &dom_sids[i], &new_domain->sid );
+                       }
                        
                        /* store trusted domain in the cache */
                        trustdom_cache_store(names[i], alt_names ? alt_names[i] : NULL,
@@ -198,34 +253,106 @@ void rescan_trusted_domains(BOOL force)
        talloc_destroy(mem_ctx);
 }
 
+/********************************************************************
+ Periodically we need to refresh the trusted domain cache for smbd 
+********************************************************************/
+
+void rescan_trusted_domains( void )
+{
+       time_t now = time(NULL);
+       struct winbindd_domain *mydomain = NULL;
+       
+       /* see if the time has come... */
+       
+       if ( (now > last_trustdom_scan) && ((now-last_trustdom_scan) < WINBINDD_RESCAN_FREQ) )
+               return;
+               
+       if ( (mydomain = find_our_domain()) == NULL ) {
+               DEBUG(0,("rescan_trusted_domains: Can't find my own domain!\n"));
+               return;
+       }
+       
+       /* this will only add new domains we didn't already know about */
+       
+       add_trusted_domains( mydomain );
+
+       last_trustdom_scan = now;
+       
+       return; 
+}
+
 /* Look up global info for the winbind daemon */
 BOOL init_domain_list(void)
 {
+       extern DOM_SID global_sid_Builtin;
        extern struct winbindd_methods cache_methods;
+       extern struct winbindd_methods passdb_methods;
        struct winbindd_domain *domain;
 
        /* Free existing list */
        free_domain_list();
 
-       /* Add ourselves as the first entry */
-       domain = add_trusted_domain(lp_workgroup(), NULL, &cache_methods, NULL);
+       /* Add ourselves as the first entry. */
+
+       if (IS_DC) {
+               domain = add_trusted_domain(get_global_sam_name(), NULL,
+                                           &passdb_methods, get_global_sam_sid());
+       } else {
+       
+               domain = add_trusted_domain( lp_workgroup(), lp_realm(),
+                                            &cache_methods, NULL);
+       
+               /* set flags about native_mode, active_directory */
+               set_dc_type_and_flags(domain);
+       }
+
+       domain->primary = True;
+
+       /* get any alternate name for the primary domain */
+       
+       cache_methods.alternate_name(domain);
+       
+       /* now we have the correct netbios (short) domain name */
+       
+       if ( *domain->name )
+               set_global_myworkgroup( domain->name );
+               
        if (!secrets_fetch_domain_sid(domain->name, &domain->sid)) {
                DEBUG(1, ("Could not fetch sid for our domain %s\n",
                          domain->name));
                return False;
        }
 
-       /* get any alternate name for the primary domain */
-       cache_methods.alternate_name(domain);
-
        /* do an initial scan for trusted domains */
-       rescan_trusted_domains(True);
+       add_trusted_domains(domain);
+
+
+       /* Add our local SAM domains */
 
+       add_trusted_domain("BUILTIN", NULL, &passdb_methods,
+                          &global_sid_Builtin);
+
+       if (!IS_DC) {
+               add_trusted_domain(get_global_sam_name(), NULL,
+                                  &passdb_methods, get_global_sam_sid());
+       }
+       
+       /* avoid rescanning this right away */
+       last_trustdom_scan = time(NULL);
        return True;
 }
 
-/* Given a domain name, return the struct winbindd domain info for it 
-   if it is actually working. */
+/** 
+ * Given a domain name, return the struct winbindd domain info for it 
+ *
+ * @note Do *not* pass lp_workgroup() to this function.  domain_list
+ *       may modify it's value, and free that pointer.  Instead, our local
+ *       domain may be found by calling find_our_domain().
+ *       directly.
+ *
+ *
+ * @return The domain structure for the named domain, if it is working.
+ */
 
 struct winbindd_domain *find_domain_from_name(const char *domain_name)
 {
@@ -235,8 +362,12 @@ struct winbindd_domain *find_domain_from_name(const char *domain_name)
 
        for (domain = domain_list(); domain != NULL; domain = domain->next) {
                if (strequal(domain_name, domain->name) ||
-                   (domain->alt_name[0] && strequal(domain_name, domain->alt_name)))
+                   (domain->alt_name[0] && strequal(domain_name, domain->alt_name))) {
+                       if (!domain->initialized)
+                               set_dc_type_and_flags(domain);
+
                        return domain;
+               }
        }
 
        /* Not found */
@@ -246,15 +377,18 @@ struct winbindd_domain *find_domain_from_name(const char *domain_name)
 
 /* Given a domain sid, return the struct winbindd domain info for it */
 
-struct winbindd_domain *find_domain_from_sid(DOM_SID *sid)
+struct winbindd_domain *find_domain_from_sid(const DOM_SID *sid)
 {
        struct winbindd_domain *domain;
 
        /* Search through list */
 
        for (domain = domain_list(); domain != NULL; domain = domain->next) {
-               if (sid_compare_domain(sid, &domain->sid) == 0)
+               if (sid_compare_domain(sid, &domain->sid) == 0) {
+                       if (!domain->initialized)
+                               set_dc_type_and_flags(domain);
                        return domain;
+               }
        }
 
        /* Not found */
@@ -262,25 +396,67 @@ struct winbindd_domain *find_domain_from_sid(DOM_SID *sid)
        return NULL;
 }
 
+/* Given a domain sid, return the struct winbindd domain info for it */
+
+struct winbindd_domain *find_our_domain(void)
+{
+       struct winbindd_domain *domain;
+
+       /* Search through list */
+
+       for (domain = domain_list(); domain != NULL; domain = domain->next) {
+               if (domain->primary)
+                       return domain;
+       }
+
+       /* Not found */
+
+       return NULL;
+}
+
+/* Find the appropriate domain to lookup a name or SID */
+
+struct winbindd_domain *find_lookup_domain_from_sid(const DOM_SID *sid)
+{
+       /* A DC can't ask the local smbd for remote SIDs, here winbindd is the
+        * one to contact the external DC's. On member servers the internal
+        * domains are different: These are part of the local SAM. */
+
+       if (IS_DC || is_internal_domain(sid))
+               return find_domain_from_sid(sid);
+
+       /* On a member server a query for SID or name can always go to our
+        * primary DC. */
+
+       return find_our_domain();
+}
+
+struct winbindd_domain *find_lookup_domain_from_name(const char *domain_name)
+{
+       if (IS_DC || strequal(domain_name, "BUILTIN") ||
+           strequal(domain_name, get_global_sam_name()))
+               return find_domain_from_name(domain_name);
+
+       return find_our_domain();
+}
+
 /* Lookup a sid in a domain from a name */
 
 BOOL winbindd_lookup_sid_by_name(struct winbindd_domain *domain, 
+                                const char *domain_name,
                                 const char *name, DOM_SID *sid, 
                                 enum SID_NAME_USE *type)
 {
        NTSTATUS result;
         TALLOC_CTX *mem_ctx;
-       /* Don't bother with machine accounts */
 
-       if (name[strlen(name) - 1] == '$')
-               return False;
-
-       mem_ctx = talloc_init("lookup_sid_by_name for %s\n", name);
+       mem_ctx = talloc_init("lookup_sid_by_name for %s\\%s\n",
+                             domain_name, name);
        if (!mem_ctx) 
                return False;
         
        /* Lookup name */
-       result = domain->methods->name_to_sid(domain, mem_ctx, name, sid, type);
+       result = domain->methods->name_to_sid(domain, mem_ctx, domain_name, name, sid, type);
 
        talloc_destroy(mem_ctx);
         
@@ -296,14 +472,10 @@ BOOL winbindd_lookup_sid_by_name(struct winbindd_domain *domain,
  * @brief Lookup a name in a domain from a sid.
  *
  * @param sid Security ID you want to look up.
- *
  * @param name On success, set to the name corresponding to @p sid.
- * 
  * @param dom_name On success, set to the 'domain name' corresponding to @p sid.
- * 
  * @param type On success, contains the type of name: alias, group or
  * user.
- *
  * @retval True if the name exists, in which case @p name and @p type
  * are set, otherwise False.
  **/
@@ -313,12 +485,13 @@ BOOL winbindd_lookup_name_by_sid(DOM_SID *sid,
                                 enum SID_NAME_USE *type)
 {
        char *names;
+       char *dom_names;
        NTSTATUS result;
        TALLOC_CTX *mem_ctx;
        BOOL rv = False;
        struct winbindd_domain *domain;
 
-       domain = find_domain_from_sid(sid);
+       domain = find_lookup_domain_from_sid(sid);
 
        if (!domain) {
                DEBUG(1,("Can't find domain from sid\n"));
@@ -330,12 +503,12 @@ BOOL winbindd_lookup_name_by_sid(DOM_SID *sid,
        if (!(mem_ctx = talloc_init("winbindd_lookup_name_by_sid")))
                return False;
         
-       result = domain->methods->sid_to_name(domain, mem_ctx, sid, &names, type);
+       result = domain->methods->sid_to_name(domain, mem_ctx, sid, &dom_names, &names, type);
 
        /* Return name and type if successful */
         
        if ((rv = NT_STATUS_IS_OK(result))) {
-               fstrcpy(dom_name, domain->name);
+               fstrcpy(dom_name, dom_names);
                fstrcpy(name, names);
        } else {
                *type = SID_NAME_UNKNOWN;
@@ -379,12 +552,14 @@ BOOL winbindd_param_init(void)
        /* Parse winbind uid and winbind_gid parameters */
 
        if (!lp_idmap_uid(&server_state.uid_low, &server_state.uid_high)) {
-               DEBUG(0, ("winbind uid range missing or invalid\n"));
+               DEBUG(0, ("winbindd: idmap uid range missing or invalid\n"));
+               DEBUG(0, ("winbindd: cannot continue, exiting.\n"));
                return False;
        }
        
        if (!lp_idmap_gid(&server_state.gid_low, &server_state.gid_high)) {
-               DEBUG(0, ("winbind gid range missing or invalid\n"));
+               DEBUG(0, ("winbindd: idmap gid range missing or invalid\n"));
+               DEBUG(0, ("winbindd: cannot continue, exiting.\n"));
                return False;
        }
        
@@ -406,24 +581,43 @@ BOOL check_domain_env(char *domain_env, char *domain)
        return False;
 }
 
+/* Is this a domain which we may assume no DOMAIN\ prefix? */
+
+static BOOL assume_domain(const char *domain) {
+       if ((lp_winbind_use_default_domain()  
+                 || lp_winbind_trusted_domains_only()) &&
+           strequal(lp_workgroup(), domain)) 
+               return True;
+
+       if (strequal(get_global_sam_name(), domain)) 
+               return True;
+       
+       return False;
+}
+
 /* Parse a string of the form DOMAIN/user into a domain and a user */
 
 BOOL parse_domain_user(const char *domuser, fstring domain, fstring user)
 {
        char *p = strchr(domuser,*lp_winbind_separator());
 
-       if (!(p || lp_winbind_use_default_domain()))
-               return False;
-       
-       if(!p && lp_winbind_use_default_domain()) {
+       if ( !p ) {
                fstrcpy(user, domuser);
-               fstrcpy(domain, lp_workgroup());
-       } else {
+               
+               if ( assume_domain(lp_workgroup())) {
+                       fstrcpy(domain, lp_workgroup());
+               } else {
+                       fstrcpy( domain, get_global_sam_name() ); 
+               }
+       } 
+       else {
                fstrcpy(user, p+1);
                fstrcpy(domain, domuser);
                domain[PTR_DIFF(p, domuser)] = 0;
        }
-       strupper(domain);
+       
+       strupper_m(domain);
+       
        return True;
 }
 
@@ -432,17 +626,23 @@ BOOL parse_domain_user(const char *domuser, fstring domain, fstring user)
     'winbind separator' options.
     This means:
        - omit DOMAIN when 'winbind use default domain = true' and DOMAIN is
-       lp_workgroup
+       lp_workgroup()
+
+    If we are a PDC or BDC, and this is for our domain, do likewise.
+
+    Also, if omit DOMAIN if 'winbind trusted domains only = true', as the 
+    username is then unqualified in unix
         
 */
 void fill_domain_username(fstring name, const char *domain, const char *user)
 {
-       if(lp_winbind_use_default_domain() &&
-           !strcmp(lp_workgroup(), domain)) {
+        strlower_m(CONST_DISCARD(char *, user));
+
+       if (assume_domain(domain)) {
                strlcpy(name, user, sizeof(fstring));
        } else {
-               slprintf(name, sizeof(fstring) - 1, "%s%s%s",
-                        domain, lp_winbind_separator(),
+               slprintf(name, sizeof(fstring) - 1, "%s%c%s",
+                        domain, *lp_winbind_separator(),
                         user);
        }
 }
@@ -533,6 +733,14 @@ void winbindd_remove_client(struct winbindd_cli_state *cli)
        _num_clients--;
 }
 
+/* Demote a client to be the last in the list */
+
+void winbindd_demote_client(struct winbindd_cli_state *cli)
+{
+       struct winbindd_cli_state *tmp;
+       DLIST_DEMOTE(_client_list, cli, tmp);
+}
+
 /* Close all open clients */
 
 void winbindd_kill_all_clients(void)
@@ -564,7 +772,7 @@ DOM_SID *rid_to_talloced_sid(struct winbindd_domain *domain,
                                    uint32 rid) 
 {
        DOM_SID *sid;
-       sid = talloc(mem_ctx, sizeof(*sid));
+       sid = TALLOC_P(mem_ctx, DOM_SID);
        if (!sid) {
                smb_panic("rid_to_to_talloced_sid: talloc for DOM_SID failed!\n");
        }
@@ -573,3 +781,258 @@ DOM_SID *rid_to_talloced_sid(struct winbindd_domain *domain,
        return sid;
 }
        
+/*****************************************************************************
+ For idmap conversion: convert one record to new format
+ Ancient versions (eg 2.2.3a) of winbindd_idmap.tdb mapped DOMAINNAME/rid
+ instead of the SID.
+*****************************************************************************/
+static int convert_fn(TDB_CONTEXT *tdb, TDB_DATA key, TDB_DATA data, void *state)
+{
+       struct winbindd_domain *domain;
+       char *p;
+       DOM_SID sid;
+       uint32 rid;
+       fstring keystr;
+       fstring dom_name;
+       TDB_DATA key2;
+       BOOL *failed = (BOOL *)state;
+
+       DEBUG(10,("Converting %s\n", key.dptr));
+
+       p = strchr(key.dptr, '/');
+       if (!p)
+               return 0;
+
+       *p = 0;
+       fstrcpy(dom_name, key.dptr);
+       *p++ = '/';
+
+       domain = find_domain_from_name(dom_name);
+       if (domain == NULL) {
+               /* We must delete the old record. */
+               DEBUG(0,("Unable to find domain %s\n", dom_name ));
+               DEBUG(0,("deleting record %s\n", key.dptr ));
+
+               if (tdb_delete(tdb, key) != 0) {
+                       DEBUG(0, ("Unable to delete record %s\n", key.dptr));
+                       *failed = True;
+                       return -1;
+               }
+
+               return 0;
+       }
+
+       rid = atoi(p);
+
+       sid_copy(&sid, &domain->sid);
+       sid_append_rid(&sid, rid);
+
+       sid_to_string(keystr, &sid);
+       key2.dptr = keystr;
+       key2.dsize = strlen(keystr) + 1;
+
+       if (tdb_store(tdb, key2, data, TDB_INSERT) != 0) {
+               DEBUG(0,("Unable to add record %s\n", key2.dptr ));
+               *failed = True;
+               return -1;
+       }
+
+       if (tdb_store(tdb, data, key2, TDB_REPLACE) != 0) {
+               DEBUG(0,("Unable to update record %s\n", data.dptr ));
+               *failed = True;
+               return -1;
+       }
+
+       if (tdb_delete(tdb, key) != 0) {
+               DEBUG(0,("Unable to delete record %s\n", key.dptr ));
+               *failed = True;
+               return -1;
+       }
+
+       return 0;
+}
+
+/* These definitions are from sam/idmap_tdb.c. Replicated here just
+   out of laziness.... :-( */
+
+/* High water mark keys */
+#define HWM_GROUP  "GROUP HWM"
+#define HWM_USER   "USER HWM"
+
+/* idmap version determines auto-conversion */
+#define IDMAP_VERSION 2
+
+
+/*****************************************************************************
+ Convert the idmap database from an older version.
+*****************************************************************************/
+
+static BOOL idmap_convert(const char *idmap_name)
+{
+       int32 vers;
+       BOOL bigendianheader;
+       BOOL failed = False;
+       TDB_CONTEXT *idmap_tdb;
+
+       if (!(idmap_tdb = tdb_open_log(idmap_name, 0,
+                                       TDB_DEFAULT, O_RDWR,
+                                       0600))) {
+               DEBUG(0, ("idmap_convert: Unable to open idmap database\n"));
+               return False;
+       }
+
+       bigendianheader = (idmap_tdb->flags & TDB_BIGENDIAN) ? True : False;
+
+       vers = tdb_fetch_int32(idmap_tdb, "IDMAP_VERSION");
+
+       if (((vers == -1) && bigendianheader) || (IREV(vers) == IDMAP_VERSION)) {
+               /* Arrggghh ! Bytereversed or old big-endian - make order independent ! */
+               /*
+                * high and low records were created on a
+                * big endian machine and will need byte-reversing.
+                */
+
+               int32 wm;
+
+               wm = tdb_fetch_int32(idmap_tdb, HWM_USER);
+
+               if (wm != -1) {
+                       wm = IREV(wm);
+               }  else {
+                       wm = server_state.uid_low;
+               }
+
+               if (tdb_store_int32(idmap_tdb, HWM_USER, wm) == -1) {
+                       DEBUG(0, ("idmap_convert: Unable to byteswap user hwm in idmap database\n"));
+                       tdb_close(idmap_tdb);
+                       return False;
+               }
+
+               wm = tdb_fetch_int32(idmap_tdb, HWM_GROUP);
+               if (wm != -1) {
+                       wm = IREV(wm);
+               } else {
+                       wm = server_state.gid_low;
+               }
+
+               if (tdb_store_int32(idmap_tdb, HWM_GROUP, wm) == -1) {
+                       DEBUG(0, ("idmap_convert: Unable to byteswap group hwm in idmap database\n"));
+                       tdb_close(idmap_tdb);
+                       return False;
+               }
+       }
+
+       /* the old format stored as DOMAIN/rid - now we store the SID direct */
+       tdb_traverse(idmap_tdb, convert_fn, &failed);
+
+       if (failed) {
+               DEBUG(0, ("Problem during conversion\n"));
+               tdb_close(idmap_tdb);
+               return False;
+       }
+
+       if (tdb_store_int32(idmap_tdb, "IDMAP_VERSION", IDMAP_VERSION) == -1) {
+               DEBUG(0, ("idmap_convert: Unable to dtore idmap version in databse\n"));
+               tdb_close(idmap_tdb);
+               return False;
+       }
+
+       tdb_close(idmap_tdb);
+       return True;
+}
+
+/*****************************************************************************
+ Convert the idmap database from an older version if necessary
+*****************************************************************************/
+
+BOOL winbindd_upgrade_idmap(void)
+{
+       pstring idmap_name;
+       pstring backup_name;
+       SMB_STRUCT_STAT stbuf;
+       TDB_CONTEXT *idmap_tdb;
+
+       pstrcpy(idmap_name, lock_path("winbindd_idmap.tdb"));
+
+       if (!file_exist(idmap_name, &stbuf)) {
+               /* nothing to convert return */
+               return True;
+       }
+
+       if (!(idmap_tdb = tdb_open_log(idmap_name, 0,
+                                       TDB_DEFAULT, O_RDWR,
+                                       0600))) {
+               DEBUG(0, ("idmap_convert: Unable to open idmap database\n"));
+               return False;
+       }
+
+       if (tdb_fetch_int32(idmap_tdb, "IDMAP_VERSION") == IDMAP_VERSION) {
+               /* nothing to convert return */
+               tdb_close(idmap_tdb);
+               return True;
+       }
+
+       /* backup_tdb expects the tdb not to be open */
+       tdb_close(idmap_tdb);
+
+       DEBUG(0, ("Upgrading winbindd_idmap.tdb from an old version\n"));
+
+       pstrcpy(backup_name, idmap_name);
+       pstrcat(backup_name, ".bak");
+
+       if (backup_tdb(idmap_name, backup_name) != 0) {
+               DEBUG(0, ("Could not backup idmap database\n"));
+               return False;
+       }
+
+       return idmap_convert(idmap_name);
+}
+
+/*******************************************************************
+ wrapper around retrieving the trust account password
+*******************************************************************/
+
+BOOL get_trust_pw(const char *domain, uint8 ret_pwd[16],
+                          time_t *pass_last_set_time, uint32 *channel)
+{
+       DOM_SID sid;
+       char *pwd;
+
+       /* if we are a DC and this is not our domain, then lookup an account
+          for the domain trust */
+          
+       if ( IS_DC && !strequal(domain, lp_workgroup()) && lp_allow_trusted_domains() ) 
+       {
+               if ( !secrets_fetch_trusted_domain_password(domain, &pwd, &sid, 
+                       pass_last_set_time) ) 
+               {
+                       DEBUG(0, ("get_trust_pw: could not fetch trust account "
+                                 "password for trusted domain %s\n", domain));
+                       return False;
+               }
+               
+               *channel = SEC_CHAN_DOMAIN;
+               E_md4hash(pwd, ret_pwd);
+               SAFE_FREE(pwd);
+
+               return True;
+       }
+       else    /* just get the account for our domain (covers 
+                  ROLE_DOMAIN_MEMBER as well */
+       {
+               /* get the machine trust account for our domain */
+
+               if ( !secrets_fetch_trust_account_password (lp_workgroup(), ret_pwd,
+                       pass_last_set_time, channel) ) 
+               {
+                       DEBUG(0, ("get_trust_pw: could not fetch trust account "
+                                 "password for my domain %s\n", domain));
+                       return False;
+               }
+               
+               return True;
+       }
+       
+       /* Failure */
+}
+