diff options
| author | James Peach <jpeach@samba.org> | 2007-12-22 14:01:44 -0800 |
|---|---|---|
| committer | James Peach <jpeach@samba.org> | 2007-12-22 14:01:44 -0800 |
| commit | bf2269a04e5af056037c392fb7f29014b62d1bb2 (patch) | |
| tree | 38a2c68c2835bb65725003dd479a3a6fdbee1a51 /source3/include | |
| parent | 1176e04c76e28d9ee9ab355c5e9edcd1b627ac03 (diff) | |
| parent | a000fa4ee5491ae32c60881b28b3536e88e82e27 (diff) | |
| download | samba-bf2269a04e5af056037c392fb7f29014b62d1bb2.tar.gz samba-bf2269a04e5af056037c392fb7f29014b62d1bb2.tar.bz2 samba-bf2269a04e5af056037c392fb7f29014b62d1bb2.zip | |
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
(This used to be commit 30cb2d215f1a4a440d5ecaab3f898daa714eee2b)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/includes.h | 1 | ||||
| -rw-r--r-- | source3/include/memcache.h | 13 |
2 files changed, 12 insertions, 2 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index fdeff346e5..14ef2258e6 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -784,6 +784,7 @@ enum flush_reason_enum { NUM_FLUSH_REASONS}; #include "nss_info.h" +#include "nsswitch/libwbclient/wbclient.h" /* generated rpc server implementation functions */ #include "librpc/gen_ndr/srv_echo.h" diff --git a/source3/include/memcache.h b/source3/include/memcache.h index f849f8ad3b..c4a2974b62 100644 --- a/source3/include/memcache.h +++ b/source3/include/memcache.h @@ -31,21 +31,30 @@ enum memcache_number { GID_SID_CACHE, SID_GID_CACHE, GETWD_CACHE, - GETPWNAM_CACHE, - MANGLE_HASH2_CACHE + GETPWNAM_CACHE, /* talloc */ + MANGLE_HASH2_CACHE, + SINGLETON_CACHE }; struct memcache *memcache_init(TALLOC_CTX *mem_ctx, size_t max_size); +void memcache_set_global(struct memcache *cache); + void memcache_add(struct memcache *cache, enum memcache_number n, DATA_BLOB key, DATA_BLOB value); +void memcache_add_talloc(struct memcache *cache, enum memcache_number n, + DATA_BLOB key, void *ptr); + void memcache_delete(struct memcache *cache, enum memcache_number n, DATA_BLOB key); bool memcache_lookup(struct memcache *cache, enum memcache_number n, DATA_BLOB key, DATA_BLOB *value); +void *memcache_lookup_talloc(struct memcache *cache, enum memcache_number n, + DATA_BLOB key); + void memcache_flush(struct memcache *cache, enum memcache_number n); #endif |