Merge branch 'master' of git://git.samba.org/samba into teventfix

Conflicts:
	lib/tevent/pytevent.c

diff --git a/lib/tevent/pytevent.c b/lib/tevent/pytevent.c
index 3b45ba192875d6c994fd108e35788e21d84af1da..fe7e7e3e3826b7540fab7a9f54e80cfcfe9f942f 100644 (file)
--- a/lib/tevent/pytevent.c
+++ b/lib/tevent/pytevent.c
@@ -29,7 +29,6 @@
 
 #include <tevent.h>
 #include <stdbool.h>
-#include "tevent_util.h"
 
 typedef struct {
        PyObject_HEAD
@@ -54,7 +53,8 @@ static PyObject *py_backend_list(PyObject *self)
     PyObject *ret;
     int i, len;
 
-    len = ev_str_list_length(backends);
+    for (len = 0; backends[len]; len++);
+
     ret = PyList_New(len);
     for (i = 0; i < len; i++)
         PyList_SetItem(ret, i, PyString_FromString(backends[i]));