Attachment 3583 Details for Bug 5761 – Patch for 3.2.x

[patch] Patch for 3.2.x

look (text/plain), 2.03 KB, created by Jeremy Allison on 2008-09-15 16:10:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2008-09-15 16:10:27 UTC

Size: 2.03 KB

patch

obsolete

>diff --git a/examples/libsmbclient/Makefile b/examples/libsmbclient/Makefile
>index e6afdeb..363abe0 100644
>--- a/examples/libsmbclient/Makefile
>+++ b/examples/libsmbclient/Makefile
>@@ -10,8 +10,8 @@ EXTLIB_INCL = -I/usr/include/gtk-1.2 \
> DEFS = -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
> CFLAGS = -O0 -g $(SAMBA_INCL) $(EXTLIB_INCL) $(DEFS)
> 
>-LDFLAGS = -L/usr/local/samba/lib \
>-	  -lldap -lkrb5 -lgssapi_krb5
>+LDFLAGS = -L/usr/local/samba/lib -Xlinker -rpath-link -Xlinker /usr/local/samba/lib \
>+	  -Xlinker -rpath -Xlinker /usr/local/samba/lib -lldap -lkrb5 -lgssapi_krb5
> #LIBSMBCLIENT = /usr/local/samba/lib/libsmbclient.so
> LIBSMBCLIENT = -lwbclient -lsmbclient -ldl -lresolv
> 
>diff --git a/source/smbd/open.c b/source/smbd/open.c
>index ea10cdc..afe8d5e 100644
>--- a/source/smbd/open.c
>+++ b/source/smbd/open.c
>@@ -1854,7 +1854,8 @@ NTSTATUS open_file_ntcreate(connection_struct *conn,
> 
> 	/* Handle strange delete on close create semantics. */
> 	if ((create_options & FILE_DELETE_ON_CLOSE)
>-	    && (is_ntfs_stream_name(fname)
>+	    && (((conn->fs_capabilities & FILE_NAMED_STREAMS)
>+			&& is_ntfs_stream_name(fname))
> 		|| can_set_initial_delete_on_close(lck))) {
> 		status = can_set_delete_on_close(fsp, True, new_dos_attributes);
> 
>@@ -2118,7 +2119,9 @@ NTSTATUS open_directory(connection_struct *conn,
> 		 (unsigned int)create_disposition,
> 		 (unsigned int)file_attributes));
> 
>-	if (!(file_attributes & FILE_FLAG_POSIX_SEMANTICS) && is_ntfs_stream_name(fname)) {
>+	if (!(file_attributes & FILE_FLAG_POSIX_SEMANTICS) &&
>+			(conn->fs_capabilities & FILE_NAMED_STREAMS) &&
>+			is_ntfs_stream_name(fname)) {
> 		DEBUG(2, ("open_directory: %s is a stream name!\n", fname));
> 		return NT_STATUS_NOT_A_DIRECTORY;
> 	}
>@@ -2961,7 +2964,8 @@ NTSTATUS create_file(connection_struct *conn,
> 			 * Check to see if this is a mac fork of some kind.
> 			 */
> 
>-			if (is_ntfs_stream_name(fname)) {
>+			if ((conn->fs_capabilities & FILE_NAMED_STREAMS) &&
>+					is_ntfs_stream_name(fname)) {
> 				status = NT_STATUS_OBJECT_PATH_NOT_FOUND;
> 				goto fail;
> 			}

Actions: View

Attachments on bug 5761: 3583 | 3584