[SCM] Samba Shared Repository - branch master updated

Jelmer Vernooij jelmer at samba.org
Sun Oct 21 13:27:02 MDT 2012


The branch, master has been updated
       via  13bbd3b pyglue: Make all_interfaces argumen to interface_ips() optional.
       via  f67c0a2 pyglue: Mention parameters in interface_ips() docstring.
      from  d18591c s3:rpc_server: avoid a level 0 DEBUG if tstream_npa_connect_recv fails (bug #9309)

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


- Log -----------------------------------------------------------------
commit 13bbd3b3b12bcc6e0a2e62c344908ca621774f34
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Thu Sep 27 15:19:03 2012 -0700

    pyglue: Make all_interfaces argumen to interface_ips() optional.
    
    Autobuild-User(master): Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date(master): Sun Oct 21 21:26:01 CEST 2012 on sn-devel-104

commit f67c0a28cfe3f3fc6ef2888c833e57c3d2138348
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Thu Sep 27 15:13:37 2012 -0700

    pyglue: Mention parameters in interface_ips() docstring.

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

Summary of changes:
 source4/scripting/python/pyglue.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/python/pyglue.c b/source4/scripting/python/pyglue.c
index c21de46..735f03a 100644
--- a/source4/scripting/python/pyglue.c
+++ b/source4/scripting/python/pyglue.c
@@ -140,9 +140,9 @@ static PyObject *py_interface_ips(PyObject *self, PyObject *args)
 	struct loadparm_context *lp_ctx;
 	struct interface *ifaces;
 	int i, ifcount;
-	int all_interfaces;
+	int all_interfaces = 1;
 
-	if (!PyArg_ParseTuple(args, "Oi", &py_lp_ctx, &all_interfaces))
+	if (!PyArg_ParseTuple(args, "O|i", &py_lp_ctx, &all_interfaces))
 		return NULL;
 
 	tmp_ctx = talloc_new(NULL);
@@ -223,6 +223,8 @@ static PyMethodDef py_misc_methods[] = {
 	{ "get_debug_level", (PyCFunction)py_get_debug_level, METH_NOARGS,
 		"get debug level" },
 	{ "interface_ips", (PyCFunction)py_interface_ips, METH_VARARGS,
+		"interface_ips(lp_ctx[, all_interfaces) -> list_of_ifaces\n"
+		"\n"
 		"get interface IP address list"},
 	{ "strcasecmp_m", (PyCFunction)py_strcasecmp_m, METH_VARARGS,
 		"(for testing) compare two strings using Samba's strcasecmp_m()"},


-- 
Samba Shared Repository


More information about the samba-cvs mailing list