svn commit: samba r20845 - in branches/SAMBA_3_0/source/smbd: .

[jra at samba.org]

Author: jra
Date: 2007-01-17 02:44:27 +0000 (Wed, 17 Jan 2007)
New Revision: 20845

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20845

Log:
Somehow I missed this one - should have been part of the
previous commit :-(.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/smbd/open.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/open.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/open.c	2007-01-17 02:09:37 UTC (rev 20844)
+++ branches/SAMBA_3_0/source/smbd/open.c	2007-01-17 02:44:27 UTC (rev 20845)
@@ -1189,8 +1189,9 @@
 		remove_deferred_open_smb_message(mid);
 	}
 
-	if (!check_name(fname,conn)) {
-		return map_nt_error_from_unix(errno);
+	status = check_name(conn, fname);
+	if (!NT_STATUS_IS_OK(status)) {
+		return status;
 	} 
 
 	new_dos_attributes &= SAMBA_ATTRIBUTES_MASK;
@@ -1885,6 +1886,7 @@
 	mode_t mode;
 	char *parent_dir;
 	const char *dirname;
+	NTSTATUS status;
 
 	if(!CAN_WRITE(conn)) {
 		DEBUG(5,("mkdir_internal: failing create on read-only share "
@@ -1892,8 +1894,9 @@
 		return NT_STATUS_ACCESS_DENIED;
 	}
 
-	if (!check_name(name, conn)) {
-		return map_nt_error_from_unix(errno);
+	status = check_name(conn, name);
+	if (!NT_STATUS_IS_OK(status)) {
+		return status;
 	}
 
 	if (!parent_dirname_talloc(tmp_talloc_ctx(), name, &parent_dir,