r11967: Fix more 64-bit warnings.

[bbaumbach/samba-autobuild/.git] / source4 / torture / rpc / samsync.c

diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c
index 9cd30ef019c9902f893ecec35df7e85c3eabc6e0..ad29d96b7121597932f96f958766a29d12ebe96b 100644 (file)
--- a/source4/torture/rpc/samsync.c
+++ b/source4/torture/rpc/samsync.c
@@ -210,10 +210,10 @@ static struct sec_desc_buf *samsync_query_lsa_sec_desc(TALLOC_CTX *mem_ctx,
 
 #define TEST_UINT64_EQUAL(i1, i2) do {\
        if (i1 != i2) {\
-              printf("%s: uint64 mismatch: " #i1 ": 0x%08x%08x (%lld) != " #i2 ": 0x%08x%08x (%lld)\n", \
+              printf("%s: uint64 mismatch: " #i1 ": 0x%016llx (%lld) != " #i2 ": 0x%016llx (%lld)\n", \
                     __location__, \
-                    (uint32_t)(i1 >> 32), (uint32_t)(i1 & 0xFFFFFFFF), i1, \
-                     (uint32_t)(i2 >> 32), (uint32_t)(i2 & 0xFFFFFFFF), i2);\
+                    (long long)i1, (long long)i1, \
+                    (long long)i2, (long long)i2);\
              ret = False;\
        } \
 } while (0)
@@ -320,7 +320,7 @@ static BOOL samsync_handle_domain(TALLOC_CTX *mem_ctx, struct samsync_state *sam
 
        printf("\tsequence_nums[%d/%s]=%llu\n",
               database_id, domain->domain_name.string,
-              samsync_state->seq_num[database_id]);
+              (long long)samsync_state->seq_num[database_id]);
 
        for (i=0;i<ARRAY_SIZE(levels);i++) {
                q[levels[i]].in.domain_handle = samsync_state->domain_handle[database_id];
@@ -386,7 +386,7 @@ static BOOL samsync_handle_policy(TALLOC_CTX *mem_ctx, struct samsync_state *sam
 
        printf("\tsequence_nums[%d/PRIVS]=%llu\n",
               database_id, 
-              samsync_state->seq_num[database_id]);
+              (long long)samsync_state->seq_num[database_id]);
        return True;
 }
 
@@ -1174,6 +1174,23 @@ static BOOL test_DatabaseSync(struct samsync_state *samsync_state,
                                                ret = False;
                                        }
                                        break;
+                               case NETR_DELTA_DELETE_GROUP:
+                               case NETR_DELTA_RENAME_GROUP:
+                               case NETR_DELTA_DELETE_USER:
+                               case NETR_DELTA_RENAME_USER:
+                               case NETR_DELTA_GROUP_MEMBER:
+                               case NETR_DELTA_DELETE_ALIAS:
+                               case NETR_DELTA_RENAME_ALIAS:
+                               case NETR_DELTA_ALIAS_MEMBER:
+                               case NETR_DELTA_DELETE_TRUST:
+                               case NETR_DELTA_DELETE_ACCOUNT:
+                               case NETR_DELTA_DELETE_SECRET:
+                               case NETR_DELTA_DELETE_GROUP2:
+                               case NETR_DELTA_DELETE_USER2:
+                               case NETR_DELTA_MODIFY_COUNT:
+                                       printf("Unhandled delta type %d\n", r.out.delta_enum_array->delta_enum[d].delta_type);
+                                       ret = False;
+                                       break;
                                }
                                talloc_free(delta_ctx);
                        }