svn commit: samba r21280 - in branches: SAMBA_3_0/source/smbd SAMBA_3_0_25/source/smbd

[vlendec at samba.org]

Author: vlendec
Date: 2007-02-11 14:55:21 +0000 (Sun, 11 Feb 2007)
New Revision: 21280

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

Log:
Fix an uninitialized variable warning. Jeremy, please check.

Volker

Modified:
   branches/SAMBA_3_0/source/smbd/close.c
   branches/SAMBA_3_0_25/source/smbd/close.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/close.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/close.c	2007-02-11 14:39:21 UTC (rev 21279)
+++ branches/SAMBA_3_0/source/smbd/close.c	2007-02-11 14:55:21 UTC (rev 21280)
@@ -452,7 +452,6 @@
 	if ((close_type == NORMAL_CLOSE || close_type == SHUTDOWN_CLOSE) &&
 				delete_dir &&
 				lck->delete_token) {
-		BOOL ok;
 	
 		/* Become the user who requested the delete. */
 
@@ -470,8 +469,9 @@
 
 		status = rmdir_internals(fsp->conn, fsp->fsp_name);
 
-		DEBUG(5,("close_directory: %s. Delete on close was set - deleting directory %s.\n",
-			fsp->fsp_name, ok ? "succeeded" : "failed" ));
+		DEBUG(5,("close_directory: %s. Delete on close was set - "
+			 "deleting directory returned %s.\n",
+			 fsp->fsp_name, nt_errstr(status)));
 
 		/* unbecome user. */
 		pop_sec_ctx();

Modified: branches/SAMBA_3_0_25/source/smbd/close.c
===================================================================
--- branches/SAMBA_3_0_25/source/smbd/close.c	2007-02-11 14:39:21 UTC (rev 21279)
+++ branches/SAMBA_3_0_25/source/smbd/close.c	2007-02-11 14:55:21 UTC (rev 21280)
@@ -465,7 +465,6 @@
 	if ((close_type == NORMAL_CLOSE || close_type == SHUTDOWN_CLOSE) &&
 				delete_dir &&
 				lck->delete_token) {
-		BOOL ok;
 	
 		/* Become the user who requested the delete. */
 
@@ -483,8 +482,9 @@
 
 		status = rmdir_internals(fsp->conn, fsp->fsp_name);
 
-		DEBUG(5,("close_directory: %s. Delete on close was set - deleting directory %s.\n",
-			fsp->fsp_name, ok ? "succeeded" : "failed" ));
+		DEBUG(5,("close_directory: %s. Delete on close was set - "
+			 "deleting directory returned %s.\n",
+			 fsp->fsp_name, nt_errstr(status)));
 
 		/* unbecome user. */
 		pop_sec_ctx();