[SCM] Samba Shared Repository - branch master updated
Jelmer Vernooij
jelmer at samba.org
Sat Nov 6 19:49:02 MDT 2010
The branch, master has been updated
via 4217734 credentials: Lowercase library name,
via e28cec7 ldbsamba: Lowercase library name.
via 0878399 samdb: Lowercase library name.
via e7c3719 samdb: Make private (at least for the moment).
via 0d6f1a1 pytalloc: Make some arguments optional.
from 3d443b3 ldb:ldb_parse.c - "ldb_parse_hex2char" - always initialise "c"
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 4217734a51adbcdf3dcf45599e119247958802af
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Nov 7 02:05:51 2010 +0100
credentials: Lowercase library name,
Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
Autobuild-Date: Sun Nov 7 01:48:44 UTC 2010 on sn-devel-104
commit e28cec7817f17d31e054c021f39f13685c55eee9
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Nov 7 01:57:34 2010 +0100
ldbsamba: Lowercase library name.
commit 0878399bd57db88aa49ac2a0a139c269feda9137
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Nov 7 01:52:13 2010 +0100
samdb: Lowercase library name.
commit e7c371996deb2d1517d2a7b8d7aa0ff75d7138ce
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Nov 7 01:44:26 2010 +0100
samdb: Make private (at least for the moment).
commit 0d6f1a1630a3b26169fd68535d0ab97aa301913c
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Nov 5 13:48:34 2010 +0100
pytalloc: Make some arguments optional.
-----------------------------------------------------------------------
Summary of changes:
lib/talloc/pytalloc.c | 12 +-
source4/auth/credentials/wscript_build | 20 ++--
source4/auth/gensec/wscript_build | 10 +-
source4/auth/ntlm/wscript_build | 4 +-
source4/auth/ntlmssp/wscript_build | 2 +-
source4/auth/wscript_build | 12 +-
source4/cldap_server/wscript_build | 2 +-
source4/dns_server/wscript_build | 2 +-
source4/dsdb/samdb/ldb_modules/wscript_build | 154 +++++++++++++-------------
source4/dsdb/wscript_build | 38 +++---
source4/kdc/wscript_build | 18 ++--
source4/ldap_server/wscript_build | 2 +-
source4/lib/cmdline/wscript_build | 4 +-
source4/lib/ldb-samba/wscript_build | 10 +-
source4/lib/registry/wscript_build | 2 +-
source4/libcli/wscript_build | 4 +-
source4/libnet/wscript_build | 2 +-
source4/librpc/wscript_build | 2 +-
source4/nbt_server/wscript_build | 2 +-
source4/ntp_signd/wscript_build | 2 +-
source4/ntptr/wscript_build | 2 +-
source4/ntvfs/posix/wscript_build | 4 +-
source4/ntvfs/unixuid/wscript_build | 2 +-
source4/ntvfs/wscript_build | 2 +-
source4/param/wscript_build | 2 +-
source4/rpc_server/wscript_build | 8 +-
source4/samba_tool/wscript_build | 2 +-
source4/smb_server/smb/wscript_build | 2 +-
source4/smbd/wscript_build | 10 +-
source4/torture/drs/wscript_build | 2 +-
source4/torture/local/wscript_build | 2 +-
source4/torture/wscript_build | 2 +-
source4/utils/wscript_build | 2 +-
source4/winbind/wscript_build | 2 +-
34 files changed, 174 insertions(+), 174 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/talloc/pytalloc.c b/lib/talloc/pytalloc.c
index 69a2c2f..96a6122 100644
--- a/lib/talloc/pytalloc.c
+++ b/lib/talloc/pytalloc.c
@@ -24,10 +24,10 @@
/* print a talloc tree report for a talloc python object */
static PyObject *py_talloc_report_full(PyObject *self, PyObject *args)
{
- PyObject *py_obj;
+ PyObject *py_obj = Py_None;
PyTypeObject *type;
- if (!PyArg_ParseTuple(args, "O", &py_obj))
+ if (!PyArg_ParseTuple(args, "|O", &py_obj))
return NULL;
if (py_obj == Py_None) {
@@ -40,7 +40,7 @@ static PyObject *py_talloc_report_full(PyObject *self, PyObject *args)
}
/* enable null tracking */
-static PyObject *py_talloc_enable_null_tracking(PyObject *self, PyObject *args)
+static PyObject *py_talloc_enable_null_tracking(PyObject *self)
{
talloc_enable_null_tracking();
return Py_None;
@@ -49,10 +49,10 @@ static PyObject *py_talloc_enable_null_tracking(PyObject *self, PyObject *args)
/* return the number of talloc blocks */
static PyObject *py_talloc_total_blocks(PyObject *self, PyObject *args)
{
- PyObject *py_obj;
+ PyObject *py_obj = Py_None;
PyTypeObject *type;
- if (!PyArg_ParseTuple(args, "O", &py_obj))
+ if (!PyArg_ParseTuple(args, "|O", &py_obj))
return NULL;
if (py_obj == Py_None) {
@@ -67,7 +67,7 @@ static PyObject *py_talloc_total_blocks(PyObject *self, PyObject *args)
static PyMethodDef talloc_methods[] = {
{ "report_full", (PyCFunction)py_talloc_report_full, METH_VARARGS,
"show a talloc tree for an object"},
- { "enable_null_tracking", (PyCFunction)py_talloc_enable_null_tracking, METH_VARARGS,
+ { "enable_null_tracking", (PyCFunction)py_talloc_enable_null_tracking, METH_NOARGS,
"enable tracking of the NULL object"},
{ "total_blocks", (PyCFunction)py_talloc_total_blocks, METH_VARARGS,
"return talloc block count"},
diff --git a/source4/auth/credentials/wscript_build b/source4/auth/credentials/wscript_build
index b116e44..6fb1a68 100644
--- a/source4/auth/credentials/wscript_build
+++ b/source4/auth/credentials/wscript_build
@@ -1,16 +1,16 @@
#!/usr/bin/env python
-bld.SAMBA_LIBRARY('CREDENTIALS',
- source='credentials.c',
- autoproto='credentials_proto.h',
- public_headers='credentials.h',
- deps='LIBCRYPTO errors events LIBCLI_AUTH security CREDENTIALS_SECRETS CREDENTIALS_KRB5',
- private_library=True
- )
+bld.SAMBA_LIBRARY('credentials',
+ source='credentials.c',
+ autoproto='credentials_proto.h',
+ public_headers='credentials.h',
+ deps='LIBCRYPTO errors events LIBCLI_AUTH security CREDENTIALS_SECRETS CREDENTIALS_KRB5',
+ private_library=True
+ )
bld.SAMBA_SUBSYSTEM('CREDENTIALS_KRB5',
source='credentials_krb5.c',
- deps='KERBEROS_UTIL gssapi CREDENTIALS',
+ deps='KERBEROS_UTIL gssapi credentials',
public_deps='com_err authkrb5',
)
@@ -21,11 +21,11 @@ bld.SAMBA_SUBSYSTEM('CREDENTIALS_SECRETS',
bld.SAMBA_SUBSYSTEM('CREDENTIALS_NTLM',
source='credentials_ntlm.c',
- deps='CREDENTIALS')
+ deps='credentials')
bld.SAMBA_PYTHON('pycredentials',
source='pycredentials.c',
- public_deps='CREDENTIALS cmdline-credentials pytalloc-util pyparam_util CREDENTIALS_KRB5 CREDENTIALS_SECRETS',
+ public_deps='credentials cmdline-credentials pytalloc-util pyparam_util CREDENTIALS_KRB5 CREDENTIALS_SECRETS',
realname='samba/credentials.so'
)
diff --git a/source4/auth/gensec/wscript_build b/source4/auth/gensec/wscript_build
index dff6dc6..e0a518e 100644
--- a/source4/auth/gensec/wscript_build
+++ b/source4/auth/gensec/wscript_build
@@ -14,7 +14,7 @@ bld.SAMBA_MODULE('gensec_krb5',
source='gensec_krb5.c',
subsystem='gensec',
init_function='gensec_krb5_init',
- deps='CREDENTIALS authkrb5 auth_session com_err',
+ deps='credentials authkrb5 auth_session com_err',
internal_module=False,
)
@@ -23,7 +23,7 @@ bld.SAMBA_MODULE('gensec_gssapi',
source='gensec_gssapi.c',
subsystem='gensec',
init_function='gensec_gssapi_init',
- deps='gssapi CREDENTIALS authkrb5 com_err'
+ deps='gssapi credentials authkrb5 com_err'
)
@@ -31,7 +31,7 @@ bld.SAMBA_MODULE('cyrus_sasl',
source='cyrus_sasl.c',
subsystem='gensec',
init_function='gensec_sasl_init',
- deps='CREDENTIALS sasl2',
+ deps='credentials sasl2',
enabled=bld.CONFIG_SET('HAVE_SASL')
)
@@ -41,14 +41,14 @@ bld.SAMBA_MODULE('gensec_spnego',
autoproto='spnego_proto.h',
subsystem='gensec',
init_function='gensec_spnego_init',
- deps='ASN1_UTIL CREDENTIALS'
+ deps='ASN1_UTIL credentials'
)
bld.SAMBA_MODULE('gensec_schannel',
source='schannel.c ../../../libcli/auth/schannel_sign.c',
subsystem='gensec',
- deps='COMMON_SCHANNELDB NDR_SCHANNEL CREDENTIALS ndr auth_session',
+ deps='COMMON_SCHANNELDB NDR_SCHANNEL credentials ndr auth_session',
internal_module=True,
autoproto='schannel_proto.h',
init_function='gensec_schannel_init'
diff --git a/source4/auth/ntlm/wscript_build b/source4/auth/ntlm/wscript_build
index a4d1816..3dc9b97 100644
--- a/source4/auth/ntlm/wscript_build
+++ b/source4/auth/ntlm/wscript_build
@@ -4,7 +4,7 @@ bld.SAMBA_MODULE('auth_sam_module',
source='auth_sam.c',
subsystem='auth',
init_function='auth_sam_init',
- deps='SAMDB auth_sam ntlm_check samba-hostconfig'
+ deps='samdb auth_sam ntlm_check samba-hostconfig'
)
@@ -57,7 +57,7 @@ bld.SAMBA_SUBSYSTEM('PAM_ERRORS',
bld.SAMBA_LIBRARY('auth',
source='auth.c auth_util.c auth_simple.c',
autoproto='auth_proto.h',
- deps='samba-util security SAMDB CREDENTIALS UTIL_TEVENT',
+ deps='samba-util security samdb credentials UTIL_TEVENT',
private_library=True
)
diff --git a/source4/auth/ntlmssp/wscript_build b/source4/auth/ntlmssp/wscript_build
index 07ab11c..0f18183 100644
--- a/source4/auth/ntlmssp/wscript_build
+++ b/source4/auth/ntlmssp/wscript_build
@@ -10,7 +10,7 @@ bld.SAMBA_MODULE('gensec_ntlmssp',
autoproto='proto.h',
subsystem='gensec',
init_function='gensec_ntlmssp_init',
- deps='MSRPC_PARSE CREDENTIALS NDR_NTLMSSP',
+ deps='MSRPC_PARSE credentials NDR_NTLMSSP',
internal_module=True
)
diff --git a/source4/auth/wscript_build b/source4/auth/wscript_build
index 2ef3c0d..700a4a9 100644
--- a/source4/auth/wscript_build
+++ b/source4/auth/wscript_build
@@ -9,23 +9,23 @@ bld.RECURSE('credentials')
bld.SAMBA_SUBSYSTEM('auth_session',
source='session.c',
autoproto='session_proto.h',
- public_deps='CREDENTIALS',
+ public_deps='credentials',
public_headers='session.h',
header_path='samba',
- deps='SAMDB auth_sam'
+ deps='samdb auth_sam'
)
bld.SAMBA_SUBSYSTEM('samba_server_gensec',
source='samba_server_gensec.c',
- public_deps='CREDENTIALS gensec auth'
+ public_deps='credentials gensec auth'
)
bld.SAMBA_SUBSYSTEM('auth_system_session',
source='system_session.c',
autoproto='system_session_proto.h',
- public_deps='CREDENTIALS',
+ public_deps='credentials',
deps='auth_session',
)
@@ -33,7 +33,7 @@ bld.SAMBA_SUBSYSTEM('auth_system_session',
bld.SAMBA_SUBSYSTEM('auth_sam',
source='sam.c',
autoproto='auth_sam.h',
- public_deps='SAMDB security ldb tevent',
+ public_deps='samdb security ldb tevent',
deps=''
)
@@ -48,7 +48,7 @@ bld.SAMBA_SUBSYSTEM('auth_sam_reply',
bld.SAMBA_PYTHON('pyauth',
source='pyauth.c',
public_deps='auth_system_session',
- deps='SAMDB pytalloc-util pyparam_util',
+ deps='samdb pytalloc-util pyparam_util',
realname='samba/auth.so'
)
diff --git a/source4/cldap_server/wscript_build b/source4/cldap_server/wscript_build
index ce586dc..7b32912 100644
--- a/source4/cldap_server/wscript_build
+++ b/source4/cldap_server/wscript_build
@@ -11,6 +11,6 @@ bld.SAMBA_MODULE('service_cldap',
bld.SAMBA_SUBSYSTEM('CLDAPD',
source='netlogon.c rootdse.c',
autoproto='proto.h',
- deps='LIBCLI_CLDAP LDBSAMBA'
+ deps='LIBCLI_CLDAP ldbsamba'
)
diff --git a/source4/dns_server/wscript_build b/source4/dns_server/wscript_build
index 45dae0c..3a0f289 100644
--- a/source4/dns_server/wscript_build
+++ b/source4/dns_server/wscript_build
@@ -4,6 +4,6 @@ bld.SAMBA_MODULE('DNS',
source='dns_server.c dns_query.c dns_update.c dns_utils.c',
subsystem='service',
init_function='server_service_dns_init',
- deps='samba-hostconfig LIBTSOCKET LIBSAMBA_TSOCKET LDBSAMBA',
+ deps='samba-hostconfig LIBTSOCKET LIBSAMBA_TSOCKET ldbsamba',
local_include=False
)
diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build
index 1232465..360f4a4 100644
--- a/source4/dsdb/samdb/ldb_modules/wscript_build
+++ b/source4/dsdb/samdb/ldb_modules/wscript_build
@@ -28,8 +28,8 @@ bld.SAMBA_MODULE('ldb_samba_dsdb',
source='samba_dsdb.c',
subsystem='ldb',
init_function='ldb_samba_dsdb_module_init',
- module_init_name='ldb_init_module',
- deps='SAMDB talloc events ndr DSDB_MODULE_HELPERS',
+ module_init_name='ldb_init_module',
+ deps='samdb talloc events ndr DSDB_MODULE_HELPERS',
internal_module=False,
)
@@ -38,9 +38,9 @@ bld.SAMBA_MODULE('ldb_samba_secrets',
source='samba_secrets.c',
subsystem='ldb',
init_function='ldb_samba_secrets_module_init',
- module_init_name='ldb_init_module',
+ module_init_name='ldb_init_module',
internal_module=False,
- deps='SAMDB talloc events ndr'
+ deps='samdb talloc events ndr'
)
@@ -48,9 +48,9 @@ bld.SAMBA_MODULE('ldb_objectguid',
source='objectguid.c',
subsystem='ldb',
init_function='ldb_objectguid_module_init',
- module_init_name='ldb_init_module',
+ module_init_name='ldb_init_module',
internal_module=False,
- deps='SAMDB talloc events ndr'
+ deps='samdb talloc events ndr'
)
@@ -58,9 +58,9 @@ bld.SAMBA_MODULE('ldb_repl_meta_data',
source='repl_meta_data.c',
subsystem='ldb',
init_function='ldb_repl_meta_data_module_init',
- module_init_name='ldb_init_module',
+ module_init_name='ldb_init_module',
internal_module=False,
- deps='SAMDB talloc events ndr NDR_DRSUAPI NDR_DRSBLOBS ndr DSDB_MODULE_HELPERS security-session'
+ deps='samdb talloc events ndr NDR_DRSUAPI NDR_DRSBLOBS ndr DSDB_MODULE_HELPERS security-session'
)
@@ -68,9 +68,9 @@ bld.SAMBA_MODULE('ldb_schema_load',
source='schema_load.c',
subsystem='ldb',
init_function='ldb_schema_load_module_init',
- module_init_name='ldb_init_module',
+ module_init_name='ldb_init_module',
internal_module=False,
- deps='SAMDB talloc events DSDB_MODULE_HELPERS'
+ deps='samdb talloc events DSDB_MODULE_HELPERS'
)
@@ -78,9 +78,9 @@ bld.SAMBA_MODULE('ldb_schema_data',
source='schema_data.c',
subsystem='ldb',
init_function='ldb_schema_data_module_init',
- module_init_name='ldb_init_module',
+ module_init_name='ldb_init_module',
internal_module=False,
- deps='SAMDB talloc events DSDB_MODULE_HELPERS'
+ deps='samdb talloc events DSDB_MODULE_HELPERS'
)
@@ -88,9 +88,9 @@ bld.SAMBA_MODULE('ldb_naming_fsmo',
source='naming_fsmo.c',
subsystem='ldb',
init_function='ldb_naming_fsmo_module_init',
- module_init_name='ldb_init_module',
+ module_init_name='ldb_init_module',
internal_module=False,
- deps='SAMDB talloc events DSDB_MODULE_HELPERS'
+ deps='samdb talloc events DSDB_MODULE_HELPERS'
)
@@ -98,9 +98,9 @@ bld.SAMBA_MODULE('ldb_pdc_fsmo',
source='pdc_fsmo.c',
subsystem='ldb',
init_function='ldb_pdc_fsmo_module_init',
- module_init_name='ldb_init_module',
+ module_init_name='ldb_init_module',
internal_module=False,
- deps='SAMDB talloc events DSDB_MODULE_HELPERS'
+ deps='samdb talloc events DSDB_MODULE_HELPERS'
)
@@ -108,9 +108,9 @@ bld.SAMBA_MODULE('ldb_samldb',
source='samldb.c',
subsystem='ldb',
init_function='ldb_samldb_module_init',
- module_init_name='ldb_init_module',
+ module_init_name='ldb_init_module',
internal_module=False,
- deps='talloc events SAMDB DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_RIDALLOC'
+ deps='talloc events samdb DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_RIDALLOC'
)
@@ -118,7 +118,7 @@ bld.SAMBA_MODULE('ldb_samba3sam',
source='samba3sam.c',
subsystem='ldb',
init_function='ldb_samba3sam_module_init',
- module_init_name='ldb_init_module',
+ module_init_name='ldb_init_module',
internal_module=False,
deps='talloc events ldb smbpasswd security NDR_SECURITY'
)
@@ -128,29 +128,29 @@ bld.SAMBA_MODULE('ldb_samba3sid',
source='samba3sid.c',
subsystem='ldb',
init_function='ldb_samba3sid_module_init',
- module_init_name='ldb_init_module',
+ module_init_name='ldb_init_module',
internal_module=False,
- deps='talloc events ldb security NDR_SECURITY LDBSAMBA DSDB_MODULE_HELPERS'
+ deps='talloc events ldb security NDR_SECURITY ldbsamba DSDB_MODULE_HELPERS'
)
bld.SAMBA_MODULE('ldb_simple_ldap_map',
- source='simple_ldap_map.c',
- subsystem='ldb',
- init_function='ldb_simple_ldap_map_module_init',
- module_init_name='ldb_init_module',
- internal_module=False,
- deps='talloc events ldb ndr LDBSAMBA'
- )
+ source='simple_ldap_map.c',
+ subsystem='ldb',
+ init_function='ldb_simple_ldap_map_module_init',
+ module_init_name='ldb_init_module',
+ internal_module=False,
+ deps='talloc events ldb ndr ldbsamba'
+ )
bld.SAMBA_MODULE('ldb_rootdse',
source='rootdse.c',
subsystem='ldb',
init_function='ldb_rootdse_module_init',
- module_init_name='ldb_init_module',
+ module_init_name='ldb_init_module',
internal_module=False,
- deps='talloc events SAMDB MESSAGING security-session DSDB_MODULE_HELPERS'
+ deps='talloc events samdb MESSAGING security-session DSDB_MODULE_HELPERS'
)
@@ -158,9 +158,9 @@ bld.SAMBA_MODULE('ldb_password_hash',
source='password_hash.c',
subsystem='ldb',
init_function='ldb_password_hash_module_init',
- module_init_name='ldb_init_module',
+ module_init_name='ldb_init_module',
internal_module=False,
- deps='talloc events SAMDB LIBCLI_AUTH NDR_DRSBLOBS authkrb5 hdb krb5 com_err'
+ deps='talloc events samdb LIBCLI_AUTH NDR_DRSBLOBS authkrb5 hdb krb5 com_err'
)
@@ -168,38 +168,38 @@ bld.SAMBA_MODULE('ldb_local_password',
source='local_password.c',
subsystem='ldb',
init_function='ldb_local_password_module_init',
- module_init_name='ldb_init_module',
+ module_init_name='ldb_init_module',
internal_module=False,
- deps='talloc events ndr SAMDB'
+ deps='talloc events ndr samdb'
)
bld.SAMBA_MODULE('ldb_extended_dn_in',
source='extended_dn_in.c',
subsystem='ldb',
init_function='ldb_extended_dn_in_module_init',
- module_init_name='ldb_init_module',
+ module_init_name='ldb_init_module',
internal_module=False,
deps='talloc events samba-util'
)
bld.SAMBA_MODULE('ldb_extended_dn_out',
- source='extended_dn_out.c',
- init_function='ldb_extended_dn_out_module_init',
- module_init_name='ldb_init_module',
- subsystem='ldb',
- deps='talloc events ndr samba-util SAMDB',
- internal_module=False,
- )
+ source='extended_dn_out.c',
+ init_function='ldb_extended_dn_out_module_init',
+ module_init_name='ldb_init_module',
+ subsystem='ldb',
+ deps='talloc events ndr samba-util samdb',
+ internal_module=False,
+ )
bld.SAMBA_MODULE('ldb_extended_dn_store',
source='extended_dn_store.c',
subsystem='ldb',
init_function='ldb_extended_dn_store_module_init',
- module_init_name='ldb_init_module',
+ module_init_name='ldb_init_module',
internal_module=False,
- deps='talloc events samba-util SAMDB DSDB_MODULE_HELPERS'
+ deps='talloc events samba-util samdb DSDB_MODULE_HELPERS'
)
@@ -207,7 +207,7 @@ bld.SAMBA_MODULE('ldb_show_deleted',
source='show_deleted.c',
subsystem='ldb',
init_function='ldb_show_deleted_module_init',
- module_init_name='ldb_init_module',
+ module_init_name='ldb_init_module',
internal_module=False,
deps='talloc events samba-util DSDB_MODULE_HELPERS'
)
@@ -218,9 +218,9 @@ bld.SAMBA_MODULE('ldb_partition',
autoproto='partition_proto.h',
subsystem='ldb',
init_function='ldb_partition_module_init',
- module_init_name='ldb_init_module',
+ module_init_name='ldb_init_module',
internal_module=False,
- deps='talloc events SAMDB DSDB_MODULE_HELPERS'
+ deps='talloc events samdb DSDB_MODULE_HELPERS'
)
@@ -228,9 +228,9 @@ bld.SAMBA_MODULE('ldb_new_partition',
source='new_partition.c',
subsystem='ldb',
init_function='ldb_new_partition_module_init',
- module_init_name='ldb_init_module',
+ module_init_name='ldb_init_module',
internal_module=False,
--
Samba Shared Repository
More information about the samba-cvs
mailing list