diff options
| -rw-r--r-- | docs-xml/Samba3-HOWTO/TOSHARG-DomainMember.xml | 2 | ||||
| -rw-r--r-- | docs-xml/using_samba/appf.xml | 2 | ||||
| -rw-r--r-- | source3/change-log | 2 | ||||
| -rw-r--r-- | source3/rpc_server/srv_samr_nt.c | 4 | ||||
| -rw-r--r-- | source3/winbindd/winbindd_misc.c | 2 | ||||
| -rw-r--r-- | source4/build/m4/check_path.m4 | 2 | ||||
| -rwxr-xr-x | source4/client/tests/test_smbclient.sh | 2 | ||||
| -rw-r--r-- | source4/libnet/libnet_samsync_ldb.c | 2 | ||||
| -rw-r--r-- | source4/librpc/idl/irpc.idl | 2 | ||||
| -rw-r--r-- | source4/torture/rpc/samsync.c | 2 |
10 files changed, 11 insertions, 11 deletions
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-DomainMember.xml b/docs-xml/Samba3-HOWTO/TOSHARG-DomainMember.xml index fb66f661aa..d0178632ee 100644 --- a/docs-xml/Samba3-HOWTO/TOSHARG-DomainMember.xml +++ b/docs-xml/Samba3-HOWTO/TOSHARG-DomainMember.xml @@ -484,7 +484,7 @@ with the version of Windows. A Samba administrator account (i.e., a Samba account that has <literal>root</literal> privileges on the Samba server) must be entered here; the operation will fail if an ordinary user account is given. The necessary privilege can be assured by creating a Samba SAM account for <literal>root</literal> or - by granting the <literal>SeMachineAccountPrivilege</literal> privilage to the user account. + by granting the <literal>SeMachineAccountPrivilege</literal> privilege to the user account. </para> <para> diff --git a/docs-xml/using_samba/appf.xml b/docs-xml/using_samba/appf.xml index b4965f0d13..031484f98d 100644 --- a/docs-xml/using_samba/appf.xml +++ b/docs-xml/using_samba/appf.xml @@ -38,7 +38,7 @@ <para>The default guest account was <literal>nobody</literal>, uid -1, which produced log messages on one of our machines saying "your server is being unfriendly," so we created a specific Samba guest account for browsing and printing:</para> -<programlisting># superuser account - admin privilages to shares, with no +<programlisting># superuser account - admin privileges to shares, with no # restrictions # WARNING - use this with care: files can be modified, # regardless of file permissions diff --git a/source3/change-log b/source3/change-log index 1f7798b541..b614802724 100644 --- a/source3/change-log +++ b/source3/change-log @@ -1440,7 +1440,7 @@ changes to samba. This change-log is now obsolete. timezone - attempted alignment fixups (to speed up memcpy) - added some DCE/DFS support (thanks to Jim Doyle <doyle@oec.com>) - - added fix so that root doesn't have special privilages to open + - added fix so that root doesn't have special privileges to open readonly files for writing (but admin users do). This fixes the MS office install problem. - fixed trans2 response bug in client diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c index 10b7d42d46..9af141b6f8 100644 --- a/source3/rpc_server/srv_samr_nt.c +++ b/source3/rpc_server/srv_samr_nt.c @@ -2272,7 +2272,7 @@ NTSTATUS _samr_OpenUser(pipes_struct *p, se_map_generic(&des_access, &usr_generic_mapping); /* - * Get the sampass first as we need to check privilages + * Get the sampass first as we need to check privileges * based on what kind of user object this is. * But don't reveal info too early if it didn't exist. */ @@ -2320,7 +2320,7 @@ NTSTATUS _samr_OpenUser(pipes_struct *p, * Cheat - allow GENERIC_RIGHTS_USER_WRITE if pipe user is * in DOMAIN_GROUP_RID_ADMINS. This is almost certainly not * what Windows does but is a hack for people who haven't - * set up privilages on groups in Samba. + * set up privileges on groups in Samba. */ if (acb_info & (ACB_SVRTRUST|ACB_DOMTRUST)) { if (lp_enable_privileges() && nt_token_check_domain_rid(p->server_info->ptok, diff --git a/source3/winbindd/winbindd_misc.c b/source3/winbindd/winbindd_misc.c index 9e62a1b102..1917718462 100644 --- a/source3/winbindd/winbindd_misc.c +++ b/source3/winbindd/winbindd_misc.c @@ -465,7 +465,7 @@ void winbindd_netbios_name(struct winbindd_cli_state *state) request_ok(state); } -/* Where can I find the privilaged pipe? */ +/* Where can I find the privileged pipe? */ void winbindd_priv_pipe_dir(struct winbindd_cli_state *state) { diff --git a/source4/build/m4/check_path.m4 b/source4/build/m4/check_path.m4 index 08a304b0d0..fb6b8aa804 100644 --- a/source4/build/m4/check_path.m4 +++ b/source4/build/m4/check_path.m4 @@ -97,7 +97,7 @@ AC_ARG_WITH(winbindd-socket-dir, esac]) ################################################# -# set where the winbindd privilaged socket should be put +# set where the winbindd privileged socket should be put AC_ARG_WITH(winbindd-privileged-socket-dir, [AS_HELP_STRING([--with-winbindd-privileged-socket-dir=DIR],[Where to put the winbindd socket ($winbindd_privileged_socket_dir)])], [ case "$withval" in diff --git a/source4/client/tests/test_smbclient.sh b/source4/client/tests/test_smbclient.sh index 20ecc18707..2fd5b56ca0 100755 --- a/source4/client/tests/test_smbclient.sh +++ b/source4/client/tests/test_smbclient.sh @@ -112,7 +112,7 @@ runcmd "Removing file" 'rm tmpfilex'|| failed=`expr $failed + 1` runcmd "Lookup name" "lookup $DOMAIN\\$USERNAME" || failed=`expr $failed + 1` -#Fails unless there are privilages +#Fails unless there are privileges #runcmd "Lookup privs of name" "privileges $DOMAIN\\$USERNAME" || failed=`expr $failed + 1` # do some simple operations using old protocol versions diff --git a/source4/libnet/libnet_samsync_ldb.c b/source4/libnet/libnet_samsync_ldb.c index 5bb75ca30d..041ab7d5bf 100644 --- a/source4/libnet/libnet_samsync_ldb.c +++ b/source4/libnet/libnet_samsync_ldb.c @@ -1039,7 +1039,7 @@ static NTSTATUS samsync_ldb_delete_account(TALLOC_CTX *mem_ctx, } samdb_msg_add_delete(state->sam_ldb, mem_ctx, msg, - "privilage"); + "privilege"); ret = samdb_replace(state->sam_ldb, mem_ctx, msg); if (ret != 0) { diff --git a/source4/librpc/idl/irpc.idl b/source4/librpc/idl/irpc.idl index 24326e434e..03a931661e 100644 --- a/source4/librpc/idl/irpc.idl +++ b/source4/librpc/idl/irpc.idl @@ -52,7 +52,7 @@ import "misc.idl", "security.idl", "nbt.idl"; [out,switch_is(level)] nbtd_info info ); - /* Send a GetDCName from the privilaged port (owned by nbtd), + /* Send a GetDCName from the privileged port (owned by nbtd), * and await a reply */ void nbtd_getdcname( diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c index 2ee8e59e5a..3845b6cb44 100644 --- a/source4/torture/rpc/samsync.c +++ b/source4/torture/rpc/samsync.c @@ -1123,7 +1123,7 @@ static bool samsync_handle_account(TALLOC_CTX *mem_ctx, struct samsync_state *sa } for (j=0;j<account->privilege_entries; j++) { if (!found_priv_in_lsa[j]) { - printf("Privilage %s on account %s not found in LSA\n", account->privilege_name[j].string, + printf("Privilege %s on account %s not found in LSA\n", account->privilege_name[j].string, dom_sid_string(mem_ctx, dom_sid)); ret = false; } |