svn commit: samba r15826 - in branches/SAMBA_4_0/source/ntvfs/unixuid: .

[tridge at samba.org]

Author: tridge
Date: 2006-05-23 03:53:23 +0000 (Tue, 23 May 2006)
New Revision: 15826

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

Log:

ensure we don't dereference sec when NULL

Modified:
   branches/SAMBA_4_0/source/ntvfs/unixuid/vfs_unixuid.c


Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/unixuid/vfs_unixuid.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/unixuid/vfs_unixuid.c	2006-05-23 03:52:57 UTC (rev 15825)
+++ branches/SAMBA_4_0/source/ntvfs/unixuid/vfs_unixuid.c	2006-05-23 03:53:23 UTC (rev 15826)
@@ -191,7 +191,8 @@
 	NTSTATUS status2; \
 	struct unix_sec_ctx *sec; \
 	status = unixuid_setup_security(ntvfs, req, &sec); \
-	if (NT_STATUS_IS_OK(status)) status = ntvfs_next_##op args; \
+	NT_STATUS_NOT_OK_RETURN(status); \
+	status = ntvfs_next_##op args; \
 	status2 = set_unix_security(sec); \
 	if (!NT_STATUS_IS_OK(status2)) smb_panic("Unable to reset security context"); \
 } while (0)