r10656: BIG merge from trunk. Features not copied over
[vlendec/samba-autobuild/.git] / source3 / nsswitch / winbindd_cache.c
index 6ba1d48f5af60529dd42a26d43a96bae5eac3ebc..78b49d01eac160f3d1cd9c306c7dddf2b2ed9134 100644 (file)
@@ -4,6 +4,9 @@
    Winbind cache backend functions
 
    Copyright (C) Andrew Tridgell 2001
+   Copyright (C) Gerald Carter   2003
+   Copyright (C) Volker Lendecke 2005
+   
    
    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
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include "includes.h"
 #include "winbindd.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
 
 struct winbind_cache {
-       struct winbindd_methods *backend;
        TDB_CONTEXT *tdb;
 };
 
@@ -46,12 +49,14 @@ void wcache_flush_cache(void)
 {
        extern BOOL opt_nocache;
 
-       if (!wcache) return;
+       if (!wcache)
+               return;
        if (wcache->tdb) {
                tdb_close(wcache->tdb);
                wcache->tdb = NULL;
        }
-       if (opt_nocache) return;
+       if (opt_nocache)
+               return;
 
        wcache->tdb = tdb_open_log(lock_path("winbindd_cache.tdb"), 5000, 
                                   TDB_CLEAR_IF_FIRST, O_RDWR|O_CREAT, 0600);
@@ -59,6 +64,7 @@ void wcache_flush_cache(void)
        if (!wcache->tdb) {
                DEBUG(0,("Failed to open winbindd_cache.tdb!\n"));
        }
+       DEBUG(10,("wcache_flush_cache success\n"));
 }
 
 void winbindd_check_cache_size(time_t t)
@@ -93,25 +99,52 @@ void winbindd_check_cache_size(time_t t)
 /* get the winbind_cache structure */
 static struct winbind_cache *get_cache(struct winbindd_domain *domain)
 {
-       extern struct winbindd_methods msrpc_methods;
        struct winbind_cache *ret = wcache;
 
-       if (ret) return ret;
-       
-       ret = smb_xmalloc(sizeof(*ret));
-       ZERO_STRUCTP(ret);
-       switch (lp_security()) {
+       /* we have to know what type of domain we are dealing with first */
+
+       if ( !domain->initialized )
+               set_dc_type_and_flags( domain );
+
+       if (!domain->backend) {
+               extern struct winbindd_methods reconnect_methods;
+               switch (lp_security()) {
 #ifdef HAVE_ADS
-       case SEC_ADS: {
-               extern struct winbindd_methods ads_methods;
-               ret->backend = &ads_methods;
-               break;
-       }
+               case SEC_ADS: {
+                       extern struct winbindd_methods ads_methods;
+                       /* always obey the lp_security parameter for our domain */
+                       if (domain->primary) {
+                               domain->backend = &ads_methods;
+                               break;
+                       }
+
+                       /* only use ADS for native modes at the momment.
+                          The problem is the correct detection of mixed 
+                          mode domains from NT4 BDC's    --jerry */
+                       
+                       if ( domain->native_mode ) {
+                               DEBUG(5,("get_cache: Setting ADS methods for domain %s\n",
+                                       domain->name));
+                               domain->backend = &ads_methods;
+                               break;
+                       }
+
+                       /* fall through */
+               }       
 #endif
-       default:
-               ret->backend = &msrpc_methods;
+               default:
+                       DEBUG(5,("get_cache: Setting MS-RPC methods for domain %s\n",
+                               domain->name));
+                       domain->backend = &reconnect_methods;
+               }
        }
 
+       if (ret)
+               return ret;
+       
+       ret = SMB_XMALLOC_P(struct winbind_cache);
+       ZERO_STRUCTP(ret);
+
        wcache = ret;
        wcache_flush_cache();
 
@@ -123,12 +156,12 @@ static struct winbind_cache *get_cache(struct winbindd_domain *domain)
 */
 static void centry_free(struct cache_entry *centry)
 {
-       if (!centry) return;
+       if (!centry)
+               return;
        SAFE_FREE(centry->data);
        free(centry);
 }
 
-
 /*
   pull a uint32 from a cache entry 
 */
@@ -182,7 +215,10 @@ static char *centry_string(struct cache_entry *centry, TALLOC_CTX *mem_ctx)
                smb_panic("centry_string");
        }
 
-       ret = talloc(mem_ctx, len+1);
+       if (mem_ctx != NULL)
+               ret = TALLOC(mem_ctx, len+1);
+       else
+               ret = SMB_MALLOC(len+1);
        if (!ret) {
                smb_panic("centry_string out of memory\n");
        }
@@ -192,54 +228,178 @@ static char *centry_string(struct cache_entry *centry, TALLOC_CTX *mem_ctx)
        return ret;
 }
 
+/* pull a string from a cache entry, using the supplied
+   talloc context 
+*/
+static BOOL centry_sid(struct cache_entry *centry, DOM_SID *sid)
+{
+       char *sid_string;
+       sid_string = centry_string(centry, NULL);
+       if (!string_to_sid(sid, sid_string)) {
+               return False;
+       }
+       SAFE_FREE(sid_string);
+       return True;
+}
+
 /* the server is considered down if it can't give us a sequence number */
 static BOOL wcache_server_down(struct winbindd_domain *domain)
 {
-       if (!wcache->tdb) return False;
-       return (domain->sequence_number == DOM_SEQUENCE_NONE);
+       BOOL ret;
+
+       if (!wcache->tdb)
+               return False;
+
+       ret = (domain->sequence_number == DOM_SEQUENCE_NONE);
+
+       if (ret)
+               DEBUG(10,("wcache_server_down: server for Domain %s down\n", 
+                       domain->name ));
+       return ret;
 }
 
+static NTSTATUS fetch_cache_seqnum( struct winbindd_domain *domain, time_t now )
+{
+       TDB_DATA data;
+       fstring key;
+       uint32 time_diff;
+       
+       if (!wcache->tdb) {
+               DEBUG(10,("fetch_cache_seqnum: tdb == NULL\n"));
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+               
+       fstr_sprintf( key, "SEQNUM/%s", domain->name );
+       
+       data = tdb_fetch_bystring( wcache->tdb, key );
+       if ( !data.dptr || data.dsize!=8 ) {
+               DEBUG(10,("fetch_cache_seqnum: invalid data size key [%s]\n", key ));
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+       
+       domain->sequence_number = IVAL(data.dptr, 0);
+       domain->last_seq_check  = IVAL(data.dptr, 4);
+       
+       SAFE_FREE(data.dptr);
+
+       /* have we expired? */
+       
+       time_diff = now - domain->last_seq_check;
+       if ( time_diff > lp_winbind_cache_time() ) {
+               DEBUG(10,("fetch_cache_seqnum: timeout [%s][%u @ %u]\n",
+                       domain->name, domain->sequence_number,
+                       (uint32)domain->last_seq_check));
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+
+       DEBUG(10,("fetch_cache_seqnum: success [%s][%u @ %u]\n", 
+               domain->name, domain->sequence_number, 
+               (uint32)domain->last_seq_check));
+
+       return NT_STATUS_OK;
+}
+
+static NTSTATUS store_cache_seqnum( struct winbindd_domain *domain )
+{
+       TDB_DATA data, key;
+       fstring key_str;
+       char buf[8];
+       
+       if (!wcache->tdb) {
+               DEBUG(10,("store_cache_seqnum: tdb == NULL\n"));
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+               
+       fstr_sprintf( key_str, "SEQNUM/%s", domain->name );
+       key.dptr = key_str;
+       key.dsize = strlen(key_str)+1;
+       
+       SIVAL(buf, 0, domain->sequence_number);
+       SIVAL(buf, 4, domain->last_seq_check);
+       data.dptr = buf;
+       data.dsize = 8;
+       
+       if ( tdb_store( wcache->tdb, key, data, TDB_REPLACE) == -1 ) {
+               DEBUG(10,("store_cache_seqnum: tdb_store fail key [%s]\n", key_str ));
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+
+       DEBUG(10,("store_cache_seqnum: success [%s][%u @ %u]\n", 
+               domain->name, domain->sequence_number, 
+               (uint32)domain->last_seq_check));
+       
+       return NT_STATUS_OK;
+}
 
 /*
   refresh the domain sequence number. If force is True
   then always refresh it, no matter how recently we fetched it
 */
+
 static void refresh_sequence_number(struct winbindd_domain *domain, BOOL force)
 {
        NTSTATUS status;
        unsigned time_diff;
+       time_t t = time(NULL);
        unsigned cache_time = lp_winbind_cache_time();
 
+       get_cache( domain );
+
+#if 0  /* JERRY -- disable as the default cache time is now 5 minutes */
        /* trying to reconnect is expensive, don't do it too often */
        if (domain->sequence_number == DOM_SEQUENCE_NONE) {
                cache_time *= 8;
        }
+#endif
 
-       time_diff = time(NULL) - domain->last_seq_check;
+       time_diff = t - domain->last_seq_check;
 
        /* see if we have to refetch the domain sequence number */
        if (!force && (time_diff < cache_time)) {
-               return;
+               DEBUG(10, ("refresh_sequence_number: %s time ok\n", domain->name));
+               goto done;
        }
+       
+       /* try to get the sequence number from the tdb cache first */
+       /* this will update the timestamp as well */
+       
+       status = fetch_cache_seqnum( domain, t );
+       if ( NT_STATUS_IS_OK(status) )
+               goto done;      
+
+       /* important! make sure that we know if this is a native 
+          mode domain or not */
 
-       status = wcache->backend->sequence_number(domain, &domain->sequence_number);
+       status = domain->backend->sequence_number(domain, &domain->sequence_number);
 
        if (!NT_STATUS_IS_OK(status)) {
                domain->sequence_number = DOM_SEQUENCE_NONE;
        }
-
+       
+       domain->last_status = status;
        domain->last_seq_check = time(NULL);
+       
+       /* save the new sequence number ni the cache */
+       store_cache_seqnum( domain );
+
+done:
+       DEBUG(10, ("refresh_sequence_number: %s seq number is now %d\n", 
+                  domain->name, domain->sequence_number));
+
+       return;
 }
 
 /*
   decide if a cache entry has expired
 */
-static BOOL centry_expired(struct winbindd_domain *domain, struct cache_entry *centry)
+static BOOL centry_expired(struct winbindd_domain *domain, const char *keystr, struct cache_entry *centry)
 {
        /* if the server is OK and our cache entry came from when it was down then
           the entry is invalid */
        if (domain->sequence_number != DOM_SEQUENCE_NONE && 
            centry->sequence_number == DOM_SEQUENCE_NONE) {
+               DEBUG(10,("centry_expired: Key %s for domain %s invalid sequence.\n",
+                       keystr, domain->name ));
                return True;
        }
 
@@ -247,9 +407,14 @@ static BOOL centry_expired(struct winbindd_domain *domain, struct cache_entry *c
           current sequence number then it is OK */
        if (wcache_server_down(domain) || 
            centry->sequence_number == domain->sequence_number) {
+               DEBUG(10,("centry_expired: Key %s for domain %s is good.\n",
+                       keystr, domain->name ));
                return False;
        }
 
+       DEBUG(10,("centry_expired: Key %s for domain %s expired\n",
+               keystr, domain->name ));
+
        /* it's expired */
        return True;
 }
@@ -258,6 +423,9 @@ static BOOL centry_expired(struct winbindd_domain *domain, struct cache_entry *c
   fetch an entry from the cache, with a varargs key. auto-fetch the sequence
   number and return status
 */
+static struct cache_entry *wcache_fetch(struct winbind_cache *cache, 
+                                       struct winbindd_domain *domain,
+                                       const char *format, ...) PRINTF_ATTRIBUTE(3,4);
 static struct cache_entry *wcache_fetch(struct winbind_cache *cache, 
                                        struct winbindd_domain *domain,
                                        const char *format, ...)
@@ -277,38 +445,43 @@ static struct cache_entry *wcache_fetch(struct winbind_cache *cache,
        key.dptr = kstr;
        key.dsize = strlen(kstr);
        data = tdb_fetch(wcache->tdb, key);
-       free(kstr);
        if (!data.dptr) {
                /* a cache miss */
+               free(kstr);
                return NULL;
        }
 
-       centry = smb_xmalloc(sizeof(*centry));
-       centry->data = data.dptr;
+       centry = SMB_XMALLOC_P(struct cache_entry);
+       centry->data = (unsigned char *)data.dptr;
        centry->len = data.dsize;
        centry->ofs = 0;
 
        if (centry->len < 8) {
                /* huh? corrupt cache? */
+               DEBUG(10,("wcache_fetch: Corrupt cache for key %s domain %s (len < 8) ?\n",
+                       kstr, domain->name ));
                centry_free(centry);
+               free(kstr);
                return NULL;
        }
        
        centry->status = NT_STATUS(centry_uint32(centry));
        centry->sequence_number = centry_uint32(centry);
 
-       if (centry_expired(domain, centry)) {
-               extern BOOL opt_dual_daemon;
+       if (centry_expired(domain, kstr, centry)) {
 
-               if (opt_dual_daemon) {
-                       extern BOOL background_process;
-                       background_process = True;
-               } else {
-                       centry_free(centry);
-                       return NULL;
-               }
+               DEBUG(10,("wcache_fetch: entry %s expired for domain %s\n",
+                        kstr, domain->name ));
+
+               centry_free(centry);
+               free(kstr);
+               return NULL;
        }
 
+       DEBUG(10,("wcache_fetch: returning entry %s for domain %s\n",
+                kstr, domain->name ));
+
+       free(kstr);
        return centry;
 }
 
@@ -318,9 +491,10 @@ static struct cache_entry *wcache_fetch(struct winbind_cache *cache,
 static void centry_expand(struct cache_entry *centry, uint32 len)
 {
        uint8 *p;
-       if (centry->len - centry->ofs >= len) return;
+       if (centry->len - centry->ofs >= len)
+               return;
        centry->len *= 2;
-       p = realloc(centry->data, centry->len);
+       p = SMB_REALLOC(centry->data, centry->len);
        if (!p) {
                DEBUG(0,("out of memory: needed %d bytes in centry_expand\n", centry->len));
                smb_panic("out of memory in centry_expand");
@@ -363,13 +537,20 @@ static void centry_put_string(struct cache_entry *centry, const char *s)
 
        len = strlen(s);
        /* can't handle more than 254 char strings. Truncating is probably best */
-       if (len > 254) len = 254;
+       if (len > 254)
+               len = 254;
        centry_put_uint8(centry, len);
        centry_expand(centry, len);
        memcpy(centry->data + centry->ofs, s, len);
        centry->ofs += len;
 }
 
+static void centry_put_sid(struct cache_entry *centry, const DOM_SID *sid) 
+{
+       fstring sid_string;
+       centry_put_string(centry, sid_to_string(sid_string, sid));
+}
+
 /*
   start a centry for output. When finished, call centry_end()
 */
@@ -377,12 +558,13 @@ struct cache_entry *centry_start(struct winbindd_domain *domain, NTSTATUS status
 {
        struct cache_entry *centry;
 
-       if (!wcache->tdb) return NULL;
+       if (!wcache->tdb)
+               return NULL;
 
-       centry = smb_xmalloc(sizeof(*centry));
+       centry = SMB_XMALLOC_P(struct cache_entry);
 
        centry->len = 8192; /* reasonable default */
-       centry->data = smb_xmalloc(centry->len);
+       centry->data = SMB_XMALLOC_ARRAY(char, centry->len);
        centry->ofs = 0;
        centry->sequence_number = domain->sequence_number;
        centry_put_uint32(centry, NT_STATUS_V(status));
@@ -393,6 +575,7 @@ struct cache_entry *centry_start(struct winbindd_domain *domain, NTSTATUS status
 /*
   finish a centry and write it to the tdb
 */
+static void centry_end(struct cache_entry *centry, const char *format, ...) PRINTF_ATTRIBUTE(2,3);
 static void centry_end(struct cache_entry *centry, const char *format, ...)
 {
        va_list ap;
@@ -405,54 +588,50 @@ static void centry_end(struct cache_entry *centry, const char *format, ...)
 
        key.dptr = kstr;
        key.dsize = strlen(kstr);
-       data.dptr = centry->data;
+       data.dptr = (char *)centry->data;
        data.dsize = centry->ofs;
 
        tdb_store(wcache->tdb, key, data, TDB_REPLACE);
        free(kstr);
 }
 
-/* form a sid from the domain plus rid */
-static DOM_SID *form_sid(struct winbindd_domain *domain, uint32 rid)
-{
-       static DOM_SID sid;
-       sid_copy(&sid, &domain->sid);
-       sid_append_rid(&sid, rid);
-       return &sid;
-}
-
-static void wcache_save_name_to_sid(struct winbindd_domain *domain, NTSTATUS status, 
-                                   const char *name, DOM_SID *sid, enum SID_NAME_USE type)
+static void wcache_save_name_to_sid(struct winbindd_domain *domain, 
+                                   NTSTATUS status, const char *domain_name,
+                                   const char *name, const DOM_SID *sid, 
+                                   enum SID_NAME_USE type)
 {
        struct cache_entry *centry;
-       uint32 len;
        fstring uname;
 
        centry = centry_start(domain, status);
-       if (!centry) return;
-       len = sid_size(sid);
-       centry_expand(centry, len);
+       if (!centry)
+               return;
        centry_put_uint32(centry, type);
-       sid_linearize(centry->data + centry->ofs, len, sid);
-       centry->ofs += len;
+       centry_put_sid(centry, sid);
        fstrcpy(uname, name);
-       strupper(uname);
-       centry_end(centry, "NS/%s/%s", domain->name, uname);
+       strupper_m(uname);
+       centry_end(centry, "NS/%s/%s", domain_name, uname);
+       DEBUG(10,("wcache_save_name_to_sid: %s -> %s\n", uname,
+                 sid_string_static(sid)));
        centry_free(centry);
 }
 
 static void wcache_save_sid_to_name(struct winbindd_domain *domain, NTSTATUS status, 
-                                   DOM_SID *sid, const char *name, enum SID_NAME_USE type, uint32 rid)
+                                   const DOM_SID *sid, const char *domain_name, const char *name, enum SID_NAME_USE type)
 {
        struct cache_entry *centry;
+       fstring sid_string;
 
        centry = centry_start(domain, status);
-       if (!centry) return;
+       if (!centry)
+               return;
        if (NT_STATUS_IS_OK(status)) {
                centry_put_uint32(centry, type);
+               centry_put_string(centry, domain_name);
                centry_put_string(centry, name);
        }
-       centry_end(centry, "SN/%s/%d", domain->name, rid);
+       centry_end(centry, "SN/%s", sid_to_string(sid_string, sid));
+       DEBUG(10,("wcache_save_sid_to_name: %s -> %s\n", sid_string, name));
        centry_free(centry);
 }
 
@@ -460,14 +639,19 @@ static void wcache_save_sid_to_name(struct winbindd_domain *domain, NTSTATUS sta
 static void wcache_save_user(struct winbindd_domain *domain, NTSTATUS status, WINBIND_USERINFO *info)
 {
        struct cache_entry *centry;
+       fstring sid_string;
 
        centry = centry_start(domain, status);
-       if (!centry) return;
+       if (!centry)
+               return;
        centry_put_string(centry, info->acct_name);
        centry_put_string(centry, info->full_name);
-       centry_put_uint32(centry, info->user_rid);
-       centry_put_uint32(centry, info->group_rid);
-       centry_end(centry, "U/%s/%d", domain->name, info->user_rid);
+       centry_put_string(centry, info->homedir);
+       centry_put_string(centry, info->shell);
+       centry_put_sid(centry, &info->user_sid);
+       centry_put_sid(centry, &info->group_sid);
+       centry_end(centry, "U/%s", sid_to_string(sid_string, &info->user_sid));
+       DEBUG(10,("wcache_save_user: %s (acct_name %s)\n", sid_string, info->acct_name));
        centry_free(centry);
 }
 
@@ -481,28 +665,38 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain,
        struct winbind_cache *cache = get_cache(domain);
        struct cache_entry *centry = NULL;
        NTSTATUS status;
-       int i;
+       unsigned int i, retry;
 
-       if (!cache->tdb) goto do_query;
+       if (!cache->tdb)
+               goto do_query;
 
        centry = wcache_fetch(cache, domain, "UL/%s", domain->name);
-       if (!centry) goto do_query;
+       if (!centry)
+               goto do_query;
 
        *num_entries = centry_uint32(centry);
        
-       if (*num_entries == 0) goto do_cached;
+       if (*num_entries == 0)
+               goto do_cached;
 
-       (*info) = talloc(mem_ctx, sizeof(**info) * (*num_entries));
-       if (! (*info)) smb_panic("query_user_list out of memory");
+       (*info) = TALLOC_ARRAY(mem_ctx, WINBIND_USERINFO, *num_entries);
+       if (! (*info))
+               smb_panic("query_user_list out of memory");
        for (i=0; i<(*num_entries); i++) {
                (*info)[i].acct_name = centry_string(centry, mem_ctx);
                (*info)[i].full_name = centry_string(centry, mem_ctx);
-               (*info)[i].user_rid = centry_uint32(centry);
-               (*info)[i].group_rid = centry_uint32(centry);
+               (*info)[i].homedir = centry_string(centry, mem_ctx);
+               (*info)[i].shell = centry_string(centry, mem_ctx);
+               centry_sid(centry, &(*info)[i].user_sid);
+               centry_sid(centry, &(*info)[i].group_sid);
        }
 
 do_cached:     
        status = centry->status;
+
+       DEBUG(10,("query_user_list: [Cached] - cached list for domain %s status %s\n",
+               domain->name, get_friendly_nt_error_msg(status) ));
+
        centry_free(centry);
        return status;
 
@@ -510,32 +704,63 @@ do_query:
        *num_entries = 0;
        *info = NULL;
 
-       if (wcache_server_down(domain)) {
-               return NT_STATUS_SERVER_DISABLED;
-       }
+       /* Return status value returned by seq number check */
+
+       if (!NT_STATUS_IS_OK(domain->last_status))
+               return domain->last_status;
+
+       /* Put the query_user_list() in a retry loop.  There appears to be
+        * some bug either with Windows 2000 or Samba's handling of large
+        * rpc replies.  This manifests itself as sudden disconnection
+        * at a random point in the enumeration of a large (60k) user list.
+        * The retry loop simply tries the operation again. )-:  It's not
+        * pretty but an acceptable workaround until we work out what the
+        * real problem is. */
+
+       retry = 0;
+       do {
+
+               DEBUG(10,("query_user_list: [Cached] - doing backend query for list for domain %s\n",
+                       domain->name ));
 
-       status = cache->backend->query_user_list(domain, mem_ctx, num_entries, info);
+               status = domain->backend->query_user_list(domain, mem_ctx, num_entries, info);
+               if (!NT_STATUS_IS_OK(status))
+                       DEBUG(3, ("query_user_list: returned 0x%08x, "
+                                 "retrying\n", NT_STATUS_V(status)));
+                       if (NT_STATUS_EQUAL(status, NT_STATUS_UNSUCCESSFUL)) {
+                               DEBUG(3, ("query_user_list: flushing "
+                                         "connection cache\n"));
+                               invalidate_cm_connection(&domain->conn);
+                       }
+
+       } while (NT_STATUS_V(status) == NT_STATUS_V(NT_STATUS_UNSUCCESSFUL) && 
+                (retry++ < 5));
 
        /* and save it */
-       refresh_sequence_number(domain, True);
+       refresh_sequence_number(domain, False);
        centry = centry_start(domain, status);
-       if (!centry) goto skip_save;
+       if (!centry)
+               goto skip_save;
        centry_put_uint32(centry, *num_entries);
        for (i=0; i<(*num_entries); i++) {
                centry_put_string(centry, (*info)[i].acct_name);
                centry_put_string(centry, (*info)[i].full_name);
-               centry_put_uint32(centry, (*info)[i].user_rid);
-               centry_put_uint32(centry, (*info)[i].group_rid);
-               if (cache->backend->consistent) {
+               centry_put_string(centry, (*info)[i].homedir);
+               centry_put_string(centry, (*info)[i].shell);
+               centry_put_sid(centry, &(*info)[i].user_sid);
+               centry_put_sid(centry, &(*info)[i].group_sid);
+               if (domain->backend->consistent) {
                        /* when the backend is consistent we can pre-prime some mappings */
                        wcache_save_name_to_sid(domain, NT_STATUS_OK, 
+                                               domain->name,
                                                (*info)[i].acct_name, 
-                                               form_sid(domain, (*info)[i].user_rid),
+                                               &(*info)[i].user_sid,
                                                SID_NAME_USER);
                        wcache_save_sid_to_name(domain, NT_STATUS_OK, 
-                                               form_sid(domain, (*info)[i].user_rid),
+                                               &(*info)[i].user_sid,
+                                               domain->name,
                                                (*info)[i].acct_name, 
-                                               SID_NAME_USER, (*info)[i].user_rid);
+                                               SID_NAME_USER);
                        wcache_save_user(domain, NT_STATUS_OK, &(*info)[i]);
                }
        }       
@@ -555,19 +780,23 @@ static NTSTATUS enum_dom_groups(struct winbindd_domain *domain,
        struct winbind_cache *cache = get_cache(domain);
        struct cache_entry *centry = NULL;
        NTSTATUS status;
-       int i;
+       unsigned int i;
 
-       if (!cache->tdb) goto do_query;
+       if (!cache->tdb)
+               goto do_query;
 
        centry = wcache_fetch(cache, domain, "GL/%s/domain", domain->name);
-       if (!centry) goto do_query;
+       if (!centry)
+               goto do_query;
 
        *num_entries = centry_uint32(centry);
        
-       if (*num_entries == 0) goto do_cached;
+       if (*num_entries == 0)
+               goto do_cached;
 
-       (*info) = talloc(mem_ctx, sizeof(**info) * (*num_entries));
-       if (! (*info)) smb_panic("enum_dom_groups out of memory");
+       (*info) = TALLOC_ARRAY(mem_ctx, struct acct_info, *num_entries);
+       if (! (*info))
+               smb_panic("enum_dom_groups out of memory");
        for (i=0; i<(*num_entries); i++) {
                fstrcpy((*info)[i].acct_name, centry_string(centry, mem_ctx));
                fstrcpy((*info)[i].acct_desc, centry_string(centry, mem_ctx));
@@ -576,6 +805,10 @@ static NTSTATUS enum_dom_groups(struct winbindd_domain *domain,
 
 do_cached:     
        status = centry->status;
+
+       DEBUG(10,("enum_dom_groups: [Cached] - cached list for domain %s status %s\n",
+               domain->name, get_friendly_nt_error_msg(status) ));
+
        centry_free(centry);
        return status;
 
@@ -583,16 +816,21 @@ do_query:
        *num_entries = 0;
        *info = NULL;
 
-       if (wcache_server_down(domain)) {
-               return NT_STATUS_SERVER_DISABLED;
-       }
+       /* Return status value returned by seq number check */
+
+       if (!NT_STATUS_IS_OK(domain->last_status))
+               return domain->last_status;
+
+       DEBUG(10,("enum_dom_groups: [Cached] - doing backend query for list for domain %s\n",
+               domain->name ));
 
-       status = cache->backend->enum_dom_groups(domain, mem_ctx, num_entries, info);
+       status = domain->backend->enum_dom_groups(domain, mem_ctx, num_entries, info);
 
        /* and save it */
-       refresh_sequence_number(domain, True);
+       refresh_sequence_number(domain, False);
        centry = centry_start(domain, status);
-       if (!centry) goto skip_save;
+       if (!centry)
+               goto skip_save;
        centry_put_uint32(centry, *num_entries);
        for (i=0; i<(*num_entries); i++) {
                centry_put_string(centry, (*info)[i].acct_name);
@@ -615,19 +853,23 @@ static NTSTATUS enum_local_groups(struct winbindd_domain *domain,
        struct winbind_cache *cache = get_cache(domain);
        struct cache_entry *centry = NULL;
        NTSTATUS status;
-       int i;
+       unsigned int i;
 
-       if (!cache->tdb) goto do_query;
+       if (!cache->tdb)
+               goto do_query;
 
        centry = wcache_fetch(cache, domain, "GL/%s/local", domain->name);
-       if (!centry) goto do_query;
+       if (!centry)
+               goto do_query;
 
        *num_entries = centry_uint32(centry);
        
-       if (*num_entries == 0) goto do_cached;
+       if (*num_entries == 0)
+               goto do_cached;
 
-       (*info) = talloc(mem_ctx, sizeof(**info) * (*num_entries));
-       if (! (*info)) smb_panic("enum_dom_groups out of memory");
+       (*info) = TALLOC_ARRAY(mem_ctx, struct acct_info, *num_entries);
+       if (! (*info))
+               smb_panic("enum_dom_groups out of memory");
        for (i=0; i<(*num_entries); i++) {
                fstrcpy((*info)[i].acct_name, centry_string(centry, mem_ctx));
                fstrcpy((*info)[i].acct_desc, centry_string(centry, mem_ctx));
@@ -642,11 +884,14 @@ do_cached:
           indicate this. */
 
        if (wcache_server_down(domain)) {
-               DEBUG(10, ("query_user_list: returning cached user list and server was down\n"));
+               DEBUG(10, ("enum_local_groups: returning cached user list and server was down\n"));
                status = NT_STATUS_MORE_PROCESSING_REQUIRED;
        } else
                status = centry->status;
 
+       DEBUG(10,("enum_local_groups: [Cached] - cached list for domain %s status %s\n",
+               domain->name, get_friendly_nt_error_msg(status) ));
+
        centry_free(centry);
        return status;
 
@@ -654,22 +899,27 @@ do_query:
        *num_entries = 0;
        *info = NULL;
 
-       if (wcache_server_down(domain)) {
-               return NT_STATUS_SERVER_DISABLED;
-       }
+       /* Return status value returned by seq number check */
+
+       if (!NT_STATUS_IS_OK(domain->last_status))
+               return domain->last_status;
+
+       DEBUG(10,("enum_local_groups: [Cached] - doing backend query for list for domain %s\n",
+               domain->name ));
 
-       status = cache->backend->enum_local_groups(domain, mem_ctx, num_entries, info);
+       status = domain->backend->enum_local_groups(domain, mem_ctx, num_entries, info);
 
        /* and save it */
-       refresh_sequence_number(domain, True);
+       refresh_sequence_number(domain, False);
        centry = centry_start(domain, status);
-       if (!centry) goto skip_save;
+       if (!centry)
+               goto skip_save;
        centry_put_uint32(centry, *num_entries);
        for (i=0; i<(*num_entries); i++) {
                centry_put_string(centry, (*info)[i].acct_name);
                centry_put_string(centry, (*info)[i].acct_desc);
                centry_put_uint32(centry, (*info)[i].rid);
-       }       
+       }
        centry_end(centry, "GL/%s/local", domain->name);
        centry_free(centry);
 
@@ -679,6 +929,8 @@ skip_save:
 
 /* convert a single name to a sid in a domain */
 static NTSTATUS name_to_sid(struct winbindd_domain *domain,
+                           TALLOC_CTX *mem_ctx,
+                           const char *domain_name,
                            const char *name,
                            DOM_SID *sid,
                            enum SID_NAME_USE *type)
@@ -688,29 +940,45 @@ static NTSTATUS name_to_sid(struct winbindd_domain *domain,
        NTSTATUS status;
        fstring uname;
 
-       if (!cache->tdb) goto do_query;
+       if (!cache->tdb)
+               goto do_query;
 
        fstrcpy(uname, name);
-       strupper(uname);
-       centry = wcache_fetch(cache, domain, "NS/%s/%s", domain->name, uname);
-       if (!centry) goto do_query;
-       *type = centry_uint32(centry);
-       sid_parse(centry->data + centry->ofs, centry->len - centry->ofs, sid);
-
+       strupper_m(uname);
+       centry = wcache_fetch(cache, domain, "NS/%s/%s", domain_name, uname);
+       if (!centry)
+               goto do_query;
+       *type = (enum SID_NAME_USE)centry_uint32(centry);
+       centry_sid(centry, sid);
        status = centry->status;
+
+       DEBUG(10,("name_to_sid: [Cached] - cached name for domain %s status %s\n",
+               domain->name, get_friendly_nt_error_msg(status) ));
+
        centry_free(centry);
        return status;
 
 do_query:
        ZERO_STRUCTP(sid);
 
-       if (wcache_server_down(domain)) {
-               return NT_STATUS_SERVER_DISABLED;
-       }
-       status = cache->backend->name_to_sid(domain, name, sid, type);
+       /* If the seq number check indicated that there is a problem
+        * with this DC, then return that status... except for
+        * access_denied.  This is special because the dc may be in
+        * "restrict anonymous = 1" mode, in which case it will deny
+        * most unauthenticated operations, but *will* allow the LSA
+        * name-to-sid that we try as a fallback. */
+
+       if (!(NT_STATUS_IS_OK(domain->last_status)
+             || NT_STATUS_EQUAL(domain->last_status, NT_STATUS_ACCESS_DENIED)))
+               return domain->last_status;
+
+       DEBUG(10,("name_to_sid: [Cached] - doing backend query for name for domain %s\n",
+               domain->name ));
+
+       status = domain->backend->name_to_sid(domain, mem_ctx, domain_name, name, sid, type);
 
        /* and save it */
-       wcache_save_name_to_sid(domain, status, name, sid, *type);
+       wcache_save_name_to_sid(domain, status, domain_name, name, sid, *type);
 
        /* We can't save the sid to name mapping as we don't know the
           correct case of the name without looking it up */
@@ -722,81 +990,112 @@ do_query:
    given */
 static NTSTATUS sid_to_name(struct winbindd_domain *domain,
                            TALLOC_CTX *mem_ctx,
-                           DOM_SID *sid,
+                           const DOM_SID *sid,
+                           char **domain_name,
                            char **name,
                            enum SID_NAME_USE *type)
 {
        struct winbind_cache *cache = get_cache(domain);
        struct cache_entry *centry = NULL;
        NTSTATUS status;
-       uint32 rid = 0;
-
-       if (!sid_peek_check_rid(&domain->sid, sid, &rid))
-               return NT_STATUS_INVALID_PARAMETER;
+       fstring sid_string;
 
-       if (!cache->tdb) goto do_query;
+       if (!cache->tdb)
+               goto do_query;
 
-       centry = wcache_fetch(cache, domain, "SN/%s/%d", domain->name, rid);
-       if (!centry) goto do_query;
+       centry = wcache_fetch(cache, domain, "SN/%s", sid_to_string(sid_string, sid));
+       if (!centry)
+               goto do_query;
        if (NT_STATUS_IS_OK(centry->status)) {
-               *type = centry_uint32(centry);
+               *type = (enum SID_NAME_USE)centry_uint32(centry);
+               *domain_name = centry_string(centry, mem_ctx);
                *name = centry_string(centry, mem_ctx);
        }
        status = centry->status;
+
+       DEBUG(10,("sid_to_name: [Cached] - cached name for domain %s status %s\n",
+               domain->name, get_friendly_nt_error_msg(status) ));
+
        centry_free(centry);
        return status;
 
 do_query:
        *name = NULL;
+       *domain_name = NULL;
 
-       if (wcache_server_down(domain)) {
-               return NT_STATUS_SERVER_DISABLED;
-       }
-       status = cache->backend->sid_to_name(domain, mem_ctx, sid, name, type);
+       /* If the seq number check indicated that there is a problem
+        * with this DC, then return that status... except for
+        * access_denied.  This is special because the dc may be in
+        * "restrict anonymous = 1" mode, in which case it will deny
+        * most unauthenticated operations, but *will* allow the LSA
+        * sid-to-name that we try as a fallback. */
+
+       if (!(NT_STATUS_IS_OK(domain->last_status)
+             || NT_STATUS_EQUAL(domain->last_status, NT_STATUS_ACCESS_DENIED)))
+               return domain->last_status;
+
+       DEBUG(10,("sid_to_name: [Cached] - doing backend query for name for domain %s\n",
+               domain->name ));
+
+       status = domain->backend->sid_to_name(domain, mem_ctx, sid, domain_name, name, type);
 
        /* and save it */
-       refresh_sequence_number(domain, True);
-       wcache_save_sid_to_name(domain, status, sid, *name, *type, rid);
-       wcache_save_name_to_sid(domain, status, *name, sid, *type);
+       refresh_sequence_number(domain, False);
+       wcache_save_sid_to_name(domain, status, sid, *domain_name, *name, *type);
+
+       /* We can't save the name to sid mapping here, as with sid history a
+        * later name2sid would give the wrong sid. */
 
        return status;
 }
 
-
 /* Lookup user information from a rid */
 static NTSTATUS query_user(struct winbindd_domain *domain, 
                           TALLOC_CTX *mem_ctx, 
-                          uint32 user_rid, 
+                          const DOM_SID *user_sid, 
                           WINBIND_USERINFO *info)
 {
        struct winbind_cache *cache = get_cache(domain);
        struct cache_entry *centry = NULL;
        NTSTATUS status;
 
-       if (!cache->tdb) goto do_query;
+       if (!cache->tdb)
+               goto do_query;
 
-       centry = wcache_fetch(cache, domain, "U/%s/%d", domain->name, user_rid);
-       if (!centry) goto do_query;
+       centry = wcache_fetch(cache, domain, "U/%s", sid_string_static(user_sid));
+       
+       if (!centry)
+               goto do_query;
 
        info->acct_name = centry_string(centry, mem_ctx);
        info->full_name = centry_string(centry, mem_ctx);
-       info->user_rid = centry_uint32(centry);
-       info->group_rid = centry_uint32(centry);
+       info->homedir = centry_string(centry, mem_ctx);
+       info->shell = centry_string(centry, mem_ctx);
+       centry_sid(centry, &info->user_sid);
+       centry_sid(centry, &info->group_sid);
        status = centry->status;
+
+       DEBUG(10,("query_user: [Cached] - cached info for domain %s status %s\n",
+               domain->name, get_friendly_nt_error_msg(status) ));
+
        centry_free(centry);
        return status;
 
 do_query:
        ZERO_STRUCTP(info);
 
-       if (wcache_server_down(domain)) {
-               return NT_STATUS_SERVER_DISABLED;
-       }
+       /* Return status value returned by seq number check */
+
+       if (!NT_STATUS_IS_OK(domain->last_status))
+               return domain->last_status;
        
-       status = cache->backend->query_user(domain, mem_ctx, user_rid, info);
+       DEBUG(10,("sid_to_name: [Cached] - doing backend query for info for domain %s\n",
+               domain->name ));
+
+       status = domain->backend->query_user(domain, mem_ctx, user_sid, info);
 
        /* and save it */
-       refresh_sequence_number(domain, True);
+       refresh_sequence_number(domain, False);
        wcache_save_user(domain, status, info);
 
        return status;
@@ -806,31 +1105,41 @@ do_query:
 /* Lookup groups a user is a member of. */
 static NTSTATUS lookup_usergroups(struct winbindd_domain *domain,
                                  TALLOC_CTX *mem_ctx,
-                                 uint32 user_rid, 
-                                 uint32 *num_groups, uint32 **user_gids)
+                                 const DOM_SID *user_sid, 
+                                 uint32 *num_groups, DOM_SID **user_gids)
 {
        struct winbind_cache *cache = get_cache(domain);
        struct cache_entry *centry = NULL;
        NTSTATUS status;
-       int i;
+       unsigned int i;
+       fstring sid_string;
 
-       if (!cache->tdb) goto do_query;
+       if (!cache->tdb)
+               goto do_query;
 
-       centry = wcache_fetch(cache, domain, "UG/%s/%d", domain->name, user_rid);
-       if (!centry) goto do_query;
+       centry = wcache_fetch(cache, domain, "UG/%s", sid_to_string(sid_string, user_sid));
+       
+       if (!centry)
+               goto do_query;
 
        *num_groups = centry_uint32(centry);
        
-       if (*num_groups == 0) goto do_cached;
+       if (*num_groups == 0)
+               goto do_cached;
 
-       (*user_gids) = talloc(mem_ctx, sizeof(**user_gids) * (*num_groups));
-       if (! (*user_gids)) smb_panic("lookup_usergroups out of memory");
+       (*user_gids) = TALLOC_ARRAY(mem_ctx, DOM_SID, *num_groups);
+       if (! (*user_gids))
+               smb_panic("lookup_usergroups out of memory");
        for (i=0; i<(*num_groups); i++) {
-               (*user_gids)[i] = centry_uint32(centry);
+               centry_sid(centry, &(*user_gids)[i]);
        }
 
 do_cached:     
        status = centry->status;
+
+       DEBUG(10,("lookup_usergroups: [Cached] - cached info for domain %s status %s\n",
+               domain->name, get_friendly_nt_error_msg(status) ));
+
        centry_free(centry);
        return status;
 
@@ -838,90 +1147,193 @@ do_query:
        (*num_groups) = 0;
        (*user_gids) = NULL;
 
-       if (wcache_server_down(domain)) {
-               return NT_STATUS_SERVER_DISABLED;
-       }
-       status = cache->backend->lookup_usergroups(domain, mem_ctx, user_rid, num_groups, user_gids);
+       /* Return status value returned by seq number check */
+
+       if (!NT_STATUS_IS_OK(domain->last_status))
+               return domain->last_status;
+
+       DEBUG(10,("lookup_usergroups: [Cached] - doing backend query for info for domain %s\n",
+               domain->name ));
+
+       status = domain->backend->lookup_usergroups(domain, mem_ctx, user_sid, num_groups, user_gids);
 
        /* and save it */
-       refresh_sequence_number(domain, True);
+       refresh_sequence_number(domain, False);
        centry = centry_start(domain, status);
-       if (!centry) goto skip_save;
+       if (!centry)
+               goto skip_save;
        centry_put_uint32(centry, *num_groups);
        for (i=0; i<(*num_groups); i++) {
-               centry_put_uint32(centry, (*user_gids)[i]);
+               centry_put_sid(centry, &(*user_gids)[i]);
        }       
-       centry_end(centry, "UG/%s/%d", domain->name, user_rid);
+       centry_end(centry, "UG/%s", sid_to_string(sid_string, user_sid));
        centry_free(centry);
 
 skip_save:
        return status;
 }
 
+static NTSTATUS lookup_useraliases(struct winbindd_domain *domain,
+                                  TALLOC_CTX *mem_ctx,
+                                  uint32 num_sids, const DOM_SID *sids,
+                                  uint32 *num_aliases, uint32 **alias_rids)
+{
+       struct winbind_cache *cache = get_cache(domain);
+       struct cache_entry *centry = NULL;
+       NTSTATUS status;
+       char *sidlist = talloc_strdup(mem_ctx, "");
+       int i;
+
+       if (!cache->tdb)
+               goto do_query;
+
+       if (num_sids == 0) {
+               *num_aliases = 0;
+               *alias_rids = NULL;
+               return NT_STATUS_OK;
+       }
+
+       /* We need to cache indexed by the whole list of SIDs, the aliases
+        * resulting might come from any of the SIDs. */
+
+       for (i=0; i<num_sids; i++) {
+               sidlist = talloc_asprintf(mem_ctx, "%s/%s", sidlist,
+                                         sid_string_static(&sids[i]));
+               if (sidlist == NULL)
+                       return NT_STATUS_NO_MEMORY;
+       }
+
+       centry = wcache_fetch(cache, domain, "UA%s", sidlist);
+
+       if (!centry)
+               goto do_query;
+
+       *num_aliases = centry_uint32(centry);
+       *alias_rids = NULL;
+
+       (*alias_rids) = TALLOC_ARRAY(mem_ctx, uint32, *num_aliases);
+
+       if ((*num_aliases != 0) && ((*alias_rids) == NULL))
+               return NT_STATUS_NO_MEMORY;
+
+       for (i=0; i<(*num_aliases); i++)
+               (*alias_rids)[i] = centry_uint32(centry);
+
+       status = centry->status;
+
+       DEBUG(10,("lookup_useraliases: [Cached] - cached info for domain %s "
+                 "status %s\n", domain->name,
+                 get_friendly_nt_error_msg(status)));
+
+       centry_free(centry);
+       return status;
+
+ do_query:
+       (*num_aliases) = 0;
+       (*alias_rids) = NULL;
+
+       if (!NT_STATUS_IS_OK(domain->last_status))
+               return domain->last_status;
+
+       DEBUG(10,("lookup_usergroups: [Cached] - doing backend query for info "
+                 "for domain %s\n", domain->name ));
+
+       status = domain->backend->lookup_useraliases(domain, mem_ctx,
+                                                    num_sids, sids,
+                                                    num_aliases, alias_rids);
+
+       /* and save it */
+       refresh_sequence_number(domain, False);
+       centry = centry_start(domain, status);
+       if (!centry)
+               goto skip_save;
+       centry_put_uint32(centry, *num_aliases);
+       for (i=0; i<(*num_aliases); i++)
+               centry_put_uint32(centry, (*alias_rids)[i]);
+       centry_end(centry, "UA%s", sidlist);
+       centry_free(centry);
+
+ skip_save:
+       return status;
+}
+
 
 static NTSTATUS lookup_groupmem(struct winbindd_domain *domain,
                                TALLOC_CTX *mem_ctx,
-                               uint32 group_rid, uint32 *num_names, 
-                               uint32 **rid_mem, char ***names, 
+                               const DOM_SID *group_sid, uint32 *num_names, 
+                               DOM_SID **sid_mem, char ***names, 
                                uint32 **name_types)
 {
        struct winbind_cache *cache = get_cache(domain);
        struct cache_entry *centry = NULL;
        NTSTATUS status;
-       int i;
+       unsigned int i;
+       fstring sid_string;
 
-       if (!cache->tdb) goto do_query;
+       if (!cache->tdb)
+               goto do_query;
 
-       centry = wcache_fetch(cache, domain, "GM/%s/%d", domain->name, group_rid);
-       if (!centry) goto do_query;
+       centry = wcache_fetch(cache, domain, "GM/%s", sid_to_string(sid_string, group_sid));
+       if (!centry)
+               goto do_query;
 
        *num_names = centry_uint32(centry);
        
-       if (*num_names == 0) goto do_cached;
+       if (*num_names == 0)
+               goto do_cached;
 
-       (*rid_mem) = talloc(mem_ctx, sizeof(**rid_mem) * (*num_names));
-       (*names) = talloc(mem_ctx, sizeof(**names) * (*num_names));
-       (*name_types) = talloc(mem_ctx, sizeof(**name_types) * (*num_names));
+       (*sid_mem) = TALLOC_ARRAY(mem_ctx, DOM_SID, *num_names);
+       (*names) = TALLOC_ARRAY(mem_ctx, char *, *num_names);
+       (*name_types) = TALLOC_ARRAY(mem_ctx, uint32, *num_names);
 
-       if (! (*rid_mem) || ! (*names) || ! (*name_types)) {
+       if (! (*sid_mem) || ! (*names) || ! (*name_types)) {
                smb_panic("lookup_groupmem out of memory");
        }
 
        for (i=0; i<(*num_names); i++) {
-               (*rid_mem)[i] = centry_uint32(centry);
+               centry_sid(centry, &(*sid_mem)[i]);
                (*names)[i] = centry_string(centry, mem_ctx);
                (*name_types)[i] = centry_uint32(centry);
        }
 
 do_cached:     
        status = centry->status;
+
+       DEBUG(10,("lookup_groupmem: [Cached] - cached info for domain %s status %s\n",
+               domain->name, get_friendly_nt_error_msg(status) ));
+
        centry_free(centry);
        return status;
 
 do_query:
        (*num_names) = 0;
-       (*rid_mem) = NULL;
+       (*sid_mem) = NULL;
        (*names) = NULL;
        (*name_types) = NULL;
        
+       /* Return status value returned by seq number check */
 
-       if (wcache_server_down(domain)) {
-               return NT_STATUS_SERVER_DISABLED;
-       }
-       status = cache->backend->lookup_groupmem(domain, mem_ctx, group_rid, num_names, 
-                                                rid_mem, names, name_types);
+       if (!NT_STATUS_IS_OK(domain->last_status))
+               return domain->last_status;
+
+       DEBUG(10,("lookup_groupmem: [Cached] - doing backend query for info for domain %s\n",
+               domain->name ));
+
+       status = domain->backend->lookup_groupmem(domain, mem_ctx, group_sid, num_names, 
+                                                 sid_mem, names, name_types);
 
        /* and save it */
-       refresh_sequence_number(domain, True);
+       refresh_sequence_number(domain, False);
        centry = centry_start(domain, status);
-       if (!centry) goto skip_save;
+       if (!centry)
+               goto skip_save;
        centry_put_uint32(centry, *num_names);
        for (i=0; i<(*num_names); i++) {
-               centry_put_uint32(centry, (*rid_mem)[i]);
+               centry_put_sid(centry, &(*sid_mem)[i]);
                centry_put_string(centry, (*names)[i]);
                centry_put_uint32(centry, (*name_types)[i]);
        }       
-       centry_end(centry, "GM/%s/%d", domain->name, group_rid);
+       centry_end(centry, "GM/%s", sid_to_string(sid_string, group_sid));
        centry_free(centry);
 
 skip_save:
@@ -946,29 +1358,52 @@ static NTSTATUS trusted_domains(struct winbindd_domain *domain,
                                char ***alt_names,
                                DOM_SID **dom_sids)
 {
-       struct winbind_cache *cache = get_cache(domain);
+       get_cache(domain);
+
+       DEBUG(10,("trusted_domains: [Cached] - doing backend query for info for domain %s\n",
+               domain->name ));
 
        /* we don't cache this call */
-       return cache->backend->trusted_domains(domain, mem_ctx, num_domains, 
+       return domain->backend->trusted_domains(domain, mem_ctx, num_domains, 
                                               names, alt_names, dom_sids);
 }
 
-/* find the domain sid */
-static NTSTATUS domain_sid(struct winbindd_domain *domain, DOM_SID *sid)
+/* find the alternate names for the domain, if any */
+static NTSTATUS alternate_name(struct winbindd_domain *domain)
 {
-       struct winbind_cache *cache = get_cache(domain);
+       get_cache(domain);
+
+       DEBUG(10,("alternate_name: [Cached] - doing backend query for info for domain %s\n",
+               domain->name ));
 
        /* we don't cache this call */
-       return cache->backend->domain_sid(domain, sid);
+       return domain->backend->alternate_name(domain);
 }
 
-/* find the alternate names for the domain, if any */
-static NTSTATUS alternate_name(struct winbindd_domain *domain)
+/* Invalidate cached user and group lists coherently */
+
+static int traverse_fn(TDB_CONTEXT *the_tdb, TDB_DATA kbuf, TDB_DATA dbuf, 
+                      void *state)
 {
-       struct winbind_cache *cache = get_cache(domain);
+       if (strncmp(kbuf.dptr, "UL/", 3) == 0 ||
+           strncmp(kbuf.dptr, "GL/", 3) == 0)
+               tdb_delete(the_tdb, kbuf);
 
-       /* we don't cache this call */
-       return cache->backend->alternate_name(domain);
+       return 0;
+}
+
+void wcache_invalidate_cache(void)
+{
+       struct winbindd_domain *domain;
+
+       for (domain = domain_list(); domain; domain = domain->next) {
+               struct winbind_cache *cache = get_cache(domain);
+
+               DEBUG(10, ("wcache_invalidate_cache: invalidating cache "
+                          "entries for %s\n", domain->name));
+               if (cache)
+                       tdb_traverse(cache->tdb, traverse_fn, NULL);
+       }
 }
 
 /* the ADS backend methods are exposed via this structure */
@@ -981,9 +1416,166 @@ struct winbindd_methods cache_methods = {
        sid_to_name,
        query_user,
        lookup_usergroups,
+       lookup_useraliases,
        lookup_groupmem,
        sequence_number,
        trusted_domains,
-       domain_sid,
        alternate_name
 };
+
+static BOOL init_wcache(void)
+{
+       if (wcache == NULL) {
+               wcache = SMB_XMALLOC_P(struct winbind_cache);
+               ZERO_STRUCTP(wcache);
+       }
+
+       if (wcache->tdb != NULL)
+               return True;
+
+       wcache->tdb = tdb_open_log(lock_path("winbindd_cache.tdb"), 5000, 
+                                  TDB_CLEAR_IF_FIRST, O_RDWR|O_CREAT, 0600);
+
+       if (wcache->tdb == NULL) {
+               DEBUG(0,("Failed to open winbindd_cache.tdb!\n"));
+               return False;
+       }
+
+       return True;
+}
+
+void cache_store_response(pid_t pid, struct winbindd_response *response)
+{
+       fstring key_str;
+
+       if (!init_wcache())
+               return;
+
+       DEBUG(10, ("Storing response for pid %d, len %d\n",
+                  pid, response->length));
+
+       fstr_sprintf(key_str, "DR/%d", pid);
+       if (tdb_store(wcache->tdb, string_tdb_data(key_str), 
+                     make_tdb_data((void *)response, sizeof(*response)),
+                     TDB_REPLACE) == -1)
+               return;
+
+       if (response->length == sizeof(*response))
+               return;
+
+       /* There's extra data */
+
+       DEBUG(10, ("Storing extra data: len=%d\n",
+                  (int)(response->length - sizeof(*response))));
+
+       fstr_sprintf(key_str, "DE/%d", pid);
+       if (tdb_store(wcache->tdb, string_tdb_data(key_str),
+                     make_tdb_data(response->extra_data,
+                                   response->length - sizeof(*response)),
+                     TDB_REPLACE) == 0)
+               return;
+
+       /* We could not store the extra data, make sure the tdb does not
+        * contain a main record with wrong dangling extra data */
+
+       fstr_sprintf(key_str, "DR/%d", pid);
+       tdb_delete(wcache->tdb, string_tdb_data(key_str));
+
+       return;
+}
+
+BOOL cache_retrieve_response(pid_t pid, struct winbindd_response * response)
+{
+       TDB_DATA data;
+       fstring key_str;
+
+       if (!init_wcache())
+               return False;
+
+       DEBUG(10, ("Retrieving response for pid %d\n", pid));
+
+       fstr_sprintf(key_str, "DR/%d", pid);
+       data = tdb_fetch(wcache->tdb, string_tdb_data(key_str));
+
+       if (data.dptr == NULL)
+               return False;
+
+       if (data.dsize != sizeof(*response))
+               return False;
+
+       memcpy(response, data.dptr, data.dsize);
+       SAFE_FREE(data.dptr);
+
+       if (response->length == sizeof(*response)) {
+               response->extra_data = NULL;
+               return True;
+       }
+
+       /* There's extra data */
+
+       DEBUG(10, ("Retrieving extra data length=%d\n",
+                  (int)(response->length - sizeof(*response))));
+
+       fstr_sprintf(key_str, "DE/%d", pid);
+       data = tdb_fetch(wcache->tdb, string_tdb_data(key_str));
+
+       if (data.dptr == NULL) {
+               DEBUG(0, ("Did not find extra data\n"));
+               return False;
+       }
+
+       if (data.dsize != (response->length - sizeof(*response))) {
+               DEBUG(0, ("Invalid extra data length: %d\n", (int)data.dsize));
+               SAFE_FREE(data.dptr);
+               return False;
+       }
+
+       dump_data(11, data.dptr, data.dsize);
+
+       response->extra_data = data.dptr;
+       return True;
+}
+
+BOOL lookup_cached_sid(TALLOC_CTX *mem_ctx, const DOM_SID *sid,
+                      const char **domain_name, const char **name,
+                      enum SID_NAME_USE *type)
+{
+       struct winbindd_domain *domain;
+       struct winbind_cache *cache;
+       struct cache_entry *centry = NULL;
+       NTSTATUS status;
+
+       domain = find_lookup_domain_from_sid(sid);
+       if (domain == NULL) {
+               return False;
+       }
+
+       cache = get_cache(domain);
+
+       if (cache->tdb == NULL) {
+               return False;
+       }
+
+       centry = wcache_fetch(cache, domain, "SN/%s", sid_string_static(sid));
+       if (centry == NULL) {
+               return False;
+       }
+
+       if (NT_STATUS_IS_OK(centry->status)) {
+               *type = (enum SID_NAME_USE)centry_uint32(centry);
+               *domain_name = centry_string(centry, mem_ctx);
+               *name = centry_string(centry, mem_ctx);
+       }
+
+       status = centry->status;
+       centry_free(centry);
+       return NT_STATUS_IS_OK(status);
+}
+
+void cache_sid2name(struct winbindd_domain *domain, const DOM_SID *sid,
+                   const char *domain_name, const char *name,
+                   enum SID_NAME_USE type)
+{
+       wcache_save_sid_to_name(domain, NT_STATUS_OK, sid, domain_name,
+                               name, type);
+}