diff options
-rw-r--r-- | docs-xml/manpages-3/vfs_crossrename.8.xml | 2 | ||||
-rw-r--r-- | source3/lib/util_sock.c | 2 | ||||
-rw-r--r-- | source3/smbd/filename.c | 6 | ||||
-rw-r--r-- | source3/smbd/vfs.c | 2 | ||||
-rw-r--r-- | source3/winbindd/idmap_hash/idmap_hash.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/docs-xml/manpages-3/vfs_crossrename.8.xml b/docs-xml/manpages-3/vfs_crossrename.8.xml index f5a4444739e..ba7c7c84197 100644 --- a/docs-xml/manpages-3/vfs_crossrename.8.xml +++ b/docs-xml/manpages-3/vfs_crossrename.8.xml @@ -31,7 +31,7 @@ <para>The <command>vfs_crossrename</command> VFS module allows server side rename operations even if source and target are on - differen physical devices. A "move" in Explorer is usually a + different physical devices. A "move" in Explorer is usually a rename operation if it is inside of a single share or device. Usually such a rename operation returns NT_STATUS_NOT_SAME_DEVICE and the client has to move the file by diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c index 6782249bf6e..64cd74c328a 100644 --- a/source3/lib/util_sock.c +++ b/source3/lib/util_sock.c @@ -159,7 +159,7 @@ int get_socket_port(int fd) if (getsockname(fd, (struct sockaddr *)&sa, &length) < 0) { int level = (errno == ENOTCONN) ? 2 : 0; - DEBUG(level, ("getpeername failed. Error was %s\n", + DEBUG(level, ("getsockname failed. Error was %s\n", strerror(errno))); return -1; } diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c index 7bc86074008..bd783232f68 100644 --- a/source3/smbd/filename.c +++ b/source3/smbd/filename.c @@ -370,7 +370,7 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx, start = smb_fname->base_name; /* - * If we're providing case insentive semantics or + * If we're providing case insensitive semantics or * the underlying filesystem is case insensitive, * then a case-normalized hit in the stat-cache is * authoratitive. JRA. @@ -388,7 +388,7 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx, /* * Make sure "dirpath" is an allocated string, we use this for - * building the directories with asprintf and free it. + * building the directories with talloc_asprintf and free it. */ if ((dirpath == NULL) && (!(dirpath = talloc_strdup(ctx,"")))) { @@ -454,7 +454,7 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx, /* * A special case - if we don't have any wildcards or mangling chars and are case - * sensitive or the underlying filesystem is case insentive then searching + * sensitive or the underlying filesystem is case insensitive then searching * won't help. */ diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c index ee70a3d583f..c636cbcb5e3 100644 --- a/source3/smbd/vfs.c +++ b/source3/smbd/vfs.c @@ -929,7 +929,7 @@ NTSTATUS check_reduced_name(connection_struct *conn, const char *fname) status = NT_STATUS_OBJECT_PATH_NOT_FOUND; } - DEBUG(3,("check_reduce_named: " + DEBUG(3,("check_reduce_name: " "couldn't get realpath for " "%s (%s)\n", fname, diff --git a/source3/winbindd/idmap_hash/idmap_hash.c b/source3/winbindd/idmap_hash/idmap_hash.c index 08e283cd57f..c52a90f82b7 100644 --- a/source3/winbindd/idmap_hash/idmap_hash.c +++ b/source3/winbindd/idmap_hash/idmap_hash.c @@ -114,7 +114,7 @@ static NTSTATUS be_init(struct idmap_domain *dom, size_t num_domains = 0; int i; - /* If the domain SID hash talbe has been initialized, assume + /* If the domain SID hash table has been initialized, assume that we completed this function previously */ if ( hashed_domains ) { |