summaryrefslogtreecommitdiff
path: root/source4/smb_server
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2004-06-27 11:06:10 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:56:46 -0500
commit37fcf2236433bc5e74f19d2afac3d1d0055dcd01 (patch)
treecf08fa2697fe228737d81291a5645b91d3f03b72 /source4/smb_server
parent27f245a2199f2ce8d007810992d13b3a2c7560fa (diff)
downloadsamba-37fcf2236433bc5e74f19d2afac3d1d0055dcd01.tar.gz
samba-37fcf2236433bc5e74f19d2afac3d1d0055dcd01.tar.bz2
samba-37fcf2236433bc5e74f19d2afac3d1d0055dcd01.zip
r1268: varient -> variant
(This used to be commit de5984c95602ca67e8ac3139c3aa4330b74266e0)
Diffstat (limited to 'source4/smb_server')
-rw-r--r--source4/smb_server/reply.c12
-rw-r--r--source4/smb_server/sesssetup.c2
2 files changed, 7 insertions, 7 deletions
diff --git a/source4/smb_server/reply.c b/source4/smb_server/reply.c
index 341dddf26b..984d1be705 100644
--- a/source4/smb_server/reply.c
+++ b/source4/smb_server/reply.c
@@ -159,7 +159,7 @@ void reply_tcon_and_X(struct request_context *req)
return;
}
- /* construct reply - two varients */
+ /* construct reply - two variants */
if (req->smb->negotiate.protocol < PROTOCOL_NT1) {
req_setup_reply(req, 2, 0);
@@ -658,7 +658,7 @@ void reply_readbraw(struct request_context *req)
io.readbraw.level = RAW_READ_READBRAW;
- /* there are two varients, one with 10 and one with 8 command words */
+ /* there are two variants, one with 10 and one with 8 command words */
if (req->in.wct != 10) {
REQ_CHECK_WCT(req, 8);
}
@@ -669,7 +669,7 @@ void reply_readbraw(struct request_context *req)
io.readbraw.in.maxcnt = SVAL(req->in.vwv, VWV(4));
io.readbraw.in.timeout = IVAL(req->in.vwv, VWV(5));
- /* the 64 bit varient */
+ /* the 64 bit variant */
if (req->in.wct == 10) {
uint32_t offset_high = IVAL(req->in.vwv, VWV(8));
io.readbraw.in.offset |= (((SMB_OFF_T)offset_high) << 32);
@@ -875,7 +875,7 @@ void reply_read_and_X(struct request_context *req)
io->readx.in.mincnt = SVAL(req->in.vwv, VWV(6));
io->readx.in.remaining = SVAL(req->in.vwv, VWV(9));
- /* the 64 bit varient */
+ /* the 64 bit variant */
if (req->in.wct == 12) {
uint32_t offset_high = IVAL(req->in.vwv, VWV(10));
io->readx.in.offset |= (((uint64_t)offset_high) << 32);
@@ -1732,7 +1732,7 @@ void reply_lockingX(struct request_context *req)
total_locks = lck->lockx.in.ulock_cnt + lck->lockx.in.lock_cnt;
- /* there are two varients, one with 64 bit offsets and counts */
+ /* there are two variants, one with 64 bit offsets and counts */
if (lck->lockx.in.mode & LOCKING_ANDX_LARGE_FILES) {
lck_size = 20;
} else {
@@ -2091,7 +2091,7 @@ void reply_sesssetup(struct request_context *req)
return;
}
- /* unsupported varient */
+ /* unsupported variant */
req_reply_error(req, NT_STATUS_FOOBAR);
}
diff --git a/source4/smb_server/sesssetup.c b/source4/smb_server/sesssetup.c
index 12b17c366a..dcaf25bb84 100644
--- a/source4/smb_server/sesssetup.c
+++ b/source4/smb_server/sesssetup.c
@@ -143,7 +143,7 @@ static NTSTATUS sesssetup_spnego(struct request_context *req, union smb_sesssetu
}
/*
- backend for sessionsetup call - this takes all 3 varients of the call
+ backend for sessionsetup call - this takes all 3 variants of the call
*/
NTSTATUS sesssetup_backend(struct request_context *req,
union smb_sesssetup *sess)