s3:pylibsmb: Rename libsmb_samba_internal Py bindings to libsmb

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13676

Signed-off-by: Tim Beale <timbeale@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>

diff --git a/python/samba/tests/dcerpc/raw_testcase.py b/python/samba/tests/dcerpc/raw_testcase.py
index 3a50ceb53304b0dfc5c494df245b798efa1dd331..ec299bff4743d1fe906d8da7f0ff56ca4cf68550 100644 (file)
--- a/python/samba/tests/dcerpc/raw_testcase.py
+++ b/python/samba/tests/dcerpc/raw_testcase.py
@@ -35,15 +35,15 @@ from samba.ntstatus import (
 )
 from samba import NTSTATUSError
 from samba.samba3 import param as s3param
-from samba.samba3 import libsmb_samba_internal
+from samba.samba3 import libsmb
 
 class smb_pipe_socket(object):
 
     def __init__(self, target_hostname, pipename, creds, impersonation_level, lp):
         lp3 = s3param.get_context()
         lp3.load(lp.configfile)
-        self.smbconn = libsmb_samba_internal.Conn(target_hostname, 'IPC$', lp3,
-                                                  credentials=creds, sign=True)
+        self.smbconn = libsmb.Conn(target_hostname, 'IPC$', lp3,
+                                   credentials=creds, sign=True)
         self.smbfid = self.smbconn.create(pipename,
                                           DesiredAccess=0x12019f,
                                           ShareAccess=0x7,

diff --git a/python/samba/tests/libsmb_samba_internal.py b/python/samba/tests/libsmb_samba_internal.py
index ebfed94831542f1adaf3c63c9dc8edc66b0104ef..5a37b09978b446adf3d951bf90d6d5f06e45dd77 100644 (file)
--- a/python/samba/tests/libsmb_samba_internal.py
+++ b/python/samba/tests/libsmb_samba_internal.py
@@ -15,9 +15,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-"""Tests for samba.samba3.libsmb_samba_internal."""
+"""Tests for samba.samba3.libsmb."""
 
-from samba.samba3 import libsmb_samba_internal
+from samba.samba3 import libsmb
 from samba.dcerpc import security
 from samba.samba3 import param as s3param
 from samba import credentials
@@ -59,9 +59,9 @@ class LibsmbTestCase(samba.tests.TestCase):
         creds.set_username(os.getenv("USERNAME"))
         creds.set_password(os.getenv("PASSWORD"))
 
-        c = libsmb_samba_internal.Conn(os.getenv("SERVER_IP"), "tmp",
-                                       lp, creds, multi_threaded=True,
-                                       force_smb1=True)
+        c = libsmb.Conn(os.getenv("SERVER_IP"), "tmp",
+                        lp, creds, multi_threaded=True,
+                        force_smb1=True)
 
         mythreads = []
 

diff --git a/python/samba/tests/smb.py b/python/samba/tests/smb.py
index 9700953d57a3d395483d95eedfbd95eecbff142d..fcb0b7fd7b8ea8900a6abcc07194549aa104cdec 100644 (file)
--- a/python/samba/tests/smb.py
+++ b/python/samba/tests/smb.py
@@ -19,11 +19,10 @@ import samba
 import os
 import random
 import sys
-from samba import smb
 from samba import NTSTATUSError
 from samba.ntstatus import (NT_STATUS_OBJECT_NAME_NOT_FOUND,
                             NT_STATUS_OBJECT_PATH_NOT_FOUND)
-from samba.samba3 import libsmb_samba_internal
+from samba.samba3 import libsmb
 from samba.samba3 import param as s3param
 
 PY3 = sys.version_info[0] == 3
@@ -47,8 +46,7 @@ class SMBTests(samba.tests.TestCase):
         # create an SMB connection to the server
         lp = s3param.get_context()
         lp.load(os.getenv("SMB_CONF_PATH"))
-        self.smb_conn = libsmb_samba_internal.Conn(self.server, "sysvol",
-                                                   lp, creds)
+        self.smb_conn = libsmb.Conn(self.server, "sysvol", lp, creds)
 
         self.smb_conn.mkdir(test_dir)
 

diff --git a/source3/libsmb/pylibsmb.c b/source3/libsmb/pylibsmb.c
index 452c30e949051a2172a55a70a500a7b20e56c259..21c8b4e388b0b475905f57f1b3e7ff6200474a4e 100644 (file)
--- a/source3/libsmb/pylibsmb.c
+++ b/source3/libsmb/pylibsmb.c
@@ -1526,7 +1526,7 @@ static PyMethodDef py_cli_state_methods[] = {
 
 static PyTypeObject py_cli_state_type = {
        PyVarObject_HEAD_INIT(NULL, 0)
-       .tp_name = "libsmb_samba_internal.Conn",
+       .tp_name = "libsmb.Conn",
        .tp_basicsize = sizeof(struct py_cli_state),
        .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
        .tp_doc = "libsmb connection",
@@ -1540,17 +1540,17 @@ static PyMethodDef py_libsmb_methods[] = {
        { NULL },
 };
 
-void initlibsmb_samba_internal(void);
+void initlibsmb(void);
 
 static struct PyModuleDef moduledef = {
     PyModuleDef_HEAD_INIT,
-    .m_name = "libsmb_samba_internal",
+    .m_name = "libsmb",
     .m_doc = "libsmb wrapper",
     .m_size = -1,
     .m_methods = py_libsmb_methods,
 };
 
-MODULE_INIT_FUNC(libsmb_samba_internal)
+MODULE_INIT_FUNC(libsmb)
 {
        PyObject *m = NULL;
 

diff --git a/source3/wscript_build b/source3/wscript_build
index a8ea8e581df24e9eddb52a02d798657747ea9434..9d188a8d36a6fbec66bc75231f605c3959241a7d 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -1323,7 +1323,7 @@ for env in bld.gen_python_environments():
     bld.SAMBA3_PYTHON('pylibsmb',
                   source='libsmb/pylibsmb.c',
                   deps='smbclient samba-credentials %s' % pycredentials,
-                  realname='samba/samba3/libsmb_samba_internal.so'
+                  realname='samba/samba3/libsmb.so'
                   )
 
 bld.SAMBA3_BINARY('spotlight2sparql',