The branch, master has been updated
via b04eba1... s3: Fix cli_posix_stat
via 1528a4f... s3: use dump_data in query FILE_BASIC_UNIX_INFO
from 032bf5c... s3: Fix a typo (missing space)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit b04eba165e45bafbe813f93b9e133dc489d2fe2e
Author: Volker Lendecke <[email protected]>
Date: Sun Jul 25 19:12:28 2010 +0200
s3: Fix cli_posix_stat
nlink seems to be defined as 8 bytes, not 4
Jeremy, please check!
commit 1528a4ffbe40fe63329e67370f13c0ef6b117b81
Author: Volker Lendecke <[email protected]>
Date: Sun Jul 25 19:11:30 2010 +0200
s3: use dump_data in query FILE_BASIC_UNIX_INFO
Jeremy, please check! To me this is a lot more readable than the decimal
listing of the bytes.
-----------------------------------------------------------------------
Summary of changes:
source3/libsmb/clifile.c | 8 ++++----
source3/smbd/trans2.c | 11 +++--------
2 files changed, 7 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index 6e7a74f..de2d185 100644
--- a/source3/libsmb/clifile.c
+++ b/source3/libsmb/clifile.c
@@ -778,7 +778,7 @@ static void cli_posix_stat_done(struct tevent_req *subreq)
NTSTATUS status;
status = cli_trans_recv(subreq, state, NULL, 0, NULL, NULL, 0, NULL,
- &state->data, 96, &state->num_data);
+ &state->data, 100, &state->num_data);
TALLOC_FREE(subreq);
if (!NT_STATUS_IS_OK(status)) {
tevent_req_nterror(req, status);
@@ -834,7 +834,7 @@ struct tevent_req *cli_posix_stat_send(TALLOC_CTX *mem_ctx,
2, /* max returned param.
*/
NULL, /* data. */
0, /* num data. */
- 96); /* max returned data. */
+ 100); /* max returned data. */
if (tevent_req_nomem(subreq, req)) {
return tevent_req_post(req, ev);
@@ -853,7 +853,7 @@ NTSTATUS cli_posix_stat_recv(struct tevent_req *req,
return status;
}
- if (state->num_data != 96) {
+ if (state->num_data != 100) {
return NT_STATUS_DATA_ERROR;
}
@@ -881,7 +881,7 @@ NTSTATUS cli_posix_stat_recv(struct tevent_req *req,
#endif
sbuf->st_ex_ino = (SMB_INO_T)IVAL2_TO_SMB_BIG_UINT(state->data,76);
/* inode */
sbuf->st_ex_mode |= wire_perms_to_unix(IVAL(state->data,84)); /*
protection */
- sbuf->st_ex_nlink = IVAL(state->data,92); /* number of hard links */
+ sbuf->st_ex_nlink = BIG_UINT(state->data,92); /* number of hard links */
return NT_STATUS_OK;
}
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index b81eb83..12a27b1 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -4754,14 +4754,9 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
pdata = store_file_unix_basic(conn, pdata, fsp, psbuf);
data_size = PTR_DIFF(pdata,(*ppdata));
- {
- int i;
- DEBUG(4,("smbd_do_qfilepathinfo:
SMB_QUERY_FILE_UNIX_BASIC "));
-
- for (i=0; i<100; i++)
- DEBUG(4,("%d=%x, ",i, (*ppdata)[i]));
- DEBUG(4,("\n"));
- }
+ DEBUG(4,("smbd_do_qfilepathinfo: "
+ "SMB_QUERY_FILE_UNIX_BASIC\n"));
+ dump_data(4, (uint8_t *)(*ppdata), data_size);
break;
--
Samba Shared Repository
