summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
Diffstat (limited to 'source3')
-rw-r--r--source3/client/clitar.c2
-rw-r--r--source3/include/MacExtensions.h10
-rw-r--r--source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c2
-rw-r--r--source3/lib/privileges.c2
-rw-r--r--source3/lib/smbldap.c2
-rw-r--r--source3/lib/util_sock.c2
-rw-r--r--source3/libsmb/clireadwrite.c4
-rw-r--r--source3/registry/reg_objects.c4
-rw-r--r--source3/rpc_server/lsa/srv_lsa_nt.c2
-rw-r--r--source3/smbd/open.c2
-rw-r--r--source3/winbindd/winbindd_ads.c2
-rw-r--r--source3/winbindd/winbindd_cache.c2
-rw-r--r--source3/winbindd/winbindd_msrpc.c2
-rw-r--r--source3/winbindd/winbindd_pam.c4
14 files changed, 21 insertions, 21 deletions
diff --git a/source3/client/clitar.c b/source3/client/clitar.c
index 7eb3fa087eb..b4f914f5c8c 100644
--- a/source3/client/clitar.c
+++ b/source3/client/clitar.c
@@ -1387,7 +1387,7 @@ static NTSTATUS tar_create_skip_path(struct tar *t,
if (!isdir) {
- /* 1. if we dont want X and we have X, skip */
+ /* 1. if we don't want X and we have X, skip */
if (!t->mode.system && (mode & FILE_ATTRIBUTE_SYSTEM)) {
*_skip = true;
return NT_STATUS_OK;
diff --git a/source3/include/MacExtensions.h b/source3/include/MacExtensions.h
index 5b00998a95d..23dcde9737e 100644
--- a/source3/include/MacExtensions.h
+++ b/source3/include/MacExtensions.h
@@ -80,18 +80,18 @@ typedef struct _SambaAfpInfo
*/
/*
-** These extentions are only supported with the NT LM 0.12 Dialect. These extentions
+** These extensions are only supported with the NT LM 0.12 Dialect. These extentions
** will be process on a share by share bases.
*/
/*
-** Trans2_Query_FS_Information Call is used by the MacCIFS extentions for three reasons.
-** First to see if the remote server share supports the basic Macintosh CIFS extentions.
+** Trans2_Query_FS_Information Call is used by the MacCIFS extensions for three reasons.
+** First to see if the remote server share supports the basic Macintosh CIFS extensions.
** Second to return some basic need information about the share to the Macintosh.
-** Third to see if this share support any other Macintosh extentions.
+** Third to see if this share support any other Macintosh extensions.
**
** We will be using infromation levels that are betwwen 0x300 and 0x399 for all Macintosh
-** extentions calls. The first of these will be the SMB_MAC_QUERY_FS_INFO level which
+** extensions calls. The first of these will be the SMB_MAC_QUERY_FS_INFO level which
** will allow the server to return the MacQueryFSInfo structure. All fields are Little
** Endian unless other wise specified.
*/
diff --git a/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c b/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
index a2582a1d1f1..1e5d577e93a 100644
--- a/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
+++ b/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
@@ -1171,7 +1171,7 @@ static void callback_do_change(GtkWidget *widget,
box1 = gtk_vbox_new(FALSE, 0);
gtk_container_add(GTK_CONTAINER(window), box1);
- label = gtk_label_new("You can change the name and membership of this computer. Changes may affect access to network ressources.");
+ label = gtk_label_new("You can change the name and membership of this computer. Changes may affect access to network resources.");
gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
gtk_box_pack_start(GTK_BOX(box1), label, TRUE, TRUE, 0);
diff --git a/source3/lib/privileges.c b/source3/lib/privileges.c
index 19ee6880420..d3509c2267b 100644
--- a/source3/lib/privileges.c
+++ b/source3/lib/privileges.c
@@ -271,7 +271,7 @@ static int priv_traverse_fn(struct db_record *rec, void *state)
}
/*********************************************************************
- Retreive list of privileged SIDs (for _lsa_enumerate_accounts()
+ Retrieve list of privileged SIDs (for _lsa_enumerate_accounts()
*********************************************************************/
NTSTATUS privilege_enumerate_accounts(struct dom_sid **sids, int *num_sids)
diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c
index 75116d2cb64..1560f65c07a 100644
--- a/source3/lib/smbldap.c
+++ b/source3/lib/smbldap.c
@@ -301,7 +301,7 @@ static void smbldap_set_mod_internal(LDAPMod *** modlist, int modop, const char
return;
}
-#if 0 /* commented out after discussion with abartlet. Do not reenable.
+#if 0 /* commented out after discussion with abartlet. Do not re-enable.
left here so other do not re-add similar code --jerry */
if (value == NULL || *value == '\0')
return;
diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index 2939b4f1880..0e1a66c8273 100644
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -1070,7 +1070,7 @@ int get_remote_hostname(const struct tsocket_address *remote_address,
lookup_nc(&nc);
if (nc.name == NULL) {
- *name = talloc_strdup(mem_ctx, "UNKOWN");
+ *name = talloc_strdup(mem_ctx, "UNKNOWN");
} else {
*name = talloc_strdup(mem_ctx, nc.name);
}
diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c
index f0cb7ad291b..79bf416822a 100644
--- a/source3/libsmb/clireadwrite.c
+++ b/source3/libsmb/clireadwrite.c
@@ -296,7 +296,7 @@ struct cli_pull_state {
* The maximum is 256:
* - which would be a window of 256 MByte
* for SMB2 with multi-credit
- * or smb1 unix extentions.
+ * or smb1 unix extensions.
*/
uint16_t max_chunks;
uint16_t num_chunks;
@@ -1111,7 +1111,7 @@ struct cli_push_state {
* The maximum is 256:
* - which would be a window of 256 MByte
* for SMB2 with multi-credit
- * or smb1 unix extentions.
+ * or smb1 unix extensions.
*/
uint16_t max_chunks;
uint16_t num_chunks;
diff --git a/source3/registry/reg_objects.c b/source3/registry/reg_objects.c
index 2d48b2603e0..ded69e87f06 100644
--- a/source3/registry/reg_objects.c
+++ b/source3/registry/reg_objects.c
@@ -304,7 +304,7 @@ int regsubkey_ctr_numkeys( struct regsubkey_ctr *ctr )
}
/***********************************************************************
- Retreive a specific key string
+ Retrieve a specific key string
**********************************************************************/
char* regsubkey_ctr_specific_key( struct regsubkey_ctr *ctr, uint32_t key_index )
@@ -378,7 +378,7 @@ uint32_t regval_type(struct regval_blob *val)
}
/***********************************************************************
- Retreive a pointer to a specific value. Caller shoud dup the structure
+ Retrieve a pointer to a specific value. Caller shoud dup the structure
since this memory will go away when the ctr is free()'d
**********************************************************************/
diff --git a/source3/rpc_server/lsa/srv_lsa_nt.c b/source3/rpc_server/lsa/srv_lsa_nt.c
index 1e3f9f92a23..2d0d29e5f35 100644
--- a/source3/rpc_server/lsa/srv_lsa_nt.c
+++ b/source3/rpc_server/lsa/srv_lsa_nt.c
@@ -3905,7 +3905,7 @@ NTSTATUS _lsa_EnumTrustedDomainsEx(struct pipes_struct *p,
NTSTATUS nt_status;
/* bail out early if pdb backend is not capable of ex trusted domains,
- * if we dont do that, the client might not call
+ * if we don't do that, the client might not call
* _lsa_EnumTrustedDomains() afterwards - gd */
if (!(pdb_capabilities() & PDB_CAP_TRUSTED_DOMAINS_EX)) {
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index ef1505dd354..c34742e1330 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -153,7 +153,7 @@ NTSTATUS smbd_check_access_rights(struct connection_struct *conn,
* Samba 3.6 and earlier granted execute access even
* if the ACL did not contain execute rights.
* Samba 4.0 is more correct and checks it.
- * The compatibilty mode allows to skip this check
+ * The compatibilty mode allows one to skip this check
* to smoothen upgrades.
*/
if (lp_acl_allow_execute_always(SNUM(conn))) {
diff --git a/source3/winbindd/winbindd_ads.c b/source3/winbindd/winbindd_ads.c
index 78350fd8549..b373be57698 100644
--- a/source3/winbindd/winbindd_ads.c
+++ b/source3/winbindd/winbindd_ads.c
@@ -646,7 +646,7 @@ static NTSTATUS query_user(struct winbindd_domain *domain,
TALLOC_FREE(user);
if (info->full_name == NULL) {
- /* this might fail so we dont check the return code */
+ /* this might fail so we don't check the return code */
wcache_query_user_fullname(domain,
mem_ctx,
sid,
diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
index 4e270ca4dbc..ae9d11f7322 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -3100,7 +3100,7 @@ void wcache_invalidate_samlogon(struct winbindd_domain *domain,
fstring key_str, sid_string;
struct winbind_cache *cache;
- /* dont clear cached U/SID and UG/SID entries when we want to logon
+ /* don't clear cached U/SID and UG/SID entries when we want to logon
* offline - gd */
if (lp_winbind_offline_logon()) {
diff --git a/source3/winbindd/winbindd_msrpc.c b/source3/winbindd/winbindd_msrpc.c
index 4080b123048..41217475862 100644
--- a/source3/winbindd/winbindd_msrpc.c
+++ b/source3/winbindd/winbindd_msrpc.c
@@ -443,7 +443,7 @@ static NTSTATUS msrpc_query_user(struct winbindd_domain *domain,
user->base.full_name.string);
if (user_info->full_name == NULL) {
- /* this might fail so we dont check the return code */
+ /* this might fail so we don't check the return code */
wcache_query_user_fullname(domain,
mem_ctx,
user_sid,
diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index 78b26250543..89104235555 100644
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -1841,7 +1841,7 @@ process_result:
cached_info3->base.full_name.string);
} else {
- /* this might fail so we dont check the return code */
+ /* this might fail so we don't check the return code */
wcache_query_user_fullname(domain,
info3,
&user_sid,
@@ -2002,7 +2002,7 @@ process_result:
cached_info3->base.full_name.string);
} else {
- /* this might fail so we dont check the return code */
+ /* this might fail so we don't check the return code */
wcache_query_user_fullname(domain,
*info3,
&user_sid,
View Lorry Controller Status