s3: libcli: Rename smb_signing_init() -> smb1_signing_init()

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

diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c
index d65c3f2e179e7964dc3ec792762c136a4f3a06fe..9a8854c17b5bfb9c8e95c2cfcaf9eac94f4a65fb 100644 (file)
--- a/libcli/smb/smbXcli_base.c
+++ b/libcli/smb/smbXcli_base.c
@@ -425,7 +425,7 @@ struct smbXcli_conn *smbXcli_conn_create(TALLOC_CTX *mem_ctx,
        conn->smb1.mid = 1;
 
        /* initialise signing */
-       conn->smb1.signing = smb_signing_init(conn,
+       conn->smb1.signing = smb1_signing_init(conn,
                                              conn->allow_signing,
                                              conn->desire_signing,
                                              conn->mandatory_signing);

diff --git a/libcli/smb/smb_signing.c b/libcli/smb/smb_signing.c
index 9a46ea6f955bf7b8bf0fffb6970a7054fed357ac..7d959d239093aef6c00dadd3b079d97e165020ab 100644 (file)
--- a/libcli/smb/smb_signing.c
+++ b/libcli/smb/smb_signing.c
@@ -110,7 +110,7 @@ struct smb1_signing_state *smb1_signing_init_ex(TALLOC_CTX *mem_ctx,
        return si;
 }
 
-struct smb1_signing_state *smb_signing_init(TALLOC_CTX *mem_ctx,
+struct smb1_signing_state *smb1_signing_init(TALLOC_CTX *mem_ctx,
                                           bool allowed,
                                           bool desired,
                                           bool mandatory)

diff --git a/libcli/smb/smb_signing.h b/libcli/smb/smb_signing.h
index a6b73eaa6645aa3cfdae0528b8bb51f4a313a209..78ed4430baa50ad9965a4b12b072be0189b5e54d 100644 (file)
--- a/libcli/smb/smb_signing.h
+++ b/libcli/smb/smb_signing.h
@@ -24,7 +24,7 @@
 
 struct smb1_signing_state;
 
-struct smb1_signing_state *smb_signing_init(TALLOC_CTX *mem_ctx,
+struct smb1_signing_state *smb1_signing_init(TALLOC_CTX *mem_ctx,
                                           bool allowed,
                                           bool desired,
                                           bool mandatory);

diff --git a/source3/smbd/signing.c b/source3/smbd/signing.c
index afce3d0f985f8e92da31a459920ea6823e0d73e2..bd79421f940869ddf937c51e6412610954d854a9 100644 (file)
--- a/source3/smbd/signing.c
+++ b/source3/smbd/signing.c
@@ -223,7 +223,7 @@ static bool smb1_srv_init_signing(struct smbXsrv_connection *conn)
                return true;
        }
 
-       conn->smb1.signing_state = smb_signing_init(conn,
+       conn->smb1.signing_state = smb1_signing_init(conn,
                                                    allowed, desired, mandatory);
        if (!conn->smb1.signing_state) {
                return false;