s3: smbd: Rename srv_is_signing_active() -> smb1_srv_is_signing_active().

Signed-off-by: Jeremy Allison <jra@samba.org>
Signed-off-by: David Mulder <dmulder@samba.org>

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 2bacc3671c131e7d9b6cf8ff88999be342a95917..c7a346d8619b3037b2638d585990463e6a73aa53 100644 (file)
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -502,7 +502,7 @@ static NTSTATUS receive_smb_raw_talloc(TALLOC_CTX *mem_ctx,
        if (CVAL(lenbuf,0) == 0 && min_recv_size &&
            (smb_len_large(lenbuf) > /* Could be a UNIX large writeX. */
                (min_recv_size + STANDARD_WRITE_AND_X_HEADER_SIZE)) &&
-           !srv_is_signing_active(xconn) &&
+           !smb1_srv_is_signing_active(xconn) &&
            xconn->smb1.echo_handler.trusted_fde == NULL) {
 
                return receive_smb_raw_talloc_partial_read(
@@ -1458,7 +1458,7 @@ static void smb1srv_update_crypto_flags(struct smbXsrv_session *session,
                encrypt_flag = SMBXSRV_PROCESSED_ENCRYPTED_PACKET;
        }
 
-       if (srv_is_signing_active(req->xconn)) {
+       if (smb1_srv_is_signing_active(req->xconn)) {
                sign_flag = SMBXSRV_PROCESSED_SIGNED_PACKET;
        } else if ((type == SMBecho) || (type == SMBsesssetupX)) {
                /*

diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 9b367c8e9432ad8319732c6c3899652d86f01c4f..40dbdc7c7e366d7a24a5d60eba8292ada73d7beb 100644 (file)
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -60,7 +60,7 @@ void smb1_srv_cancel_sign_response(struct smbXsrv_connection *conn);
 bool srv_init_signing(struct smbXsrv_connection *conn);
 void smb1_srv_set_signing_negotiated(struct smbXsrv_connection *conn,
                                bool allowed, bool mandatory);
-bool srv_is_signing_active(struct smbXsrv_connection *conn);
+bool smb1_srv_is_signing_active(struct smbXsrv_connection *conn);
 bool srv_is_signing_negotiated(struct smbXsrv_connection *conn);
 void srv_set_signing(struct smbXsrv_connection *conn,
                     const DATA_BLOB user_session_key,

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index a4eb7799ccfd35277440e5b5c814457aa3f6bfa9..9b3db2c123d3cd1b7b43448390dbfe9118772e7c 100644 (file)
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -3608,7 +3608,7 @@ void reply_readbraw(struct smb_request *req)
 
        START_PROFILE(SMBreadbraw);
 
-       if (srv_is_signing_active(xconn) || req->encrypted) {
+       if (smb1_srv_is_signing_active(xconn) || req->encrypted) {
                exit_server_cleanly("reply_readbraw: SMB signing/sealing is active - "
                        "raw reads/writes are disallowed.");
        }
@@ -4286,7 +4286,7 @@ static size_t calc_max_read_pdu(const struct smb_request *req)
                return xconn->smb1.sessions.max_send;
        }
 
-       if (srv_is_signing_active(xconn)) {
+       if (smb1_srv_is_signing_active(xconn)) {
                return 0x1FFFF;
        }
 
@@ -4510,7 +4510,7 @@ void reply_writebraw(struct smb_request *req)
         */
        SCVAL(discard_const_p(uint8_t, req->inbuf),smb_com,SMBwritec);
 
-       if (srv_is_signing_active(xconn)) {
+       if (smb1_srv_is_signing_active(xconn)) {
                END_PROFILE(SMBwritebraw);
                exit_server_cleanly("reply_writebraw: SMB signing is active - "
                                "raw reads/writes are disallowed.");

diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index 2a527234e98237ca15c513de769576701d641849..d30b4908457032f85fcf90ee35aa2e84a022ec52 100644 (file)
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -861,7 +861,7 @@ static NTSTATUS make_connection_snum(struct smbXsrv_connection *xconn,
                        signing_active = smb2_signing_key_valid(
                                                session->global->encryption_key);
                } else {
-                       signing_active = srv_is_signing_active(xconn);
+                       signing_active = smb1_srv_is_signing_active(xconn);
                }
                dbgtext( "%s", signing_active ? "signed " : "");
                dbgtext( "connect to service %s ",

diff --git a/source3/smbd/signing.c b/source3/smbd/signing.c
index cac31d2c50d62be0e86e2149f7e8c53807036d20..6b2d74d94d778f32322957c8e0a8f72447ebdc0f 100644 (file)
--- a/source3/smbd/signing.c
+++ b/source3/smbd/signing.c
@@ -270,7 +270,7 @@ void smb1_srv_set_signing_negotiated(struct smbXsrv_connection *conn,
  reads/writes if it is.
 ************************************************************/
 
-bool srv_is_signing_active(struct smbXsrv_connection *conn)
+bool smb1_srv_is_signing_active(struct smbXsrv_connection *conn)
 {
        return smb1_signing_is_active(conn->smb1.signing_state);
 }

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 3e0e2db75c314d3b01ccc9872b5e0314a8877cdf..857007c24fb4eed17c4b27f8a01bf318630b95d9 100644 (file)
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -3912,8 +3912,8 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned
                case SMB_QUERY_CIFS_UNIX_INFO:
                {
                        bool large_write = lp_min_receive_file_size() &&
-                                       !srv_is_signing_active(xconn);
-                       bool large_read = !srv_is_signing_active(xconn);
+                                       !smb1_srv_is_signing_active(xconn);
+                       bool large_read = !smb1_srv_is_signing_active(xconn);
                        int encrypt_caps = 0;
 
                        if (!lp_smb1_unix_extensions()) {