[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-899-ged34311

[Volker Lendecke]

The branch, v3-2-test has been updated
       via  ed343114cd0844a7fd14b45f95c0f43a6d172a42 (commit)
      from  d1f82b7e67a791e19d08c682b607d82ae649feb4 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit ed343114cd0844a7fd14b45f95c0f43a6d172a42
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Mar 30 22:08:17 2008 +0200

    Remove two pointless else branches

-----------------------------------------------------------------------

Summary of changes:
 source/smbd/nttrans.c |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/smbd/nttrans.c b/source/smbd/nttrans.c
index e8dae70..ae7bd8b 100644
--- a/source/smbd/nttrans.c
+++ b/source/smbd/nttrans.c
@@ -498,11 +498,10 @@ void reply_ntcreate_and_X(struct smb_request *req)
 			do_ntcreate_pipe_open(conn, req);
 			END_PROFILE(SMBntcreateX);
 			return;
-		} else {
-			reply_doserror(req, ERRDOS, ERRnoaccess);
-			END_PROFILE(SMBntcreateX);
-			return;
 		}
+		reply_doserror(req, ERRDOS, ERRnoaccess);
+		END_PROFILE(SMBntcreateX);
+		return;
 	}
 
 	oplock_request = (flags & REQUEST_OPLOCK) ? EXCLUSIVE_OPLOCK : 0;
@@ -871,10 +870,9 @@ static void call_nt_transact_create(connection_struct *conn,
 				ppparams, parameter_count,
 				ppdata, data_count);
 			return;
-		} else {
-			reply_doserror(req, ERRDOS, ERRnoaccess);
-			return;
 		}
+		reply_doserror(req, ERRDOS, ERRnoaccess);
+		return;
 	}
 
 	/*


-- 
Samba Shared Repository