Streamline logic, reducing the amount of indentation.

Michael

diff --git a/source/rpc_server/srv_srvsvc_nt.c b/source/rpc_server/srv_srvsvc_nt.c
index 27bc807367183966a9901e18acef6cd5bca91053..55c30c5315a545e619143779f5f3bf73cb3cbf96 100644 (file)
--- a/source/rpc_server/srv_srvsvc_nt.c
+++ b/source/rpc_server/srv_srvsvc_nt.c
@@ -2033,22 +2033,21 @@ WERROR _srv_net_file_query_secdesc(pipes_struct *p, SRV_Q_NET_FILE_QUERY_SECDESC
        }
 
        nt_status = open_file_stat(conn, NULL, filename, &st, &fsp);
-       if ( !NT_STATUS_IS_OK(nt_status)) {
-               /* Perhaps it is a directory */
-               if (NT_STATUS_EQUAL(nt_status, NT_STATUS_FILE_IS_A_DIRECTORY))
-                       nt_status = open_directory(conn, NULL, filename, &st,
-                                       READ_CONTROL_ACCESS,
-                                       FILE_SHARE_READ|FILE_SHARE_WRITE,
-                                       FILE_OPEN,
-                                       0,
-                                       FILE_ATTRIBUTE_DIRECTORY,
-                                       NULL, &fsp);
-
-               if (!NT_STATUS_IS_OK(nt_status)) {
-                       DEBUG(3,("_srv_net_file_query_secdesc: Unable to open file %s\n", filename));
-                       r_u->status = ntstatus_to_werror(nt_status);
-                       goto error_exit;
-               }
+       /* Perhaps it is a directory */
+       if (NT_STATUS_EQUAL(nt_status, NT_STATUS_FILE_IS_A_DIRECTORY)) {
+               nt_status = open_directory(conn, NULL, filename, &st,
+                                          READ_CONTROL_ACCESS,
+                                          FILE_SHARE_READ|FILE_SHARE_WRITE,
+                                          FILE_OPEN,
+                                          0,
+                                          FILE_ATTRIBUTE_DIRECTORY,
+                                          NULL, &fsp);
+       }
+
+       if (!NT_STATUS_IS_OK(nt_status)) {
+               DEBUG(3,("_srv_net_file_query_secdesc: Unable to open file %s\n", filename));
+               r_u->status = ntstatus_to_werror(nt_status);
+               goto error_exit;
        }
 
        sd_size = SMB_VFS_GET_NT_ACL(fsp, fsp->fsp_name, (OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION), &psd);