[SCM] Samba Shared Repository - branch v4-0-test updated -
release-4-0-0alpha2-509-gc04cf0c
Jelmer Vernooij
jelmer at samba.org
Mon Jan 21 02:57:59 GMT 2008
The branch, v4-0-test has been updated
via c04cf0c0520ae35ebe173d733d5dc8ffa5bf4ed9 (commit)
via 4b057b9bffcef9ecc61fe016746f5ce6f17f6d06 (commit)
via 77b400764e3dadfa05407343af649ad9298cc085 (commit)
via 4fa8a2789c7a2fa912645f08ca5a3be891d173dd (commit)
via 583ea85ae04c0bc2e70ab2e595e05f76f65c3be1 (commit)
via 2c2b16b5aeef83a3adce1859e1fbfd9c4f6ffdd5 (commit)
from da9a5b571ea87b2e08c74463d3fae58a9eb0828a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit c04cf0c0520ae35ebe173d733d5dc8ffa5bf4ed9
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Jan 21 00:50:04 2008 +0100
build: Don't build heimdal as library.
commit 4b057b9bffcef9ecc61fe016746f5ce6f17f6d06
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Jan 20 18:04:19 2008 +0100
python: Fix init functions.
commit 77b400764e3dadfa05407343af649ad9298cc085
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Jan 20 16:28:43 2008 +0100
build: Demote a bunch of libraries to subsystems. This makes packaging easier and should also make it easier
to migrate to a new build system.
commit 4fa8a2789c7a2fa912645f08ca5a3be891d173dd
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Jan 20 16:24:11 2008 +0100
python: Reenable modules for libcli_nbt and libcli_smb.
commit 583ea85ae04c0bc2e70ab2e595e05f76f65c3be1
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Jan 20 16:10:43 2008 +0100
ldb: Fix building python modules against system-provided ldb.
commit 2c2b16b5aeef83a3adce1859e1fbfd9c4f6ffdd5
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Jan 20 16:10:14 2008 +0100
build: Allow overriding CFLAGS for python packages.
-----------------------------------------------------------------------
Summary of changes:
source/build/smb_build/config_mk.pm | 1 +
source/heimdal_build/config.mk | 4 +-
source/lib/ldb/python.mk | 5 +-
source/lib/nss_wrapper/config.mk | 5 +-
source/lib/policy/config.mk | 2 +-
source/lib/samba3/config.mk | 5 +-
source/lib/socket_wrapper/config.mk | 5 +-
source/lib/tdr/config.mk | 5 +-
source/libcli/config.mk | 27 +--
source/libcli/swig/libcli_nbt.i | 1 +
source/libcli/swig/libcli_nbt.py | 117 ++++-------
source/libcli/swig/libcli_nbt_wrap.c | 375 ++++++++++++++++++----------------
source/libcli/swig/libcli_smb.i | 3 +-
source/libcli/swig/libcli_smb.py | 11 +-
source/libcli/swig/libcli_smb_wrap.c | 229 +++++----------------
source/libnet/config.mk | 5 +-
source/librpc/config.mk | 15 +-
source/nsswitch/config.mk | 5 +-
source/ntptr/config.mk | 2 +-
source/ntvfs/config.mk | 5 +-
source/param/config.mk | 5 +-
source/scripting/ejs/config.mk | 12 +-
source/scripting/python/modules.c | 2 +
source/smbd/config.mk | 6 +-
source/smbd/process_model.mk | 9 +-
25 files changed, 338 insertions(+), 523 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/build/smb_build/config_mk.pm b/source/build/smb_build/config_mk.pm
index 2365ca1..d07660b 100644
--- a/source/build/smb_build/config_mk.pm
+++ b/source/build/smb_build/config_mk.pm
@@ -27,6 +27,7 @@ my $section_types = {
"OBJ_FILES" => "list",
"ENABLE" => "bool",
"LDFLAGS" => "list",
+ "CFLAGS" => "list",
},
"SUBSYSTEM" => {
"OBJ_FILES" => "list",
diff --git a/source/heimdal_build/config.mk b/source/heimdal_build/config.mk
index b534c9b..604516c 100644
--- a/source/heimdal_build/config.mk
+++ b/source/heimdal_build/config.mk
@@ -543,9 +543,7 @@ clean::
#######################
# Start SUBSYSTEM HEIMDAL
-[LIBRARY::HEIMDAL]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::HEIMDAL]
CFLAGS = -Iheimdal_build
OBJ_FILES = ../heimdal/lib/vers/print_version.o
PUBLIC_DEPENDENCIES = \
diff --git a/source/lib/ldb/python.mk b/source/lib/ldb/python.mk
index f81c2e3..bbd4c1c 100644
--- a/source/lib/ldb/python.mk
+++ b/source/lib/ldb/python.mk
@@ -1,7 +1,4 @@
-#######################
-# Start LIBRARY swig_ldb
[PYTHON::swig_ldb]
PUBLIC_DEPENDENCIES = LIBLDB
+CFLAGS = -Ilib/ldb/include
SWIG_FILE = ldb.i
-# End LIBRARY swig_ldb
-#######################
diff --git a/source/lib/nss_wrapper/config.mk b/source/lib/nss_wrapper/config.mk
index 9751d2b..b46f7c3 100644
--- a/source/lib/nss_wrapper/config.mk
+++ b/source/lib/nss_wrapper/config.mk
@@ -1,9 +1,6 @@
##############################
# Start SUBSYSTEM NSS_WRAPPER
-[LIBRARY::NSS_WRAPPER]
-VERSION = 0.0.1
-SO_VERSION = 0
-DESCRIPTION = Wrapper library for testing nss calls without being root
+[SUBSYSTEM::NSS_WRAPPER]
PUBLIC_HEADERS = nss_wrapper.h
OBJ_FILES = nss_wrapper.o
# End SUBSYSTEM NSS_WRAPPER
diff --git a/source/lib/policy/config.mk b/source/lib/policy/config.mk
index f404d58..aae98b8 100644
--- a/source/lib/policy/config.mk
+++ b/source/lib/policy/config.mk
@@ -1,4 +1,4 @@
-[LIBRARY::LIBPOLICY]
+[SUBSYSTEM::LIBPOLICY]
CFLAGS = -Iheimdal/lib/roken
OBJ_FILES = lex.o parse_adm.o
PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSAMBA-CONFIG LIBTALLOC CHARSET
diff --git a/source/lib/samba3/config.mk b/source/lib/samba3/config.mk
index 76f1ce5..705bdd4 100644
--- a/source/lib/samba3/config.mk
+++ b/source/lib/samba3/config.mk
@@ -1,9 +1,6 @@
################################################
# Start SUBSYSTEM LIBSAMBA3
-[LIBRARY::LIBSAMBA3]
-VERSION = 0.0.1
-SO_VERSION = 0
-DESCRIPTION = Library for reading Samba3 data files
+[SUBSYSTEM::LIBSAMBA3]
PRIVATE_PROTO_HEADER = samba3_proto.h
PUBLIC_HEADERS = samba3.h
OBJ_FILES = tdbsam.o policy.o \
diff --git a/source/lib/socket_wrapper/config.mk b/source/lib/socket_wrapper/config.mk
index 9e19423..4c5cf94 100644
--- a/source/lib/socket_wrapper/config.mk
+++ b/source/lib/socket_wrapper/config.mk
@@ -1,9 +1,6 @@
##############################
# Start SUBSYSTEM SOCKET_WRAPPER
-[LIBRARY::SOCKET_WRAPPER]
-VERSION = 0.0.1
-SO_VERSION = 0
-DESCRIPTION = Wrapper library for testing TCP/IP connections using Unix Sockets
+[SUBSYSTEM::SOCKET_WRAPPER]
PUBLIC_HEADERS = socket_wrapper.h
OBJ_FILES = socket_wrapper.o
PRIVATE_DEPENDENCIES = EXT_SOCKET
diff --git a/source/lib/tdr/config.mk b/source/lib/tdr/config.mk
index f0e24c5..b8473e5 100644
--- a/source/lib/tdr/config.mk
+++ b/source/lib/tdr/config.mk
@@ -1,9 +1,6 @@
-[LIBRARY::TDR]
+[SUBSYSTEM::TDR]
CFLAGS = -Ilib/tdr
PUBLIC_HEADERS = tdr.h
-VERSION = 0.0.1
-SO_VERSION = 0
-DESCRIPTION = Simple marshall/unmarshall library
PUBLIC_PROTO_HEADER = tdr_proto.h
PUBLIC_DEPENDENCIES = LIBTALLOC LIBSAMBA-UTIL
OBJ_FILES = tdr.o
diff --git a/source/libcli/config.mk b/source/libcli/config.mk
index eb3c56c..a538d60 100644
--- a/source/libcli/config.mk
+++ b/source/libcli/config.mk
@@ -50,17 +50,13 @@ OBJ_FILES = \
PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT LIBCLI_COMPOSITE LIBEVENTS \
NDR_SECURITY samba-socket LIBSAMBA-UTIL
-[LIBRARY::swig_libcli_nbt]
-LIBRARY_REALNAME = swig/_libcli_nbt.$(SHLIBEXT)
-OBJ_FILES = swig/libcli_nbt_wrap.o
+[PYTHON::python_libcli_nbt]
+SWIG_FILE = swig/libcli_nbt.i
PUBLIC_DEPENDENCIES = LIBCLI_NBT DYNCONFIG LIBSAMBA-CONFIG
-ENABLE = NO
-[LIBRARY::swig_libcli_smb]
-LIBRARY_REALNAME = swig/_libcli_smb.$(SHLIBEXT)
-OBJ_FILES = swig/libcli_smb_wrap.o
+[PYTHON::python_libcli_smb]
+SWIG_FILE = swig/libcli_smb.i
PUBLIC_DEPENDENCIES = LIBCLI_SMB DYNCONFIG LIBSAMBA-CONFIG
-ENABLE = NO
[SUBSYSTEM::LIBCLI_DGRAM]
OBJ_FILES = \
@@ -71,20 +67,14 @@ OBJ_FILES = \
dgram/browse.o
PUBLIC_DEPENDENCIES = LIBCLI_NBT LIBNDR LIBCLI_RESOLVE
-[LIBRARY::LIBCLI_CLDAP]
-VERSION = 0.0.1
-SO_VERSION = 0
-DESCRIPTION = CLDAP client library
+[SUBSYSTEM::LIBCLI_CLDAP]
OBJ_FILES = cldap/cldap.o
PUBLIC_HEADERS = cldap/cldap.h
PUBLIC_DEPENDENCIES = LIBCLI_LDAP
PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBLDB
-[LIBRARY::LIBCLI_WREPL]
+[SUBSYSTEM::LIBCLI_WREPL]
PRIVATE_PROTO_HEADER = wrepl/winsrepl_proto.h
-VERSION = 0.0.1
-SO_VERSION = 0
-DESCRIPTION = WINS Replication client library
OBJ_FILES = \
wrepl/winsrepl.o
PUBLIC_DEPENDENCIES = NDR_WINSREPL samba-socket LIBCLI_RESOLVE LIBEVENTS \
@@ -112,12 +102,9 @@ OBJ_FILES = \
finddcs.o
PUBLIC_DEPENDENCIES = LIBCLI_NBT MESSAGING
-[LIBRARY::LIBCLI_SMB]
+[SUBSYSTEM::LIBCLI_SMB]
PUBLIC_HEADERS = libcli.h
PUBLIC_PROTO_HEADER = libcli_proto.h
-VERSION = 0.0.1
-SO_VERSION = 0
-DESCRIPTION = SMB/CIFS client library
OBJ_FILES = clireadwrite.o \
cliconnect.o \
clifile.o \
diff --git a/source/libcli/swig/libcli_nbt.i b/source/libcli/swig/libcli_nbt.i
index 6fd85c2..827230b 100644
--- a/source/libcli/swig/libcli_nbt.i
+++ b/source/libcli/swig/libcli_nbt.i
@@ -31,6 +31,7 @@
#include "lib/talloc/talloc.h"
#include "libcli/nbt/libnbt.h"
#include "param/param.h"
+#include "lib/events/events.h"
/* Undo strcpy safety macro as it's used by swig )-: */
diff --git a/source/libcli/swig/libcli_nbt.py b/source/libcli/swig/libcli_nbt.py
index 938ab38..b49e240 100644
--- a/source/libcli/swig/libcli_nbt.py
+++ b/source/libcli/swig/libcli_nbt.py
@@ -2,7 +2,6 @@
# Version 1.3.33
#
# Don't modify this file, modify the SWIG interface instead.
-# This file is compatible with both classic and new-style classes.
import _libcli_nbt
import new
@@ -48,6 +47,16 @@ except AttributeError:
del types
+def _swig_setattr_nondynamic_method(set):
+ def set_attr(self,name,value):
+ if (name == "thisown"): return self.this.own(value)
+ if hasattr(self,name) or (name == "this"):
+ set(self,name,value)
+ else:
+ raise AttributeError("You cannot add attributes to %s" % self)
+ return set_attr
+
+
import events
nbt_name_socket_init = _libcli_nbt.nbt_name_socket_init
NBT_NAME_CLIENT = _libcli_nbt.NBT_NAME_CLIENT
@@ -58,106 +67,54 @@ NBT_NAME_PDC = _libcli_nbt.NBT_NAME_PDC
NBT_NAME_LOGON = _libcli_nbt.NBT_NAME_LOGON
NBT_NAME_MASTER = _libcli_nbt.NBT_NAME_MASTER
NBT_NAME_BROWSER = _libcli_nbt.NBT_NAME_BROWSER
-class nbt_name(_object):
- __swig_setmethods__ = {}
- __setattr__ = lambda self, name, value: _swig_setattr(self, nbt_name, name, value)
- __swig_getmethods__ = {}
- __getattr__ = lambda self, name: _swig_getattr(self, nbt_name, name)
+class nbt_name(object):
+ thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
__repr__ = _swig_repr
- __swig_setmethods__["name"] = _libcli_nbt.nbt_name_name_set
- __swig_getmethods__["name"] = _libcli_nbt.nbt_name_name_get
- if _newclass:name = _swig_property(_libcli_nbt.nbt_name_name_get, _libcli_nbt.nbt_name_name_set)
- __swig_setmethods__["scope"] = _libcli_nbt.nbt_name_scope_set
- __swig_getmethods__["scope"] = _libcli_nbt.nbt_name_scope_get
- if _newclass:scope = _swig_property(_libcli_nbt.nbt_name_scope_get, _libcli_nbt.nbt_name_scope_set)
- __swig_setmethods__["type"] = _libcli_nbt.nbt_name_type_set
- __swig_getmethods__["type"] = _libcli_nbt.nbt_name_type_get
- if _newclass:type = _swig_property(_libcli_nbt.nbt_name_type_get, _libcli_nbt.nbt_name_type_set)
+ name = _swig_property(_libcli_nbt.nbt_name_name_get, _libcli_nbt.nbt_name_name_set)
+ scope = _swig_property(_libcli_nbt.nbt_name_scope_get, _libcli_nbt.nbt_name_scope_set)
+ type = _swig_property(_libcli_nbt.nbt_name_type_get, _libcli_nbt.nbt_name_type_set)
def __init__(self, *args, **kwargs):
- this = _libcli_nbt.new_nbt_name(*args, **kwargs)
- try: self.this.append(this)
- except: self.this = this
+ _libcli_nbt.nbt_name_swiginit(self,_libcli_nbt.new_nbt_name(*args, **kwargs))
__swig_destroy__ = _libcli_nbt.delete_nbt_name
- __del__ = lambda self : None;
nbt_name_swigregister = _libcli_nbt.nbt_name_swigregister
nbt_name_swigregister(nbt_name)
-class nbt_name_query(_object):
- __swig_setmethods__ = {}
- __setattr__ = lambda self, name, value: _swig_setattr(self, nbt_name_query, name, value)
- __swig_getmethods__ = {}
- __getattr__ = lambda self, name: _swig_getattr(self, nbt_name_query, name)
+class nbt_name_query(object):
+ thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
__repr__ = _swig_repr
- __swig_getmethods__["data_out"] = _libcli_nbt.nbt_name_query_data_out_get
- if _newclass:data_out = _swig_property(_libcli_nbt.nbt_name_query_data_out_get)
- __swig_getmethods__["data_in"] = _libcli_nbt.nbt_name_query_data_in_get
- if _newclass:data_in = _swig_property(_libcli_nbt.nbt_name_query_data_in_get)
+ data_out = _swig_property(_libcli_nbt.nbt_name_query_data_out_get)
+ data_in = _swig_property(_libcli_nbt.nbt_name_query_data_in_get)
def __init__(self, *args, **kwargs):
- this = _libcli_nbt.new_nbt_name_query(*args, **kwargs)
- try: self.this.append(this)
- except: self.this = this
+ _libcli_nbt.nbt_name_query_swiginit(self,_libcli_nbt.new_nbt_name_query(*args, **kwargs))
__swig_destroy__ = _libcli_nbt.delete_nbt_name_query
- __del__ = lambda self : None;
nbt_name_query_swigregister = _libcli_nbt.nbt_name_query_swigregister
nbt_name_query_swigregister(nbt_name_query)
-class nbt_name_query_out(_object):
- __swig_setmethods__ = {}
- __setattr__ = lambda self, name, value: _swig_setattr(self, nbt_name_query_out, name, value)
- __swig_getmethods__ = {}
- __getattr__ = lambda self, name: _swig_getattr(self, nbt_name_query_out, name)
+class nbt_name_query_out(object):
+ thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
__repr__ = _swig_repr
- __swig_setmethods__["reply_from"] = _libcli_nbt.nbt_name_query_out_reply_from_set
- __swig_getmethods__["reply_from"] = _libcli_nbt.nbt_name_query_out_reply_from_get
- if _newclass:reply_from = _swig_property(_libcli_nbt.nbt_name_query_out_reply_from_get, _libcli_nbt.nbt_name_query_out_reply_from_set)
- __swig_setmethods__["name"] = _libcli_nbt.nbt_name_query_out_name_set
- __swig_getmethods__["name"] = _libcli_nbt.nbt_name_query_out_name_get
- if _newclass:name = _swig_property(_libcli_nbt.nbt_name_query_out_name_get, _libcli_nbt.nbt_name_query_out_name_set)
- __swig_setmethods__["num_addrs"] = _libcli_nbt.nbt_name_query_out_num_addrs_set
- __swig_getmethods__["num_addrs"] = _libcli_nbt.nbt_name_query_out_num_addrs_get
- if _newclass:num_addrs = _swig_property(_libcli_nbt.nbt_name_query_out_num_addrs_get, _libcli_nbt.nbt_name_query_out_num_addrs_set)
- __swig_setmethods__["reply_addrs"] = _libcli_nbt.nbt_name_query_out_reply_addrs_set
- __swig_getmethods__["reply_addrs"] = _libcli_nbt.nbt_name_query_out_reply_addrs_get
- if _newclass:reply_addrs = _swig_property(_libcli_nbt.nbt_name_query_out_reply_addrs_get, _libcli_nbt.nbt_name_query_out_reply_addrs_set)
+ reply_from = _swig_property(_libcli_nbt.nbt_name_query_out_reply_from_get, _libcli_nbt.nbt_name_query_out_reply_from_set)
+ name = _swig_property(_libcli_nbt.nbt_name_query_out_name_get, _libcli_nbt.nbt_name_query_out_name_set)
+ num_addrs = _swig_property(_libcli_nbt.nbt_name_query_out_num_addrs_get, _libcli_nbt.nbt_name_query_out_num_addrs_set)
+ reply_addrs = _swig_property(_libcli_nbt.nbt_name_query_out_reply_addrs_get, _libcli_nbt.nbt_name_query_out_reply_addrs_set)
def __init__(self, *args, **kwargs):
- this = _libcli_nbt.new_nbt_name_query_out(*args, **kwargs)
- try: self.this.append(this)
- except: self.this = this
+ _libcli_nbt.nbt_name_query_out_swiginit(self,_libcli_nbt.new_nbt_name_query_out(*args, **kwargs))
__swig_destroy__ = _libcli_nbt.delete_nbt_name_query_out
- __del__ = lambda self : None;
nbt_name_query_out_swigregister = _libcli_nbt.nbt_name_query_out_swigregister
nbt_name_query_out_swigregister(nbt_name_query_out)
-class nbt_name_query_in(_object):
- __swig_setmethods__ = {}
- __setattr__ = lambda self, name, value: _swig_setattr(self, nbt_name_query_in, name, value)
- __swig_getmethods__ = {}
- __getattr__ = lambda self, name: _swig_getattr(self, nbt_name_query_in, name)
+class nbt_name_query_in(object):
+ thisown = _swig_property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
__repr__ = _swig_repr
- __swig_setmethods__["name"] = _libcli_nbt.nbt_name_query_in_name_set
- __swig_getmethods__["name"] = _libcli_nbt.nbt_name_query_in_name_get
- if _newclass:name = _swig_property(_libcli_nbt.nbt_name_query_in_name_get, _libcli_nbt.nbt_name_query_in_name_set)
- __swig_setmethods__["dest_addr"] = _libcli_nbt.nbt_name_query_in_dest_addr_set
- __swig_getmethods__["dest_addr"] = _libcli_nbt.nbt_name_query_in_dest_addr_get
- if _newclass:dest_addr = _swig_property(_libcli_nbt.nbt_name_query_in_dest_addr_get, _libcli_nbt.nbt_name_query_in_dest_addr_set)
- __swig_setmethods__["broadcast"] = _libcli_nbt.nbt_name_query_in_broadcast_set
- __swig_getmethods__["broadcast"] = _libcli_nbt.nbt_name_query_in_broadcast_get
- if _newclass:broadcast = _swig_property(_libcli_nbt.nbt_name_query_in_broadcast_get, _libcli_nbt.nbt_name_query_in_broadcast_set)
- __swig_setmethods__["wins_lookup"] = _libcli_nbt.nbt_name_query_in_wins_lookup_set
- __swig_getmethods__["wins_lookup"] = _libcli_nbt.nbt_name_query_in_wins_lookup_get
- if _newclass:wins_lookup = _swig_property(_libcli_nbt.nbt_name_query_in_wins_lookup_get, _libcli_nbt.nbt_name_query_in_wins_lookup_set)
- __swig_setmethods__["timeout"] = _libcli_nbt.nbt_name_query_in_timeout_set
- __swig_getmethods__["timeout"] = _libcli_nbt.nbt_name_query_in_timeout_get
- if _newclass:timeout = _swig_property(_libcli_nbt.nbt_name_query_in_timeout_get, _libcli_nbt.nbt_name_query_in_timeout_set)
- __swig_setmethods__["retries"] = _libcli_nbt.nbt_name_query_in_retries_set
- __swig_getmethods__["retries"] = _libcli_nbt.nbt_name_query_in_retries_get
- if _newclass:retries = _swig_property(_libcli_nbt.nbt_name_query_in_retries_get, _libcli_nbt.nbt_name_query_in_retries_set)
+ name = _swig_property(_libcli_nbt.nbt_name_query_in_name_get, _libcli_nbt.nbt_name_query_in_name_set)
+ dest_addr = _swig_property(_libcli_nbt.nbt_name_query_in_dest_addr_get, _libcli_nbt.nbt_name_query_in_dest_addr_set)
+ broadcast = _swig_property(_libcli_nbt.nbt_name_query_in_broadcast_get, _libcli_nbt.nbt_name_query_in_broadcast_set)
+ wins_lookup = _swig_property(_libcli_nbt.nbt_name_query_in_wins_lookup_get, _libcli_nbt.nbt_name_query_in_wins_lookup_set)
+ timeout = _swig_property(_libcli_nbt.nbt_name_query_in_timeout_get, _libcli_nbt.nbt_name_query_in_timeout_set)
+ retries = _swig_property(_libcli_nbt.nbt_name_query_in_retries_get, _libcli_nbt.nbt_name_query_in_retries_set)
def __init__(self, *args, **kwargs):
- this = _libcli_nbt.new_nbt_name_query_in(*args, **kwargs)
- try: self.this.append(this)
- except: self.this = this
+ _libcli_nbt.nbt_name_query_in_swiginit(self,_libcli_nbt.new_nbt_name_query_in(*args, **kwargs))
__swig_destroy__ = _libcli_nbt.delete_nbt_name_query_in
- __del__ = lambda self : None;
nbt_name_query_in_swigregister = _libcli_nbt.nbt_name_query_in_swigregister
nbt_name_query_in_swigregister(nbt_name_query_in)
diff --git a/source/libcli/swig/libcli_nbt_wrap.c b/source/libcli/swig/libcli_nbt_wrap.c
index 149e638..6c1b501 100644
--- a/source/libcli/swig/libcli_nbt_wrap.c
+++ b/source/libcli/swig/libcli_nbt_wrap.c
@@ -9,7 +9,7 @@
* ----------------------------------------------------------------------------- */
#define SWIGPYTHON
-#define SWIG_PYTHON_DIRECTOR_NO_VTABLE
+#define SWIG_PYTHON_NO_BUILD_NONE
/* -----------------------------------------------------------------------------
* This section contains generic SWIG labels for method/variable
* declarations/attributes, and other compiler dependent labels.
@@ -2485,6 +2485,19 @@ static swig_module_info swig_module = {swig_types, 17, 0, 0, 0, 0};
# error "This python version requires swig to be run with the '-classic' option"
# endif
#endif
+#if (PY_VERSION_HEX <= 0x02020000)
+# error "This python version requires swig to be run with the '-nomodern' option"
+#endif
+#if (PY_VERSION_HEX <= 0x02020000)
+# error "This python version requires swig to be run with the '-nomodernargs' option"
+#endif
+#ifndef METH_O
+# error "This python version requires swig to be run with the '-nofastunpack' option"
+#endif
+#ifdef SWIG_TypeQuery
+# undef SWIG_TypeQuery
+#endif
+#define SWIG_TypeQuery SWIG_Python_TypeQuery
/*-----------------------------------------------
@(target):= _libcli_nbt.so
@@ -2506,6 +2519,7 @@ static swig_module_info swig_module = {swig_types, 17, 0, 0, 0, 0};
#include "lib/talloc/talloc.h"
#include "libcli/nbt/libnbt.h"
#include "param/param.h"
+#include "lib/events/events.h"
/* Undo strcpy safety macro as it's used by swig )-: */
@@ -2912,12 +2926,8 @@ SWIGINTERN PyObject *_wrap_nbt_name_socket_init(PyObject *SWIGUNUSEDPARM(self),
(char *) "event_ctx", NULL
};
- {
- arg2 = event_context_init(NULL);
- }
- {
- arg1 = NULL;
- }
+ arg2 = event_context_init(NULL);
+ arg1 = NULL;
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:nbt_name_socket_init",kwnames,&obj0)) SWIG_fail;
if (obj0) {
res2 = SWIG_ConvertPtr(obj0, &argp2,SWIGTYPE_p_event_context, 0 | 0 );
@@ -2943,16 +2953,15 @@ SWIGINTERN PyObject *_wrap_nbt_name_name_set(PyObject *SWIGUNUSEDPARM(self), PyO
int res2 ;
char *buf2 = 0 ;
int alloc2 = 0 ;
- PyObject * obj0 = 0 ;
- PyObject * obj1 = 0 ;
+ PyObject *swig_obj[2] ;
- if (!PyArg_ParseTuple(args,(char *)"OO:nbt_name_name_set",&obj0,&obj1)) SWIG_fail;
- res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_nbt_name, 0 | 0 );
+ if (!SWIG_Python_UnpackTuple(args,"nbt_name_name_set",2,2,swig_obj)) SWIG_fail;
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_nbt_name, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "nbt_name_name_set" "', argument " "1"" of type '" "struct nbt_name *""'");
}
arg1 = (struct nbt_name *)(argp1);
- res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
+ res2 = SWIG_AsCharPtrAndSize(swig_obj[1], &buf2, NULL, &alloc2);
if (!SWIG_IsOK(res2)) {
SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "nbt_name_name_set" "', argument " "2"" of type '" "char const *""'");
}
@@ -2978,10 +2987,11 @@ SWIGINTERN PyObject *_wrap_nbt_name_name_get(PyObject *SWIGUNUSEDPARM(self), PyO
char *result = 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
- PyObject * obj0 = 0 ;
+ PyObject *swig_obj[1] ;
- if (!PyArg_ParseTuple(args,(char *)"O:nbt_name_name_get",&obj0)) SWIG_fail;
- res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_nbt_name, 0 | 0 );
+ if (!args) SWIG_fail;
+ swig_obj[0] = args;
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_nbt_name, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "nbt_name_name_get" "', argument " "1"" of type '" "struct nbt_name *""'");
}
@@ -3003,16 +3013,15 @@ SWIGINTERN PyObject *_wrap_nbt_name_scope_set(PyObject *SWIGUNUSEDPARM(self), Py
int res2 ;
char *buf2 = 0 ;
int alloc2 = 0 ;
- PyObject * obj0 = 0 ;
- PyObject * obj1 = 0 ;
+ PyObject *swig_obj[2] ;
- if (!PyArg_ParseTuple(args,(char *)"OO:nbt_name_scope_set",&obj0,&obj1)) SWIG_fail;
- res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_nbt_name, 0 | 0 );
+ if (!SWIG_Python_UnpackTuple(args,"nbt_name_scope_set",2,2,swig_obj)) SWIG_fail;
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_nbt_name, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "nbt_name_scope_set" "', argument " "1"" of type '" "struct nbt_name *""'");
}
arg1 = (struct nbt_name *)(argp1);
- res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
+ res2 = SWIG_AsCharPtrAndSize(swig_obj[1], &buf2, NULL, &alloc2);
if (!SWIG_IsOK(res2)) {
SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "nbt_name_scope_set" "', argument " "2"" of type '" "char const *""'");
}
@@ -3038,10 +3047,11 @@ SWIGINTERN PyObject *_wrap_nbt_name_scope_get(PyObject *SWIGUNUSEDPARM(self), Py
char *result = 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
- PyObject * obj0 = 0 ;
+ PyObject *swig_obj[1] ;
- if (!PyArg_ParseTuple(args,(char *)"O:nbt_name_scope_get",&obj0)) SWIG_fail;
- res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_nbt_name, 0 | 0 );
+ if (!args) SWIG_fail;
+ swig_obj[0] = args;
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_nbt_name, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "nbt_name_scope_get" "', argument " "1"" of type '" "struct nbt_name *""'");
}
@@ -3062,16 +3072,15 @@ SWIGINTERN PyObject *_wrap_nbt_name_type_set(PyObject *SWIGUNUSEDPARM(self), PyO
int res1 = 0 ;
int val2 ;
int ecode2 = 0 ;
- PyObject * obj0 = 0 ;
- PyObject * obj1 = 0 ;
+ PyObject *swig_obj[2] ;
- if (!PyArg_ParseTuple(args,(char *)"OO:nbt_name_type_set",&obj0,&obj1)) SWIG_fail;
- res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_nbt_name, 0 | 0 );
+ if (!SWIG_Python_UnpackTuple(args,"nbt_name_type_set",2,2,swig_obj)) SWIG_fail;
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_nbt_name, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "nbt_name_type_set" "', argument " "1"" of type '" "struct nbt_name *""'");
}
arg1 = (struct nbt_name *)(argp1);
- ecode2 = SWIG_AsVal_int(obj1, &val2);
+ ecode2 = SWIG_AsVal_int(swig_obj[1], &val2);
if (!SWIG_IsOK(ecode2)) {
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "nbt_name_type_set" "', argument " "2"" of type '" "enum nbt_name_type""'");
}
@@ -3091,10 +3100,11 @@ SWIGINTERN PyObject *_wrap_nbt_name_type_get(PyObject *SWIGUNUSEDPARM(self), PyO
enum nbt_name_type result;
void *argp1 = 0 ;
--
Samba Shared Repository
More information about the samba-cvs
mailing list