The branch, master has been updated
via 8adbd1c srv_epmapper.c: Fix typo.
via 240df6c wb_samba3_cmd.c: Fix typo in comment.
via b22b22d brlock_tdb.c: Fix typo in comment.
via 75ca814 srv_netlog_nt.c: Fix typo in comment.
via 6eb59eb brlock.c: Fix typo in comment.
via 38cb141 vfs_gpfs: Fix typos in comments.
via 2ed035b fault.c: Fix typo in comment.
via 68b2e30 docs: Fix typo.
from dcc94f0 s4-nbt: Ensure source4/ nbt client and server honour
'disable netbios'
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 8adbd1cf75492869f7fd1935eb211a070ef924cc
Author: Karolin Seeger <[email protected]>
Date: Mon Feb 18 10:25:09 2013 +0100
srv_epmapper.c: Fix typo.
priviledge -> privilege
Signed-off-by: Karolin Seeger <[email protected]>
Autobuild-User(master): Andrew Bartlett <[email protected]>
Autobuild-Date(master): Mon Feb 18 13:57:40 CET 2013 on sn-devel-104
commit 240df6c7b05e3c5c7be80d7607824147f360d64e
Author: Karolin Seeger <[email protected]>
Date: Mon Feb 18 10:05:23 2013 +0100
wb_samba3_cmd.c: Fix typo in comment.
redundent -> redundant
Signed-off-by: Karolin Seeger <[email protected]>
commit b22b22dccac6d3bdf7f02d9fe037a472df7956fd
Author: Karolin Seeger <[email protected]>
Date: Mon Feb 18 10:04:42 2013 +0100
brlock_tdb.c: Fix typo in comment.
redundent -> redundant
Signed-off-by: Karolin Seeger <[email protected]>
commit 75ca814f1efe435da018f7604865fda7ac59f712
Author: Karolin Seeger <[email protected]>
Date: Mon Feb 18 10:03:51 2013 +0100
srv_netlog_nt.c: Fix typo in comment.
redundent -> redundant
Signed-off-by: Karolin Seeger <[email protected]>
commit 6eb59eb388ac7b98f7f7812e45ad4c8d333f03e8
Author: Karolin Seeger <[email protected]>
Date: Mon Feb 18 10:02:51 2013 +0100
brlock.c: Fix typo in comment.
redundent -> redundant
Signed-off-by: Karolin Seeger <[email protected]>
commit 38cb1410f5107f42ddea9cbf9555adb273b35b18
Author: Karolin Seeger <[email protected]>
Date: Mon Feb 18 10:01:21 2013 +0100
vfs_gpfs: Fix typos in comments.
Signed-off-by: Karolin Seeger <[email protected]>
commit 2ed035b5a064e21f57c89adc9c947ffa7721c600
Author: Karolin Seeger <[email protected]>
Date: Mon Feb 18 09:59:52 2013 +0100
fault.c: Fix typo in comment.
redundent -> redundant
Signed-off-by: Karolin Seeger <[email protected]>
commit 68b2e30ae62d8a563cb7ee35e10c45fe0266c612
Author: Karolin Seeger <[email protected]>
Date: Wed Feb 6 09:08:15 2013 +0100
docs: Fix typo.
Signed-off-by: Karolin Seeger <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
.../smbdotconf/printing/showaddprinterwizard.xml | 2 +-
lib/util/fault.c | 2 +-
prog_guide4.txt | 6 +++---
source3/locking/brlock.c | 2 +-
source3/modules/vfs_gpfs.c | 4 ++--
source3/rpc_server/epmapper/srv_epmapper.c | 10 +++++-----
source3/rpc_server/netlogon/srv_netlog_nt.c | 2 +-
source4/ntvfs/common/brlock_tdb.c | 2 +-
source4/winbind/wb_samba3_cmd.c | 2 +-
9 files changed, 16 insertions(+), 16 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/smbdotconf/printing/showaddprinterwizard.xml
b/docs-xml/smbdotconf/printing/showaddprinterwizard.xml
index f6c1b90..f24bdb5 100644
--- a/docs-xml/smbdotconf/printing/showaddprinterwizard.xml
+++ b/docs-xml/smbdotconf/printing/showaddprinterwizard.xml
@@ -14,7 +14,7 @@
<para>Under normal circumstances, the Windows NT/2000 client will
open a handle on the printer server with OpenPrinterEx() asking for
Administrator privileges. If the user does not have administrative
- access on the print server (i.e is not root or the priviledge
+ access on the print server (i.e is not root or has granted the
SePrintOperatorPrivilege), the OpenPrinterEx()
call fails and the client makes another open call with a request for
a lower privilege level. This should succeed, however the APW
diff --git a/lib/util/fault.c b/lib/util/fault.c
index 4f8e8db..13d29db 100644
--- a/lib/util/fault.c
+++ b/lib/util/fault.c
@@ -76,7 +76,7 @@ static void fault_report(int sig)
smb_panic("internal error");
- /* smb_panic() never returns, so this is really redundent */
+ /* smb_panic() never returns, so this is really redundant */
exit(1);
}
diff --git a/prog_guide4.txt b/prog_guide4.txt
index c8c91c4..0a33284 100644
--- a/prog_guide4.txt
+++ b/prog_guide4.txt
@@ -267,7 +267,7 @@ parser where to find the following four variables, but they
should
In Samba3 there were unwritten rules about which variables in a
structure a high level caller has to fill in and which ones are filled
in by the marshalling code. In Samba4 those rules are gone, because
-the redundent artifact variables are gone. The high level caller just
+the redundant artifact variables are gone. The high level caller just
sets up the real variables and the marshalling code worries about
generating the right offsets.
@@ -286,10 +286,10 @@ read the comment in smb_interfaces.h about that now.
So, here is another rule to code by. When writing an interface
structure think carefully about what variables in the structure can be
-left out as they are redundent. If some length is effectively defined
+left out as they are redundant. If some length is effectively defined
twice on the wire then only put it once in the packet. If a length can
be inferred from a null termination then do that and leave the length
-out of the structure completely. Don't put redundent stuff in
+out of the structure completely. Don't put redundant stuff in
structures!
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index b7abaa9..c5bbcd1 100644
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -82,7 +82,7 @@ static bool brl_overlap(const struct lock_struct *lck1,
const struct lock_struct *lck2)
{
/* XXX Remove for Win7 compatibility. */
- /* this extra check is not redundent - it copes with locks
+ /* this extra check is not redundant - it copes with locks
that go beyond the end of 64 bit file space */
if (lck1->size != 0 &&
lck1->start == lck2->start &&
diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index 622bea4..f4db292 100644
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -359,7 +359,7 @@ static int gpfs_get_nfs4_acl(const char *fname, SMB4ACL_T
**ppacl)
smbace.who.uid = gace->aceWho;
}
- /* remove redundent deny entries */
+ /* remove redundant deny entries */
if (i > 0 && gace->aceType == SMB_ACE4_ACCESS_DENIED_ACE_TYPE) {
struct gpfs_ace_v4 *prev = &gacl->ace_v4[i-1];
if (prev->aceType == SMB_ACE4_ACCESS_ALLOWED_ACE_TYPE &&
@@ -367,7 +367,7 @@ static int gpfs_get_nfs4_acl(const char *fname, SMB4ACL_T
**ppacl)
prev->aceIFlags == gace->aceIFlags &&
(gace->aceMask & prev->aceMask) == 0 &&
gace->aceWho == prev->aceWho) {
- /* its redundent - skip it */
+ /* it's redundant - skip it */
continue;
}
}
diff --git a/source3/rpc_server/epmapper/srv_epmapper.c
b/source3/rpc_server/epmapper/srv_epmapper.c
index ac215cb..17db5a4 100644
--- a/source3/rpc_server/epmapper/srv_epmapper.c
+++ b/source3/rpc_server/epmapper/srv_epmapper.c
@@ -232,7 +232,7 @@ static uint32_t build_ep_list(TALLOC_CTX *mem_ctx,
return total;
}
-static bool is_priviledged_pipe(struct auth_session_info *info) {
+static bool is_privileged_pipe(struct auth_session_info *info) {
/* If the user is not root, or has the system token, fail */
if ((info->unix_token->uid != sec_initial_uid()) &&
!security_token_is_system(info->security_token)) {
@@ -303,9 +303,9 @@ error_status_t _epm_Insert(struct pipes_struct *p,
struct dcesrv_iface *iface;
bool add_ep;
- /* If this is not a priviledged users, return */
+ /* If this is not a privileged users, return */
if (p->transport != NCALRPC ||
- !is_priviledged_pipe(p->session_info)) {
+ !is_privileged_pipe(p->session_info)) {
p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
return EPMAPPER_STATUS_CANT_PERFORM_OP;
}
@@ -440,9 +440,9 @@ error_status_t _epm_Delete(struct pipes_struct *p,
DEBUG(3, ("_epm_Delete: Trying to delete %u entries.\n",
r->in.num_ents));
- /* If this is not a priviledged users, return */
+ /* If this is not a privileged users, return */
if (p->transport != NCALRPC ||
- !is_priviledged_pipe(p->session_info)) {
+ !is_privileged_pipe(p->session_info)) {
p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
return EPMAPPER_STATUS_CANT_PERFORM_OP;
}
diff --git a/source3/rpc_server/netlogon/srv_netlog_nt.c
b/source3/rpc_server/netlogon/srv_netlog_nt.c
index a355dd1..e5da138 100644
--- a/source3/rpc_server/netlogon/srv_netlog_nt.c
+++ b/source3/rpc_server/netlogon/srv_netlog_nt.c
@@ -649,7 +649,7 @@ static NTSTATUS get_md4pw(struct samr_Password *md4pw,
const char *mach_acct,
#if 0
/*
- * Currently this code is redundent as we already have a filter
+ * Currently this code is redundant as we already have a filter
* by hostname list. What this code really needs to do is to
* get a hosts allowed/hosts denied list from the SAM database
* on a per user basis, and make the access decision there.
diff --git a/source4/ntvfs/common/brlock_tdb.c
b/source4/ntvfs/common/brlock_tdb.c
index 5c89b41..c6d736e 100644
--- a/source4/ntvfs/common/brlock_tdb.c
+++ b/source4/ntvfs/common/brlock_tdb.c
@@ -151,7 +151,7 @@ static bool brl_tdb_same_context(struct lock_context *ctx1,
struct lock_context
static bool brl_tdb_overlap(struct lock_struct *lck1,
struct lock_struct *lck2)
{
- /* this extra check is not redundent - it copes with locks
+ /* this extra check is not redundant - it copes with locks
that go beyond the end of 64 bit file space */
if (lck1->size != 0 &&
lck1->start == lck2->start &&
diff --git a/source4/winbind/wb_samba3_cmd.c b/source4/winbind/wb_samba3_cmd.c
index 54b1dcc..cb323dd 100644
--- a/source4/winbind/wb_samba3_cmd.c
+++ b/source4/winbind/wb_samba3_cmd.c
@@ -48,7 +48,7 @@ static NTSTATUS wb_samba3_append_info3_as_txt(TALLOC_CTX
*mem_ctx,
info3 = talloc(mem_ctx, struct netr_SamInfo3);
NT_STATUS_HAVE_NO_MEMORY(info3);
- /* The Samba3 protocol has a redundent 4 bytes at the start */
+ /* The Samba3 protocol has a redundant 4 bytes at the start */
info3b.data += 4;
info3b.length -= 4;
--
Samba Shared Repository
