SYSDB: Fix setting dataExpireTimestamp if sysdb is supposed to set the current time

sysdb is already able to retrieve the current timestamp if the caller
doesn't specify it. However, for the timestamp cache this came too late
and the timestamp cache used zero as the 'now' time.

Resolves:
https://fedorahosted.org/sssd/ticket/3064

Reviewed-by: Pavel Březina <pbrezina@redhat.com>

1 files changed, 10 insertions, 10 deletions

diff --git a/src/db/sysdb_ops.c b/src/db/sysdb_ops.c
index 342e16fb2..67006c155 100644
--- a/src/db/sysdb_ops.c
+++ b/src/db/sysdb_ops.c
@@ -2465,6 +2465,11 @@ int sysdb_store_user(struct sss_domain_info *domain,
     errno_t sret = EOK;
     bool in_transaction = false;
 
+    /* get transaction timestamp */
+    if (now == 0) {
+        now = time(NULL);
+    }
+
     ret = sysdb_check_and_update_ts_usr(domain, name, attrs,
                                         cache_timeout, now);
     if (ret == EOK) {
@@ -2508,11 +2513,6 @@ int sysdb_store_user(struct sss_domain_info *domain,
         DEBUG(SSSDBG_TRACE_LIBS, "User %s does not exist.\n", name);
     }
 
-    /* get transaction timestamp */
-    if (!now) {
-        now = time(NULL);
-    }
-
     if (ret == ENOENT) {
         /* the user doesn't exist, turn into adding a user */
         ret = sysdb_store_new_user(domain, name, uid, gid, gecos, homedir,
@@ -2700,6 +2700,11 @@ int sysdb_store_group(struct sss_domain_info *domain,
     errno_t sret = EOK;
     bool in_transaction = false;
 
+    /* get transaction timestamp */
+    if (!now) {
+        now = time(NULL);
+    }
+
     ret = sysdb_check_and_update_ts_grp(domain, name, attrs,
                                         cache_timeout, now);
     if (ret == EOK) {
@@ -2741,11 +2746,6 @@ int sysdb_store_group(struct sss_domain_info *domain,
         }
     }
 
-    /* get transaction timestamp */
-    if (!now) {
-        now = time(NULL);
-    }
-
     if (new_group) {
         ret = sysdb_store_new_group(domain, name, gid, attrs,
                                     cache_timeout, now);