r11967: Fix more 64-bit warnings.

(This used to be commit 9c4436a124f874ae240feaf590141d48c33a635f)

diff --git a/source4/auth/gensec/gensec_gssapi.c b/source4/auth/gensec/gensec_gssapi.c
index c8a57234e3b5a8f9fa4b77708577c72e1eea1f6f..b5a2dadd3533c3cebf8b817695290ae695044245 100644 (file)
--- a/source4/auth/gensec/gensec_gssapi.c
+++ b/source4/auth/gensec/gensec_gssapi.c
@@ -578,8 +578,8 @@ static NTSTATUS gensec_gssapi_seal_packet(struct gensec_security *gensec_securit
 
        /* Caller must pad to right boundary */
        if (output_token.length != (length + sig_length)) {
-               DEBUG(1, ("gensec_gssapi_seal_packet: GSS Wrap length [%d] does not match caller length [%d] plus sig size [%d] = [%d]\n", 
-                         output_token.length, length, sig_length, length + sig_length));
+               DEBUG(1, ("gensec_gssapi_seal_packet: GSS Wrap length [%ld] does not match caller length [%ld] plus sig size [%ld] = [%ld]\n", 
+                         (long)output_token.length, (long)length, (long)sig_length, (long)(length + sig_length)));
                return NT_STATUS_INTERNAL_ERROR;
        }
 
@@ -685,8 +685,8 @@ static NTSTATUS gensec_gssapi_sign_packet(struct gensec_security *gensec_securit
 
        /* Caller must pad to right boundary */
        if (output_token.length != (length + sig_length)) {
-               DEBUG(1, ("gensec_gssapi_sign_packet: GSS Wrap length [%d] does not match caller length [%d] plus sig size [%d] = [%d]\n", 
-                         output_token.length, length, sig_length, length + sig_length));
+               DEBUG(1, ("gensec_gssapi_sign_packet: GSS Wrap length [%ld] does not match caller length [%ld] plus sig size [%ld] = [%ld]\n", 
+                         (long)output_token.length, (long)length, (long)sig_length, (long)(length + sig_length)));
                return NT_STATUS_INTERNAL_ERROR;
        }
 

diff --git a/source4/dsdb/samdb/samdb.c b/source4/dsdb/samdb/samdb.c
index 2e1ce9ecb5beb59f232de3a8f82637f05d755346..9b63468f99cd079a450a49799edc40479bbf40bb 100644 (file)
--- a/source4/dsdb/samdb/samdb.c
+++ b/source4/dsdb/samdb/samdb.c
@@ -800,7 +800,7 @@ int samdb_msg_add_uint(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct
 int samdb_msg_add_int64(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct ldb_message *msg,
                        const char *attr_name, int64_t v)
 {
-       const char *s = talloc_asprintf(mem_ctx, "%lld", v);
+       const char *s = talloc_asprintf(mem_ctx, "%lld", (long long)v);
        return samdb_msg_add_string(sam_ldb, mem_ctx, msg, attr_name, s);
 }
 
@@ -810,7 +810,7 @@ int samdb_msg_add_int64(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct
 int samdb_msg_add_uint64(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct ldb_message *msg,
                        const char *attr_name, uint64_t v)
 {
-       const char *s = talloc_asprintf(mem_ctx, "%llu", v);
+       const char *s = talloc_asprintf(mem_ctx, "%llu", (unsigned long long)v);
        return samdb_msg_add_string(sam_ldb, mem_ctx, msg, attr_name, s);
 }
 

diff --git a/source4/lib/com/dcom/main.c b/source4/lib/com/dcom/main.c
index 1c54f1711398889634a123fe853993da645c6257..1ee5608895644de42b029bfb706ad1e22a378840 100644 (file)
--- a/source4/lib/com/dcom/main.c
+++ b/source4/lib/com/dcom/main.c
@@ -319,7 +319,7 @@ NTSTATUS dcom_get_pipe(struct IUnknown *iface, struct dcerpc_pipe **pp)
                return status;
        }
 
-       DEBUG(2, ("Successfully connected to OXID %llx\n", oxid));
+       DEBUG(2, ("Successfully connected to OXID %llx\n", (long long)oxid));
        
        *pp = p;
        talloc_free(tmp_ctx);

diff --git a/source4/lib/stream/packet.c b/source4/lib/stream/packet.c
index 54cf662e2e78ddc14a99e45f5b8a3771fb01a5ab..d8ce332de68b37cae99932c96f01b78347182b28 100644 (file)
--- a/source4/lib/stream/packet.c
+++ b/source4/lib/stream/packet.c
@@ -337,8 +337,8 @@ next_partial:
 
        if (pc->packet_size > pc->num_read) {
                /* the caller made an error */
-               DEBUG(0,("Invalid packet_size %u greater than num_read %u\n",
-                        pc->packet_size, pc->num_read));
+               DEBUG(0,("Invalid packet_size %lu greater than num_read %lu\n",
+                        (long)pc->packet_size, (long)pc->num_read));
                packet_error(pc, NT_STATUS_INVALID_PARAMETER);
                return;
        }

diff --git a/source4/libcli/smb2/transport.c b/source4/libcli/smb2/transport.c
index 02ac587636aae46c2917aeefe885ca74d4e12b41..60dd5d2ba6ffc986b5406fbc685e3b45a2524032 100644 (file)
--- a/source4/libcli/smb2/transport.c
+++ b/source4/libcli/smb2/transport.c
@@ -170,7 +170,7 @@ static NTSTATUS smb2_transport_finish_recv(void *private, DATA_BLOB blob)
 
        if (!req) {
                DEBUG(1,("Discarding unmatched reply with seqnum 0x%llx op %d\n", 
-                        seqnum, SVAL(hdr, SMB2_HDR_OPCODE)));
+                        (long long)seqnum, SVAL(hdr, SMB2_HDR_OPCODE)));
                goto error;
        }
 
@@ -204,7 +204,7 @@ static NTSTATUS smb2_transport_finish_recv(void *private, DATA_BLOB blob)
                }
        }
 
-       DEBUG(2, ("SMB2 RECV seqnum=0x%llx\n", req->seqnum));
+       DEBUG(2, ("SMB2 RECV seqnum=0x%llx\n", (long long)req->seqnum));
        dump_data(5, req->in.body, req->in.body_size);
 
        /* if this request has an async handler then call that to
@@ -273,7 +273,7 @@ void smb2_transport_send(struct smb2_request *req)
 
        _smb_setlen2(req->out.buffer, req->out.size - NBT_HDR_SIZE);
 
-       DEBUG(2, ("SMB2 send seqnum=0x%llx\n", req->seqnum));
+       DEBUG(2, ("SMB2 send seqnum=0x%llx\n", (long long)req->seqnum));
        dump_data(5, req->out.body, req->out.body_size);
 
        /* check if the transport is dead */

diff --git a/source4/nbt_server/wins/winsdb.c b/source4/nbt_server/wins/winsdb.c
index 7916d139bbce8dc37e92da114b6936031873b91f..bcec8da2139307d2725ec503dfa721cf6eaef153 100644 (file)
--- a/source4/nbt_server/wins/winsdb.c
+++ b/source4/nbt_server/wins/winsdb.c
@@ -71,7 +71,7 @@ static uint64_t winsdb_allocate_version(struct ldb_context *wins_db)
        if (ret != 0) goto failed;
        ret = ldb_msg_add_empty(msg, "maxVersion", LDB_FLAG_MOD_REPLACE);
        if (ret != 0) goto failed;
-       ret = ldb_msg_add_fmt(msg, "maxVersion", "%llu", maxVersion);
+       ret = ldb_msg_add_fmt(msg, "maxVersion", "%llu", (long long)maxVersion);
        if (ret != 0) goto failed;
 
        ret = ldb_modify(wins_db, msg);
@@ -539,7 +539,7 @@ struct ldb_message *winsdb_message(struct ldb_context *ldb,
        ret |= ldb_msg_add_fmt(msg, "isStatic", "%u", rec->is_static);
        ret |= ldb_msg_add_string(msg, "expireTime", 
                                  ldb_timestring(msg, rec->expire_time));
-       ret |= ldb_msg_add_fmt(msg, "versionID", "%llu", rec->version);
+       ret |= ldb_msg_add_fmt(msg, "versionID", "%llu", (long long)rec->version);
        ret |= ldb_msg_add_string(msg, "winsOwner", rec->wins_owner);
        ret |= ldb_msg_add_empty(msg, "address", 0);
        for (i=0;rec->addresses[i];i++) {

diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c
index f439bce06143be95a306d7fa42a0c01a7e93a874..d51dec8db47ea4c1960a0530024c0d600a2760ff 100644 (file)
--- a/source4/smb_server/smb_server.c
+++ b/source4/smb_server/smb_server.c
@@ -44,7 +44,7 @@ static NTSTATUS smbsrv_recv_generic_request(void *private, DATA_BLOB blob)
        }
 
        if (blob.length < (NBT_HDR_SIZE + MIN_SMB_SIZE)) {
-               DEBUG(2,("Invalid SMB packet length count %d\n", blob.length));
+               DEBUG(2,("Invalid SMB packet length count %ld\n", (long)blob.length));
                smbsrv_terminate_connection(smb_conn, "Invalid SMB packet");
                return NT_STATUS_OK;
        }

diff --git a/source4/torture/basic/denytest.c b/source4/torture/basic/denytest.c
index 3d2c57f998139caf7b2653e698804413bf6f1467..9f559b7c766641c58fd54ffb0bc66734b781ebb9 100644 (file)
--- a/source4/torture/basic/denytest.c
+++ b/source4/torture/basic/denytest.c
@@ -1471,7 +1471,7 @@ BOOL torture_denytest1(void)
                        tdif = usec_time_diff(&tv, &tv_start);
                        tdif /= 1000;
                        printf("%lld: %s %8s %10s    %8s %10s    %s (correct=%s)\n",
-                              tdif,
+                              (long long)tdif,
                               fname,
                               denystr(denytable1[i].deny1),
                               openstr(denytable1[i].mode1),
@@ -1568,7 +1568,7 @@ BOOL torture_denytest2(void)
                        tdif = usec_time_diff(&tv, &tv_start);
                        tdif /= 1000;
                        printf("%lld: %s %8s %10s    %8s %10s    %s (correct=%s)\n",
-                               tdif,
+                              (long long)tdif,
                               fname,
                               denystr(denytable2[i].deny1),
                               openstr(denytable2[i].mode1),

diff --git a/source4/torture/nbt/winsreplication.c b/source4/torture/nbt/winsreplication.c
index 87b2c2621188cbb292d07655666a96fa0caa75ec..4f18e3492b836b40f07a11b4748e5f6b7ee2ccd0 100644 (file)
--- a/source4/torture/nbt/winsreplication.c
+++ b/source4/torture/nbt/winsreplication.c
@@ -47,7 +47,7 @@
 #define CHECK_VALUE_UINT64(v, correct) do { \
        if ((v) != (correct)) { \
                printf("(%s) Incorrect value %s=%llu - should be %llu\n", \
-                      __location__, #v, v, correct); \
+                      __location__, #v, (long long)v, (long long)correct); \
                ret = False; \
                goto done; \
        }} while (0)
@@ -230,7 +230,7 @@ static void display_entry(TALLOC_CTX *mem_ctx, struct wrepl_name *name)
 
        printf("%s\n", nbt_name_string(mem_ctx, &name->name));
        printf("\tTYPE:%u STATE:%u NODE:%u STATIC:%u VERSION_ID: %llu\n",
-               name->type, name->state, name->node, name->is_static, name->version_id);
+               name->type, name->state, name->node, name->is_static, (long long)name->version_id);
        printf("\tRAW_FLAGS: 0x%08X OWNER: %-15s\n",
                name->raw_flags, name->owner);
        for (i=0;i<name->num_addresses;i++) {
@@ -296,8 +296,8 @@ static BOOL test_wins_replication(TALLOC_CTX *mem_ctx, const char *address)
                struct wrepl_wins_owner *partner = &pull_table.out.partners[i];
                printf("%s   max_version=%6llu   min_version=%6llu type=%d\n",
                       partner->address, 
-                      partner->max_version, 
-                      partner->min_version, 
+                      (long long)partner->max_version, 
+                      (long long)partner->min_version, 
                       partner->type);
 
                pull_names.in.assoc_ctx = associate.out.assoc_ctx;

diff --git a/source4/torture/rpc/dssync.c b/source4/torture/rpc/dssync.c
index 9e9348283aa012127dfac70950e2c7c791ad9674..84d6c39b63e15e621d2a8a9cc6c2b685d20357fe 100644 (file)
--- a/source4/torture/rpc/dssync.c
+++ b/source4/torture/rpc/dssync.c
@@ -476,14 +476,14 @@ static BOOL test_FetchData(struct DsSyncTest *ctx)
 
                        if (r.in.level == 5) {
                                DEBUG(0,("start[%d] tmp_higest_usn: %llu , highest_usn: %llu\n",y,
-                                       r.in.req.req5.highwatermark.tmp_highest_usn,
-                                       r.in.req.req5.highwatermark.highest_usn));
+                                       (long long)r.in.req.req5.highwatermark.tmp_highest_usn,
+                                       (long long)r.in.req.req5.highwatermark.highest_usn));
                        }
 
                        if (r.in.level == 8) {
                                DEBUG(0,("start[%d] tmp_higest_usn: %llu , highest_usn: %llu\n",y,
-                                       r.in.req.req8.highwatermark.tmp_highest_usn,
-                                       r.in.req.req8.highwatermark.highest_usn));
+                                       (long long)r.in.req.req8.highwatermark.tmp_highest_usn,
+                                       (long long)r.in.req.req8.highwatermark.highest_usn));
                        }
 
                        status = dcerpc_drsuapi_DsGetNCChanges(ctx->new_dc.drsuapi.pipe, ctx, &r);
@@ -509,8 +509,8 @@ static BOOL test_FetchData(struct DsSyncTest *ctx)
 
                        if (out_level == 1) {
                                DEBUG(0,("end[%d] tmp_highest_usn: %llu , highest_usn: %llu\n",y,
-                                       ctr1->new_highwatermark.tmp_highest_usn,
-                                       ctr1->new_highwatermark.highest_usn));
+                                       (long long)ctr1->new_highwatermark.tmp_highest_usn,
+                                       (long long)ctr1->new_highwatermark.highest_usn));
 
                                test_analyse_objects(ctx, ctr1->first_object);
 
@@ -532,8 +532,8 @@ static BOOL test_FetchData(struct DsSyncTest *ctx)
 
                        if (out_level == 6) {
                                DEBUG(0,("end[%d] tmp_highest_usn: %llu , highest_usn: %llu\n",y,
-                                       ctr6->new_highwatermark.tmp_highest_usn,
-                                       ctr6->new_highwatermark.highest_usn));
+                                       (long long)ctr6->new_highwatermark.tmp_highest_usn,
+                                       (long long)ctr6->new_highwatermark.highest_usn));
 
                                test_analyse_objects(ctx, ctr6->first_object);
 

diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c
index 79dd8c9833b21b7b2db55886babb4c8d7a1483e6..ad29d96b7121597932f96f958766a29d12ebe96b 100644 (file)
--- a/source4/torture/rpc/samsync.c
+++ b/source4/torture/rpc/samsync.c
@@ -211,7 +211,9 @@ 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%016llx (%lld) != " #i2 ": 0x%016llx (%lld)\n", \
-                    __location__, i1, i1, i2, i2);\
+                    __location__, \
+                    (long long)i1, (long long)i1, \
+                    (long long)i2, (long long)i2);\
              ret = False;\
        } \
 } while (0)
@@ -318,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];
@@ -384,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;
 }
 

diff --git a/source4/torture/smb2/connect.c b/source4/torture/smb2/connect.c
index 4973dcee6f730676039adb1de28e070f7b3f690a..dde2ace4b28977cf9dae3be7a4cf91b5479de083 100644 (file)
--- a/source4/torture/smb2/connect.c
+++ b/source4/torture/smb2/connect.c
@@ -51,8 +51,8 @@ static NTSTATUS torture_smb2_close(struct smb2_tree *tree, struct smb2_handle ha
                printf("access_time     = %s\n", nt_time_string(tmp_ctx, io.out.access_time));
                printf("write_time      = %s\n", nt_time_string(tmp_ctx, io.out.write_time));
                printf("change_time     = %s\n", nt_time_string(tmp_ctx, io.out.change_time));
-               printf("alloc_size      = %lld\n", io.out.alloc_size);
-               printf("size            = %lld\n", io.out.size);
+               printf("alloc_size      = %lld\n", (long long)io.out.alloc_size);
+               printf("size            = %lld\n", (long long)io.out.size);
                printf("file_attr       = 0x%x\n", io.out.file_attr);
        }
 
@@ -170,12 +170,12 @@ static struct smb2_handle torture_smb2_create(struct smb2_tree *tree,
                printf("access_time     = %s\n", nt_time_string(tmp_ctx, io.out.access_time));
                printf("write_time      = %s\n", nt_time_string(tmp_ctx, io.out.write_time));
                printf("change_time     = %s\n", nt_time_string(tmp_ctx, io.out.change_time));
-               printf("alloc_size      = %lld\n", io.out.alloc_size);
-               printf("size            = %lld\n", io.out.size);
+               printf("alloc_size      = %lld\n", (long long)io.out.alloc_size);
+               printf("size            = %lld\n", (long long)io.out.size);
                printf("file_attr       = 0x%x\n", io.out.file_attr);
                printf("handle          = %016llx%016llx\n", 
-                      io.out.handle.data[0], 
-                      io.out.handle.data[1]);
+                      (long long)io.out.handle.data[0], 
+                      (long long)io.out.handle.data[1]);
        }
 
        talloc_free(tmp_ctx);

diff --git a/source4/torture/smb2/scan.c b/source4/torture/smb2/scan.c
index b0c4ba4c8d6872442022616dfc49459fe680c0af..03aa6dca49fb952934445050444f7fd459d1826e 100644 (file)
--- a/source4/torture/smb2/scan.c
+++ b/source4/torture/smb2/scan.c
@@ -78,8 +78,8 @@ BOOL torture_smb2_getinfo_scan(void)
                        if (!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_INFO_CLASS) &&
                            !NT_STATUS_EQUAL(status, NT_STATUS_INVALID_PARAMETER) &&
                            !NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED)) {
-                               printf("file level 0x%04x is %d bytes - %s\n", 
-                                      io.in.level, io.out.blob.length, nt_errstr(status));
+                               printf("file level 0x%04x is %ld bytes - %s\n", 
+                                      io.in.level, (long)io.out.blob.length, nt_errstr(status));
                                dump_data(1, io.out.blob.data, io.out.blob.length);
                        }
 
@@ -88,8 +88,8 @@ BOOL torture_smb2_getinfo_scan(void)
                        if (!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_INFO_CLASS) &&
                            !NT_STATUS_EQUAL(status, NT_STATUS_INVALID_PARAMETER) &&
                            !NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED)) {
-                               printf("dir  level 0x%04x is %d bytes - %s\n", 
-                                      io.in.level, io.out.blob.length, nt_errstr(status));
+                               printf("dir  level 0x%04x is %ld bytes - %s\n", 
+                                      io.in.level, (long)io.out.blob.length, nt_errstr(status));
                                dump_data(1, io.out.blob.data, io.out.blob.length);
                        }
                }
@@ -183,8 +183,8 @@ BOOL torture_smb2_find_scan(void)
                if (!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_INFO_CLASS) &&
                    !NT_STATUS_EQUAL(status, NT_STATUS_INVALID_PARAMETER) &&
                    !NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED)) {
-                       printf("find level 0x%04x is %d bytes - %s\n", 
-                              io.in.level, io.out.blob.length, nt_errstr(status));
+                       printf("find level 0x%04x is %ld bytes - %s\n", 
+                              io.in.level, (long)io.out.blob.length, nt_errstr(status));
                        dump_data(1, io.out.blob.data, io.out.blob.length);
                }
        }

diff --git a/source4/torture/smb2/util.c b/source4/torture/smb2/util.c
index 886aaea09fe8f64b18f24b43b0ef7c28dbd8b6fc..a3d6ed8d660c2a754f4d1bd93dfecb60e8eafb70 100644 (file)
--- a/source4/torture/smb2/util.c
+++ b/source4/torture/smb2/util.c
@@ -224,16 +224,16 @@ void torture_smb2_all_info(struct smb2_tree *tree, struct smb2_handle handle)
        d_printf("\tchange_time:    %s\n", nt_time_string(tmp_ctx, io.all_info2.out.change_time));
        d_printf("\tattrib:         0x%x\n", io.all_info2.out.attrib);
        d_printf("\tunknown1:       0x%x\n", io.all_info2.out.unknown1);
-       d_printf("\talloc_size:     %llu\n", (uint64_t)io.all_info2.out.alloc_size);
-       d_printf("\tsize:           %llu\n", (uint64_t)io.all_info2.out.size);
+       d_printf("\talloc_size:     %llu\n", (long long)io.all_info2.out.alloc_size);
+       d_printf("\tsize:           %llu\n", (long long)io.all_info2.out.size);
        d_printf("\tnlink:          %u\n", io.all_info2.out.nlink);
        d_printf("\tdelete_pending: %u\n", io.all_info2.out.delete_pending);
        d_printf("\tdirectory:      %u\n", io.all_info2.out.directory);
-       d_printf("\tfile_id:        %llu\n", io.all_info2.out.file_id);
+       d_printf("\tfile_id:        %llu\n", (long long)io.all_info2.out.file_id);
        d_printf("\tea_size:        %u\n", io.all_info2.out.ea_size);
        d_printf("\taccess_mask:    0x%08x\n", io.all_info2.out.access_mask);
-       d_printf("\tposition:       0x%llx\n", io.all_info2.out.position);
-       d_printf("\tmode:           0x%llx\n", io.all_info2.out.mode);
+       d_printf("\tposition:       0x%llx\n", (long long)io.all_info2.out.position);
+       d_printf("\tmode:           0x%llx\n", (long long)io.all_info2.out.mode);
 
        /* short name, if any */
        io.generic.level = RAW_FILEINFO_ALT_NAME_INFORMATION;

diff --git a/source4/torture/torture_util.c b/source4/torture/torture_util.c
index 4606ec68407fba2022b95c9d42ebcf72473016e3..cdc0155eccc0b44ddc5ef29c824336f87674d373 100644 (file)
--- a/source4/torture/torture_util.c
+++ b/source4/torture/torture_util.c
@@ -318,8 +318,8 @@ void dump_all_info(TALLOC_CTX *mem_ctx, union smb_fileinfo *finfo)
        d_printf("\twrite_time:     %s\n", nt_time_string(mem_ctx, finfo->all_info.out.write_time));
        d_printf("\tchange_time:    %s\n", nt_time_string(mem_ctx, finfo->all_info.out.change_time));
        d_printf("\tattrib:         0x%x\n", finfo->all_info.out.attrib);
-       d_printf("\talloc_size:     %llu\n", (uint64_t)finfo->all_info.out.alloc_size);
-       d_printf("\tsize:           %llu\n", (uint64_t)finfo->all_info.out.size);
+       d_printf("\talloc_size:     %llu\n", (long long)finfo->all_info.out.alloc_size);
+       d_printf("\tsize:           %llu\n", (long long)finfo->all_info.out.size);
        d_printf("\tnlink:          %u\n", finfo->all_info.out.nlink);
        d_printf("\tdelete_pending: %u\n", finfo->all_info.out.delete_pending);
        d_printf("\tdirectory:      %u\n", finfo->all_info.out.directory);

diff --git a/source4/wrepl_server/wrepl_apply_records.c b/source4/wrepl_server/wrepl_apply_records.c
index 536119f5203a697c3255397ce4f48e7fe12d07f8..4b7eb24cabdea79e965fbd37113aca204259013b 100644 (file)
--- a/source4/wrepl_server/wrepl_apply_records.c
+++ b/source4/wrepl_server/wrepl_apply_records.c
@@ -996,7 +996,8 @@ NTSTATUS wreplsrv_apply_records(struct wreplsrv_partner *partner, struct wreplsr
 
        DEBUG(4,("apply records count[%u]:owner[%s]:min[%llu]:max[%llu]:partner[%s]\n",
                names_io->out.num_names, names_io->in.owner.address,
-               names_io->in.owner.min_version, names_io->in.owner.max_version,
+               (long long)names_io->in.owner.min_version, 
+               (long long)names_io->in.owner.max_version,
                partner->address));
 
        for (i=0; i < names_io->out.num_names; i++) {

diff --git a/source4/wrepl_server/wrepl_in_call.c b/source4/wrepl_server/wrepl_in_call.c
index 6b1bc4500ea2d4f784de8e753719aa71ea678e41..0dd8095dd2ee42e80af31a959768e244782c6319 100644 (file)
--- a/source4/wrepl_server/wrepl_in_call.c
+++ b/source4/wrepl_server/wrepl_in_call.c
@@ -246,14 +246,17 @@ static NTSTATUS wreplsrv_in_send_request(struct wreplsrv_in_call *call)
                                 "(versionID>=%llu)(versionID<=%llu))",
                                 owner->owner.address,
                                 WREPL_STATE_ACTIVE, WREPL_STATE_TOMBSTONE,
-                                owner_in->min_version, owner_in->max_version);
+                                (long long)owner_in->min_version, 
+                                (long long)owner_in->max_version);
        NT_STATUS_HAVE_NO_MEMORY(filter);
        ret = ldb_search(service->wins_db, NULL, LDB_SCOPE_SUBTREE, filter, NULL, &res);
        if (ret != LDB_SUCCESS) return NT_STATUS_INTERNAL_DB_CORRUPTION;
        talloc_steal(call, res);
        if (res->count == 0) {
                DEBUG(2,("WINSREPL:reply [%u] records owner[%s] min[%llu] max[%llu] to partner[%s]\n",
-                       res->count, owner_in->address, owner_in->min_version, owner_in->max_version,
+                       res->count, owner_in->address, 
+                       (long long)owner_in->min_version, 
+                       (long long)owner_in->max_version,
                        call->wreplconn->partner->address));
                return NT_STATUS_OK;
        }
@@ -275,7 +278,9 @@ static NTSTATUS wreplsrv_in_send_request(struct wreplsrv_in_call *call)
        qsort(names, res->count, sizeof(struct wrepl_wins_name), (comparison_fn_t)wreplsrv_in_sort_wins_name);
 
        DEBUG(2,("WINSREPL:reply [%u] records owner[%s] min[%llu] max[%llu] to partner[%s]\n",
-               res->count, owner_in->address, owner_in->min_version, owner_in->max_version,
+               res->count, owner_in->address, 
+               (long long)owner_in->min_version, 
+               (long long)owner_in->max_version,
                call->wreplconn->partner->address));
 
        reply_out->num_names    = res->count;

diff --git a/source4/wrepl_server/wrepl_in_connection.c b/source4/wrepl_server/wrepl_in_connection.c
index 5ba36a50518ed5e42264cbb27782fa6c54317f43..e06e69103e2d2a35a58dacd1cb57bc176272128d 100644 (file)
--- a/source4/wrepl_server/wrepl_in_connection.c
+++ b/source4/wrepl_server/wrepl_in_connection.c
@@ -155,7 +155,7 @@ static void wreplsrv_recv(struct stream_connection *conn, uint16_t flags)
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(2,("Failed to parse incoming WINS-Replication packet - %s\n",
                         nt_errstr(status)));
-               DEBUG(10,("packet length %u\n", wreplconn->partial.length));
+               DEBUG(10,("packet length %lu\n", (long)wreplconn->partial.length));
                NDR_PRINT_DEBUG(wrepl_packet, &call->req_packet);
                goto failed;
        }
@@ -168,7 +168,7 @@ static void wreplsrv_recv(struct stream_connection *conn, uint16_t flags)
        wreplconn->partial_read = 0;
 
        if (DEBUGLVL(10)) {
-               DEBUG(10,("Received WINS-Replication packet of length %u\n", wreplconn->partial.length));
+               DEBUG(10,("Received WINS-Replication packet of length %lu\n", (long)wreplconn->partial.length));
                NDR_PRINT_DEBUG(wrepl_packet, &call->req_packet);
        }