s3: smbd: Rename srv_calculate_sign_mac() -> smb1_srv_calculate_sign_mac().

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 aa71f339b7d700ecbe93da8f7f345f35707cbc5e..2bacc3671c131e7d9b6cf8ff88999be342a95917 100644 (file)
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -234,7 +234,7 @@ bool srv_send_smb(struct smbXsrv_connection *xconn, char *buffer,
                NTSTATUS status;
 
                /* Sign the outgoing packet if required. */
-               status = srv_calculate_sign_mac(xconn, buf_out, seqnum);
+               status = smb1_srv_calculate_sign_mac(xconn, buf_out, seqnum);
                if (!NT_STATUS_IS_OK(status)) {
                        DBG_ERR("Failed to calculate signing mac: %s\n",
                                nt_errstr(status));

diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index b6e40b2c7271f93afb0025f48ed33ba3dfada5fe..60bab2835b9efd106779f236e67fed83ebd74cc4 100644 (file)
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -54,7 +54,7 @@ struct dcesrv_context;
 
 bool smb1_srv_check_sign_mac(struct smbXsrv_connection *conn,
                        const char *inbuf, uint32_t *seqnum, bool trusted_channel);
-NTSTATUS srv_calculate_sign_mac(struct smbXsrv_connection *conn,
+NTSTATUS smb1_srv_calculate_sign_mac(struct smbXsrv_connection *conn,
                                char *outbuf, uint32_t seqnum);
 void srv_cancel_sign_response(struct smbXsrv_connection *conn);
 bool srv_init_signing(struct smbXsrv_connection *conn);

diff --git a/source3/smbd/signing.c b/source3/smbd/signing.c
index 8869131374b08545c4ab0d343601f6346304d434..c7be0065eb8fcbc08e42b4da8d6e97506251a1db 100644 (file)
--- a/source3/smbd/signing.c
+++ b/source3/smbd/signing.c
@@ -75,7 +75,7 @@ bool smb1_srv_check_sign_mac(struct smbXsrv_connection *conn,
  Called to sign an outgoing packet to the client.
 ************************************************************/
 
-NTSTATUS srv_calculate_sign_mac(struct smbXsrv_connection *conn,
+NTSTATUS smb1_srv_calculate_sign_mac(struct smbXsrv_connection *conn,
                                char *outbuf, uint32_t seqnum)
 {
        uint8_t *outhdr;