namemap_cache: Absorb the expired calculation into namemap_cache.c

[nivanova/samba-autobuild/.git] / source3 / torture / test_namemap_cache.c

diff --git a/source3/torture/test_namemap_cache.c b/source3/torture/test_namemap_cache.c
index 07c6bf4744ee2d8b9fdbb8312865620275decd5b..01dd1b7c8dccd1230c8aee1e422f7d9046050f7a 100644 (file)
--- a/source3/torture/test_namemap_cache.c
+++ b/source3/torture/test_namemap_cache.c
@@ -26,8 +26,10 @@ static const struct dom_sid domsid = {
        1, 4, {0,0,0,0,0,5}, {21, 123, 456, 789}
 };
 
-static void namemap_cache1_fn1(const char *domain, const char *name,
-                              enum lsa_SidType type, time_t timeout,
+static void namemap_cache1_fn1(const char *domain,
+                              const char *name,
+                              enum lsa_SidType type,
+                              bool expired,
                               void *private_data)
 {
        bool *p_ok = private_data;
@@ -41,7 +43,8 @@ static void namemap_cache1_fn1(const char *domain, const char *name,
 }
 
 static void namemap_cache1_fn2(const struct dom_sid *sid,
-                              enum lsa_SidType type, time_t timeout,
+                              enum lsa_SidType type,
+                              bool expired,
                               void *private_data)
 {
        bool *p_ok = private_data;
@@ -53,8 +56,10 @@ static void namemap_cache1_fn2(const struct dom_sid *sid,
        *p_ok = ok;
 }
 
-static void namemap_cache1_fn3(const char *domain, const char *name,
-                              enum lsa_SidType type, time_t timeout,
+static void namemap_cache1_fn3(const char *domain,
+                              const char *name,
+                              enum lsa_SidType type,
+                              bool expired,
                               void *private_data)
 {
        bool *p_ok = private_data;
@@ -68,7 +73,8 @@ static void namemap_cache1_fn3(const char *domain, const char *name,
 }
 
 static void namemap_cache1_fn4(const struct dom_sid *sid,
-                              enum lsa_SidType type, time_t timeout,
+                              enum lsa_SidType type,
+                              bool expired,
                               void *private_data)
 {
        bool *p_ok = private_data;
@@ -80,8 +86,10 @@ static void namemap_cache1_fn4(const struct dom_sid *sid,
        *p_ok = ok;
 }
 
-static void namemap_cache1_fn5(const char *domain, const char *name,
-                              enum lsa_SidType type, time_t timeout,
+static void namemap_cache1_fn5(const char *domain,
+                              const char *name,
+                              enum lsa_SidType type,
+                              bool expired,
                               void *private_data)
 {
        bool *p_ok = private_data;
@@ -95,7 +103,8 @@ static void namemap_cache1_fn5(const char *domain, const char *name,
 }
 
 static void namemap_cache1_fn6(const struct dom_sid *sid,
-                              enum lsa_SidType type, time_t timeout,
+                              enum lsa_SidType type,
+                              bool expired,
                               void *private_data)
 {
        bool *p_ok = private_data;