Changeset 411 for branches/samba-3.3.x/source/passdb

Timestamp:

Mar 1, 2010, 3:05:48 PM (15 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3.x to 3.3.11

File:

• branches/samba-3.3.x/source/passdb/login_cache.c (modified) (6 diffs)

branches/samba-3.3.x/source/passdb/login_cache.c

@@ -68 +68 @@
         TDB_DATA databuf;
         LOGIN_CACHE *entry;
+        uint32_t entry_timestamp = 0, bad_password_time = 0;
 
         if (!login_cache_init())
@@ -92 +93 @@
                 return NULL;
         }
+        ZERO_STRUCTP(entry);
 
         if (tdb_unpack (databuf.dptr, databuf.dsize, SAM_CACHE_FORMAT,
-                        &entry->entry_timestamp, &entry->acct_ctrl, 
-                        &entry->bad_password_count, 
-                        &entry->bad_password_time) == -1) {
+                        &entry_timestamp,
+                        &entry->acct_ctrl,
+                        &entry->bad_password_count,
+                        &bad_password_time) == -1) {
                 DEBUG(7, ("No cache entry found\n"));
                 SAFE_FREE(entry);
@@ -102 +105 @@
                 return NULL;
         }
+
+        /* Deal with possible 64-bit time_t. */
+        entry->entry_timestamp = (time_t)entry_timestamp;
+        entry->bad_password_time = (time_t)bad_password_time;
 
         SAFE_FREE(databuf.dptr);
@@ -116 +123 @@
         TDB_DATA databuf;
         bool ret;
+        uint32_t entry_timestamp;
+        uint32_t bad_password_time = (uint32_t)entry.bad_password_time;
 
         if (!login_cache_init())
@@ -130 +139 @@
         }
 
-        entry.entry_timestamp = time(NULL);
+        entry_timestamp = (uint32_t)time(NULL);
 
         databuf.dsize = 
                 tdb_pack(NULL, 0, SAM_CACHE_FORMAT,
-                         entry.entry_timestamp,
+                         entry_timestamp,
                          entry.acct_ctrl,
                          entry.bad_password_count,
-                         entry.bad_password_time);
+                         bad_password_time);
         databuf.dptr = SMB_MALLOC_ARRAY(uint8, databuf.dsize);
         if (!databuf.dptr) {
@@ -145 +154 @@
                          
         if (tdb_pack(databuf.dptr, databuf.dsize, SAM_CACHE_FORMAT,
-                         entry.entry_timestamp,
+                         entry_timestamp,
                          entry.acct_ctrl,
                          entry.bad_password_count,
-                         entry.bad_password_time)
+                         bad_password_time)
             != databuf.dsize) {
                 SAFE_FREE(keystr);