sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-04 08:22:08 +03:00
Code Activity

s3:pylibsmb: Rename libsmb_samba_internal Py bindings to libsmb

Browse Source 
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>
This commit is contained in:
Tim Beale
2018-12-13 12:32:17 +13:00
committed by Tim Beale
parent 01079b50a9
commit 8662ff6720
5 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
python/samba/tests/dcerpc/raw_testcase.py
View File

@ -35,15 +35,15 @@ from samba.ntstatus import (
) )
from samba import NTSTATUSError from samba import NTSTATUSError
from samba.samba3 import param as s3param from samba.samba3 import param as s3param
from samba.samba3 import libsmb_samba_internal from samba.samba3 import libsmb
class smb_pipe_socket(object): class smb_pipe_socket(object):
def __init__(self, target_hostname, pipename, creds, impersonation_level, lp): def __init__(self, target_hostname, pipename, creds, impersonation_level, lp):
lp3 = s3param.get_context() lp3 = s3param.get_context()
lp3.load(lp.configfile) lp3.load(lp.configfile)
self.smbconn = libsmb_samba_internal.Conn(target_hostname, 'IPC$', lp3, self.smbconn = libsmb.Conn(target_hostname, 'IPC$', lp3,
credentials=creds, sign=True) credentials=creds, sign=True)
self.smbfid = self.smbconn.create(pipename, self.smbfid = self.smbconn.create(pipename,
DesiredAccess=0x12019f, DesiredAccess=0x12019f,
ShareAccess=0x7, ShareAccess=0x7,

10
python/samba/tests/libsmb_samba_internal.py
View File

@ -15,9 +15,9 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # 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.dcerpc import security
from samba.samba3 import param as s3param from samba.samba3 import param as s3param
from samba import credentials from samba import credentials
@ -59,9 +59,9 @@ class LibsmbTestCase(samba.tests.TestCase):
creds.set_username(os.getenv("USERNAME")) creds.set_username(os.getenv("USERNAME"))
creds.set_password(os.getenv("PASSWORD")) creds.set_password(os.getenv("PASSWORD"))
c = libsmb_samba_internal.Conn(os.getenv("SERVER_IP"), "tmp", c = libsmb.Conn(os.getenv("SERVER_IP"), "tmp",
lp, creds, multi_threaded=True, lp, creds, multi_threaded=True,
force_smb1=True) force_smb1=True)
mythreads = [] mythreads = []

6
python/samba/tests/smb.py
View File

@ -19,11 +19,10 @@ import samba
import os import os
import random import random
import sys import sys
from samba import smb
from samba import NTSTATUSError from samba import NTSTATUSError
from samba.ntstatus import (NT_STATUS_OBJECT_NAME_NOT_FOUND, from samba.ntstatus import (NT_STATUS_OBJECT_NAME_NOT_FOUND,
NT_STATUS_OBJECT_PATH_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 from samba.samba3 import param as s3param
PY3 = sys.version_info[0] == 3 PY3 = sys.version_info[0] == 3
@ -47,8 +46,7 @@ class SMBTests(samba.tests.TestCase):
# create an SMB connection to the server # create an SMB connection to the server
lp = s3param.get_context() lp = s3param.get_context()
lp.load(os.getenv("SMB_CONF_PATH")) lp.load(os.getenv("SMB_CONF_PATH"))
self.smb_conn = libsmb_samba_internal.Conn(self.server, "sysvol", self.smb_conn = libsmb.Conn(self.server, "sysvol", lp, creds)
lp, creds)
self.smb_conn.mkdir(test_dir) self.smb_conn.mkdir(test_dir)

8
source3/libsmb/pylibsmb.c
View File

@ -1526,7 +1526,7 @@ static PyMethodDef py_cli_state_methods[] = {
static PyTypeObject py_cli_state_type = { static PyTypeObject py_cli_state_type = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
.tp_name = "libsmb_samba_internal.Conn", .tp_name = "libsmb.Conn",
.tp_basicsize = sizeof(struct py_cli_state), .tp_basicsize = sizeof(struct py_cli_state),
.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
.tp_doc = "libsmb connection", .tp_doc = "libsmb connection",
@ -1540,17 +1540,17 @@ static PyMethodDef py_libsmb_methods[] = {
{ NULL }, { NULL },
}; };
void initlibsmb_samba_internal(void); void initlibsmb(void);
static struct PyModuleDef moduledef = { static struct PyModuleDef moduledef = {
PyModuleDef_HEAD_INIT, PyModuleDef_HEAD_INIT,
.m_name = "libsmb_samba_internal", .m_name = "libsmb",
.m_doc = "libsmb wrapper", .m_doc = "libsmb wrapper",
.m_size = -1, .m_size = -1,
.m_methods = py_libsmb_methods, .m_methods = py_libsmb_methods,
}; };
MODULE_INIT_FUNC(libsmb_samba_internal) MODULE_INIT_FUNC(libsmb)
{ {
PyObject *m = NULL; PyObject *m = NULL;

2
source3/wscript_build
View File

@ -1323,7 +1323,7 @@ for env in bld.gen_python_environments():
bld.SAMBA3_PYTHON('pylibsmb', bld.SAMBA3_PYTHON('pylibsmb',
source='libsmb/pylibsmb.c', source='libsmb/pylibsmb.c',
deps='smbclient samba-credentials %s' % pycredentials, deps='smbclient samba-credentials %s' % pycredentials,
realname='samba/samba3/libsmb_samba_internal.so' realname='samba/samba3/libsmb.so'
) )
bld.SAMBA3_BINARY('spotlight2sparql', bld.SAMBA3_BINARY('spotlight2sparql',