s3: smbd: Rename srv_set_signing_negotiated() -> smb1_srv_set_signing_negotiated().

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

diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index bb8fdc16a7127c485c1bf473736efa42f876c323..9b367c8e9432ad8319732c6c3899652d86f01c4f 100644 (file)
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -58,7 +58,7 @@ NTSTATUS smb1_srv_calculate_sign_mac(struct smbXsrv_connection *conn,
                                char *outbuf, uint32_t seqnum);
 void smb1_srv_cancel_sign_response(struct smbXsrv_connection *conn);
 bool srv_init_signing(struct smbXsrv_connection *conn);
-void srv_set_signing_negotiated(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 srv_is_signing_negotiated(struct smbXsrv_connection *conn);

diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index 6803f542d959a5498c8f55e0456df6370cefe873..c80cbfb2eb0329b464fa969a3cd16ec7ceb22ab6 100644 (file)
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -621,11 +621,11 @@ void reply_sesssetup_and_X(struct smb_request *req)
        }
 
        /*
-        * We can call srv_set_signing_negotiated() each time.
+        * We can call smb1_srv_set_signing_negotiated() each time.
         * It finds out when it needs to turn into a noop
         * itself.
         */
-       srv_set_signing_negotiated(xconn,
+       smb1_srv_set_signing_negotiated(xconn,
                                   signing_allowed,
                                   signing_mandatory);
 

diff --git a/source3/smbd/signing.c b/source3/smbd/signing.c
index f9cd3b7f303a3b234da54c680ed03515e0da0a96..cac31d2c50d62be0e86e2149f7e8c53807036d20 100644 (file)
--- a/source3/smbd/signing.c
+++ b/source3/smbd/signing.c
@@ -258,7 +258,7 @@ bool srv_init_signing(struct smbXsrv_connection *conn)
        }
 }
 
-void srv_set_signing_negotiated(struct smbXsrv_connection *conn,
+void smb1_srv_set_signing_negotiated(struct smbXsrv_connection *conn,
                                bool allowed, bool mandatory)
 {
        smb1_signing_set_negotiated(conn->smb1.signing_state,