diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h
index ba2c76764d1..344a997cbd2 100644
--- a/source3/include/smb_macros.h
+++ b/source3/include/smb_macros.h
@@ -302,7 +302,4 @@ do { \
 #define ADD_TO_LARGE_ARRAY(mem_ctx, type, elem, array, num, size) \
 	add_to_large_array((mem_ctx), sizeof(type), &(elem), (void *)(array), (num), (size));
 
-#define trans_oob(bufsize, offset, length) \
-	smb_buffer_oob(bufsize, offset, length)
-
 #endif /* _SMB_MACROS_H */
diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index e300b6b96de..f1d0a9483f6 100644
--- a/source3/libsmb/clifile.c
+++ b/source3/libsmb/clifile.c
@@ -6240,7 +6240,7 @@ static void cli_notify_done(struct tevent_req *subreq)
 		ssize_t ret;
 		char *name;
 
-		if (trans_oob(num_params, ofs + 12, len)) {
+		if (smb_buffer_oob(num_params, ofs + 12, len)) {
 			TALLOC_FREE(params);
 			tevent_req_nterror(
 				req, NT_STATUS_INVALID_NETWORK_RESPONSE);
diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c
index 9349b9485e8..16419052b74 100644
--- a/source3/libsmb/clireadwrite.c
+++ b/source3/libsmb/clireadwrite.c
@@ -238,7 +238,7 @@ static void cli_read_andx_done(struct tevent_req *subreq)
 
 	state->buf = discard_const_p(uint8_t, smb_base(inbuf)) + SVAL(vwv+6, 0);
 
-	if (trans_oob(smb_len_tcp(inbuf), SVAL(vwv+6, 0), state->received)
+	if (smb_buffer_oob(smb_len_tcp(inbuf), SVAL(vwv+6, 0), state->received)
 	    || ((state->received != 0) && (state->buf < bytes))) {
 		DEBUG(5, ("server returned invalid read&x data offset\n"));
 		tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
diff --git a/source3/libsmb/reparse_symlink.c b/source3/libsmb/reparse_symlink.c
index b0b51814a55..3e0de7111bb 100644
--- a/source3/libsmb/reparse_symlink.c
+++ b/source3/libsmb/reparse_symlink.c
@@ -128,14 +128,14 @@ bool symlink_reparse_buffer_parse(
 			   (int)reparse_data_length));
 		return false;
 	}
-	if (trans_oob(srclen - 8, reparse_data_length, 0)) {
+	if (smb_buffer_oob(srclen - 8, reparse_data_length, 0)) {
 		DEBUG(10, ("reparse_data_length (%d) too large for "
 			   "src_len (%d)\n", (int)reparse_data_length,
 			   (int)srclen));
 		return false;
 	}
-	if (trans_oob(reparse_data_length - 12, substitute_name_offset,
-		      substitute_name_length)) {
+	if (smb_buffer_oob(reparse_data_length - 12, substitute_name_offset,
+			   substitute_name_length)) {
 		DEBUG(10, ("substitute_name (%d/%d) does not fit in "
 			   "reparse_data_length (%d)\n",
 			   (int)substitute_name_offset,
@@ -143,8 +143,8 @@ bool symlink_reparse_buffer_parse(
 			   (int)reparse_data_length - 12));
 		return false;
 	}
-	if (trans_oob(reparse_data_length - 12, print_name_offset,
-		      print_name_length)) {
+	if (smb_buffer_oob(reparse_data_length - 12, print_name_offset,
+			   print_name_length)) {
 		DEBUG(10, ("print_name (%d/%d) does not fit in "
 			   "reparse_data_length (%d)\n",
 			   (int)print_name_offset,
diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c
index cf3b7c91c22..46904b980a2 100644
--- a/source3/smbd/ipc.c
+++ b/source3/smbd/ipc.c
@@ -731,8 +731,8 @@ void reply_trans(struct smb_request *req)
 
 	if (state->total_data)  {
 
-		if (trans_oob(state->total_data, 0, dscnt)
-		    || trans_oob(smb_len(req->inbuf), dsoff, dscnt)) {
+		if (smb_buffer_oob(state->total_data, 0, dscnt)
+		    || smb_buffer_oob(smb_len(req->inbuf), dsoff, dscnt)) {
 			goto bad_param;
 		}
 
@@ -755,8 +755,8 @@ void reply_trans(struct smb_request *req)
 
 	if (state->total_param) {
 
-		if (trans_oob(state->total_param, 0, pscnt)
-		    || trans_oob(smb_len(req->inbuf), psoff, pscnt)) {
+		if (smb_buffer_oob(state->total_param, 0, pscnt)
+		    || smb_buffer_oob(smb_len(req->inbuf), psoff, pscnt)) {
 			goto bad_param;
 		}
 
@@ -907,16 +907,16 @@ void reply_transs(struct smb_request *req)
 		goto bad_param;
 
 	if (pcnt) {
-		if (trans_oob(state->total_param, pdisp, pcnt)
-		    || trans_oob(smb_len(req->inbuf), poff, pcnt)) {
+		if (smb_buffer_oob(state->total_param, pdisp, pcnt)
+		    || smb_buffer_oob(smb_len(req->inbuf), poff, pcnt)) {
 			goto bad_param;
 		}
 		memcpy(state->param+pdisp,smb_base(req->inbuf)+poff,pcnt);
 	}
 
 	if (dcnt) {
-		if (trans_oob(state->total_data, ddisp, dcnt)
-		    || trans_oob(smb_len(req->inbuf), doff, dcnt)) {
+		if (smb_buffer_oob(state->total_data, ddisp, dcnt)
+		    || smb_buffer_oob(smb_len(req->inbuf), doff, dcnt)) {
 			goto bad_param;
 		}
 		memcpy(state->data+ddisp, smb_base(req->inbuf)+doff,dcnt);
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index ffff822e221..f381714e129 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -3227,8 +3227,8 @@ void reply_nttrans(struct smb_request *req)
 
 	if (state->total_data)  {
 
-		if (trans_oob(state->total_data, 0, dscnt)
-		    || trans_oob(smb_len(req->inbuf), dsoff, dscnt)) {
+		if (smb_buffer_oob(state->total_data, 0, dscnt)
+		    || smb_buffer_oob(smb_len(req->inbuf), dsoff, dscnt)) {
 			goto bad_param;
 		}
 
@@ -3248,8 +3248,8 @@ void reply_nttrans(struct smb_request *req)
 
 	if (state->total_param) {
 
-		if (trans_oob(state->total_param, 0, pscnt)
-		    || trans_oob(smb_len(req->inbuf), psoff, pscnt)) {
+		if (smb_buffer_oob(state->total_param, 0, pscnt)
+		    || smb_buffer_oob(smb_len(req->inbuf), psoff, pscnt)) {
 			goto bad_param;
 		}
 
@@ -3396,16 +3396,16 @@ void reply_nttranss(struct smb_request *req)
 		goto bad_param;
 
 	if (pcnt) {
-		if (trans_oob(state->total_param, pdisp, pcnt)
-		    || trans_oob(smb_len(req->inbuf), poff, pcnt)) {
+		if (smb_buffer_oob(state->total_param, pdisp, pcnt)
+		    || smb_buffer_oob(smb_len(req->inbuf), poff, pcnt)) {
 			goto bad_param;
 		}
 		memcpy(state->param+pdisp, smb_base(req->inbuf)+poff,pcnt);
 	}
 
 	if (dcnt) {
-		if (trans_oob(state->total_data, ddisp, dcnt)
-		    || trans_oob(smb_len(req->inbuf), doff, dcnt)) {
+		if (smb_buffer_oob(state->total_data, ddisp, dcnt)
+		    || smb_buffer_oob(smb_len(req->inbuf), doff, dcnt)) {
 			goto bad_param;
 		}
 		memcpy(state->data+ddisp, smb_base(req->inbuf)+doff,dcnt);
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index a86ac3228e3..b0fb02b7c78 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -10312,8 +10312,8 @@ void reply_trans2(struct smb_request *req)
 
 	if (state->total_data) {
 
-		if (trans_oob(state->total_data, 0, dscnt)
-		    || trans_oob(smb_len(req->inbuf), dsoff, dscnt)) {
+		if (smb_buffer_oob(state->total_data, 0, dscnt)
+		    || smb_buffer_oob(smb_len(req->inbuf), dsoff, dscnt)) {
 			goto bad_param;
 		}
 
@@ -10334,8 +10334,8 @@ void reply_trans2(struct smb_request *req)
 
 	if (state->total_param) {
 
-		if (trans_oob(state->total_param, 0, pscnt)
-		    || trans_oob(smb_len(req->inbuf), psoff, pscnt)) {
+		if (smb_buffer_oob(state->total_param, 0, pscnt)
+		    || smb_buffer_oob(smb_len(req->inbuf), psoff, pscnt)) {
 			goto bad_param;
 		}
 
@@ -10456,16 +10456,16 @@ void reply_transs2(struct smb_request *req)
 		goto bad_param;
 
 	if (pcnt) {
-		if (trans_oob(state->total_param, pdisp, pcnt)
-		    || trans_oob(smb_len(req->inbuf), poff, pcnt)) {
+		if (smb_buffer_oob(state->total_param, pdisp, pcnt)
+		    || smb_buffer_oob(smb_len(req->inbuf), poff, pcnt)) {
 			goto bad_param;
 		}
 		memcpy(state->param+pdisp,smb_base(req->inbuf)+poff,pcnt);
 	}
 
 	if (dcnt) {
-		if (trans_oob(state->total_data, ddisp, dcnt)
-		    || trans_oob(smb_len(req->inbuf), doff, dcnt)) {
+		if (smb_buffer_oob(state->total_data, ddisp, dcnt)
+		    || smb_buffer_oob(smb_len(req->inbuf), doff, dcnt)) {
 			goto bad_param;
 		}
 		memcpy(state->data+ddisp, smb_base(req->inbuf)+doff,dcnt);