[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  5fcbb16 s4:pyrpc_util: s/typename/type_name to avoid c++ warnings
       via  e1485c7 talloc: pytalloc-util should not have an ABI-file yet
      from  377b399 wintest Remove the password expiry as the first step

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 5fcbb1676009de9e384a8f76e0c4ab1b43ce3746
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Dec 9 09:59:52 2010 +0100

    s4:pyrpc_util: s/typename/type_name to avoid c++ warnings
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Thu Dec  9 17:55:57 CET 2010 on sn-devel-104

commit e1485c70fc1de2472e54fc1aaa23469e70ec3428
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Dec 9 09:36:55 2010 +0100

    talloc: pytalloc-util should not have an ABI-file yet
    
    Somehow I forgot to remove this after discussion with Jelmer.
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 lib/talloc/wscript              |    2 --
 source4/librpc/rpc/pyrpc_util.c |   10 +++++-----
 source4/librpc/rpc/pyrpc_util.h |    2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index a23532a..6316aba 100644
--- a/lib/talloc/wscript
+++ b/lib/talloc/wscript
@@ -106,8 +106,6 @@ def build(bld):
         bld.SAMBA_LIBRARY('pytalloc-util',
             source='pytalloc_util.c',
             public_deps='talloc',
-            abi_directory='ABI',
-            abi_match='py* Py*',
             pyext=True,
             vnum=VERSION,
             private_library=private_library,
diff --git a/source4/librpc/rpc/pyrpc_util.c b/source4/librpc/rpc/pyrpc_util.c
index 5ad8d2f..3821638 100644
--- a/source4/librpc/rpc/pyrpc_util.c
+++ b/source4/librpc/rpc/pyrpc_util.c
@@ -31,7 +31,7 @@
 #include "lib/messaging/messaging.h"
 #include "lib/messaging/irpc.h"
 
-bool py_check_dcerpc_type(PyObject *obj, const char *module, const char *typename)
+bool py_check_dcerpc_type(PyObject *obj, const char *module, const char *type_name)
 {
 	PyObject *mod;
 	PyTypeObject *type;
@@ -41,15 +41,15 @@ bool py_check_dcerpc_type(PyObject *obj, const char *module, const char *typenam
 
 	if (mod == NULL) {
 		PyErr_Format(PyExc_RuntimeError, "Unable to import %s to check type %s",
-			module, typename);
+			module, type_name);
 		return NULL;
 	}
 
-	type = (PyTypeObject *)PyObject_GetAttrString(mod, typename);
+	type = (PyTypeObject *)PyObject_GetAttrString(mod, type_name);
 	Py_DECREF(mod);
 	if (type == NULL) {
 		PyErr_Format(PyExc_RuntimeError, "Unable to find type %s in module %s",
-			module, typename);
+			module, type_name);
 		return NULL;
 	}
 
@@ -58,7 +58,7 @@ bool py_check_dcerpc_type(PyObject *obj, const char *module, const char *typenam
 
 	if (!ret)
 		PyErr_Format(PyExc_TypeError, "Expected type %s.%s, got %s",
-			module, typename, Py_TYPE(obj)->tp_name);
+			module, type_name, Py_TYPE(obj)->tp_name);
 
 	return ret;
 }
diff --git a/source4/librpc/rpc/pyrpc_util.h b/source4/librpc/rpc/pyrpc_util.h
index 445138b..837a33b 100644
--- a/source4/librpc/rpc/pyrpc_util.h
+++ b/source4/librpc/rpc/pyrpc_util.h
@@ -46,7 +46,7 @@ struct PyNdrRpcMethodDef {
 	const struct ndr_interface_table *table;
 };
 
-bool py_check_dcerpc_type(PyObject *obj, const char *module, const char *typename);
+bool py_check_dcerpc_type(PyObject *obj, const char *module, const char *type_name);
 bool PyInterface_AddNdrRpcMethods(PyTypeObject *object, const struct PyNdrRpcMethodDef *mds);
 PyObject *py_dcerpc_interface_init_helper(PyTypeObject *type, PyObject *args, PyObject *kwargs, const struct ndr_interface_table *table);
 


-- 
Samba Shared Repository