summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-06-05 14:40:57 +0200
committerStefan Metzmacher <metze@samba.org>2012-06-06 10:18:40 +0200
commitd4aa494654a3fb2ff6dbfe7133b8f4023c4f192b (patch)
treec3b1676bc3559fe9f5341b9098d5c820b0c61e45
parentd45e0ddfcdfc005717b1596342af5ab133c19177 (diff)
downloadsamba-d4aa494654a3fb2ff6dbfe7133b8f4023c4f192b.tar.gz
samba-d4aa494654a3fb2ff6dbfe7133b8f4023c4f192b.tar.bz2
samba-d4aa494654a3fb2ff6dbfe7133b8f4023c4f192b.zip
s3:include: change smb_request->vuid to uint64_t
metze
-rw-r--r--source3/include/vfs.h2
-rw-r--r--source3/smbd/reply.c7
2 files changed, 5 insertions, 4 deletions
diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 5c341862e1..ec139a72e7 100644
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -349,7 +349,7 @@ struct smb_request {
uint16 smbpid;
uint64_t mid; /* For compatibility with SMB2. */
uint32_t seqnum;
- uint16 vuid;
+ uint64_t vuid; /* For compatibility with SMB2. */
uint16 tid;
uint8 wct;
const uint16_t *vwv;
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index f89631707b..2ea41b4c41 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -2080,8 +2080,8 @@ void reply_ulogoffX(struct smb_request *req)
vuser = get_valid_user_struct(sconn, req->vuid);
if(vuser == NULL) {
- DEBUG(3,("ulogoff, vuser id %d does not map to user.\n",
- req->vuid));
+ DEBUG(3,("ulogoff, vuser id %llu does not map to user.\n",
+ (unsigned long long)req->vuid));
req->vuid = UID_FIELD_INVALID;
reply_force_doserror(req, ERRSRV, ERRbaduid);
@@ -2101,7 +2101,8 @@ void reply_ulogoffX(struct smb_request *req)
SSVAL(req->outbuf, smb_vwv0, 0xff); /* andx chain ends */
SSVAL(req->outbuf, smb_vwv1, 0); /* no andx offset */
- DEBUG( 3, ( "ulogoffX vuid=%d\n", req->vuid ) );
+ DEBUG(3, ("ulogoffX vuid=%llu\n",
+ (unsigned long long)req->vuid));
END_PROFILE(SMBulogoffX);
req->vuid = UID_FIELD_INVALID;