Author: metze Date: 2005-09-16 15:03:35 +0000 (Fri, 16 Sep 2005) New Revision: 10266
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10266 Log: [EMAIL PROTECTED] (orig r10255): tpot | 2005-09-16 09:10:11 +0200 Fix some more 64-bit warnings. [EMAIL PROTECTED] (orig r10256): tpot | 2005-09-16 09:15:40 +0200 Fix some unhandled enumeration warnings. There's one still left, RAW_SEARCH_UNIX_INFO find_fill_info(), which I think is a bug. [EMAIL PROTECTED] (orig r10257): tpot | 2005-09-16 09:19:37 +0200 strlen returns a size_t which can be 64 bits long. [EMAIL PROTECTED] (orig r10258): tpot | 2005-09-16 09:24:36 +0200 Fix an unused/duplicate local variable. Modified: branches/tmp/samba4-winsrepl/ branches/tmp/samba4-winsrepl/source/lib/tdb/common/io.c branches/tmp/samba4-winsrepl/source/smb_server/trans2.c branches/tmp/samba4-winsrepl/source/torture/raw/streams.c branches/tmp/samba4-winsrepl/source/torture/rpc/netlogon.c Changeset: Property changes on: branches/tmp/samba4-winsrepl ___________________________________________________________________ Name: svk:merge - 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:10253 3a72dc49-98ff-0310-ab52-9b7ed7945d91:/local/samba4:9495 a953eb74-4aff-0310-a63c-855d20285ebb:/local/samba4:11632 + 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/SAMBA_4_0:10258 3a72dc49-98ff-0310-ab52-9b7ed7945d91:/local/samba4:9495 a953eb74-4aff-0310-a63c-855d20285ebb:/local/samba4:11632 Modified: branches/tmp/samba4-winsrepl/source/lib/tdb/common/io.c =================================================================== --- branches/tmp/samba4-winsrepl/source/lib/tdb/common/io.c 2005-09-16 14:49:09 UTC (rev 10265) +++ branches/tmp/samba4-winsrepl/source/lib/tdb/common/io.c 2005-09-16 15:03:35 UTC (rev 10266) @@ -124,8 +124,6 @@ /* read a lump of data at a specified offset, maybe convert */ int tdb_read(struct tdb_context *tdb, tdb_off_t off, void *buf, tdb_len_t len, int cv) { - ssize_t ret; - if (tdb_oob(tdb, off + len, 0) != 0) { return -1; } Modified: branches/tmp/samba4-winsrepl/source/smb_server/trans2.c =================================================================== --- branches/tmp/samba4-winsrepl/source/smb_server/trans2.c 2005-09-16 14:49:09 UTC (rev 10265) +++ branches/tmp/samba4-winsrepl/source/smb_server/trans2.c 2005-09-16 15:03:35 UTC (rev 10266) @@ -740,6 +740,10 @@ } } return NT_STATUS_OK; + + case RAW_FILEINFO_UNIX_BASIC: + case RAW_FILEINFO_UNIX_LINK: + return NT_STATUS_INVALID_LEVEL; } return NT_STATUS_INVALID_LEVEL; @@ -919,6 +923,17 @@ CHECK_MIN_BLOB_SIZE(blob, 4); st->mode_information.in.mode = IVAL(blob->data, 0); return NT_STATUS_OK; + + case RAW_SFILEINFO_UNIX_BASIC: + case RAW_SFILEINFO_UNIX_LINK: + case RAW_SFILEINFO_UNIX_HLINK: + case RAW_SFILEINFO_1023: + case RAW_SFILEINFO_1025: + case RAW_SFILEINFO_1029: + case RAW_SFILEINFO_1032: + case RAW_SFILEINFO_1039: + case RAW_SFILEINFO_1040: + return NT_STATUS_INVALID_LEVEL; } return NT_STATUS_INVALID_LEVEL; Modified: branches/tmp/samba4-winsrepl/source/torture/raw/streams.c =================================================================== --- branches/tmp/samba4-winsrepl/source/torture/raw/streams.c 2005-09-16 14:49:09 UTC (rev 10265) +++ branches/tmp/samba4-winsrepl/source/torture/raw/streams.c 2005-09-16 15:03:35 UTC (rev 10266) @@ -76,8 +76,8 @@ ret = smbcli_read(cli->tree, fnum, buf, 0, strlen(value)+11); if (ret != strlen(value)) { - printf("Failed to read %d bytes from stream '%s' - got %d\n", - strlen(value), full_name, (int)ret); + printf("Failed to read %lu bytes from stream '%s' - got %d\n", + (long)strlen(value), full_name, (int)ret); return False; } Modified: branches/tmp/samba4-winsrepl/source/torture/rpc/netlogon.c =================================================================== --- branches/tmp/samba4-winsrepl/source/torture/rpc/netlogon.c 2005-09-16 14:49:09 UTC (rev 10265) +++ branches/tmp/samba4-winsrepl/source/torture/rpc/netlogon.c 2005-09-16 15:03:35 UTC (rev 10266) @@ -614,7 +614,7 @@ r.out.delta_enum_array->delta_enum[0].delta_union.domain->sequence_num; printf("\tsequence_nums[%d]=%llu\n", r.in.database_id, - sequence_nums[r.in.database_id]); + (unsigned long long)sequence_nums[r.in.database_id]); } } while (NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES)); } @@ -654,7 +654,7 @@ printf("Testing DatabaseDeltas of id %d at %llu\n", - r.in.database_id, r.in.sequence_num); + r.in.database_id, (unsigned long long)r.in.sequence_num); do { creds_client_authenticator(creds, &r.in.credential);
