sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-27 03:21:53 +03:00
Code

r26112: Do proper error checking in __contains__.

Browse Source
This commit is contained in:
Jelmer Vernooij 2007-11-25 14:26:16 +01:00 committed by Stefan Metzmacher
parent df52343bc9
commit b67cc409fa
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source/lib/ldb/ldb.i
View File

@ -29,8 +29,6 @@
%{
/* Include headers */
#include <stdint.h>
#include <stdbool.h>
#include "talloc.h"
@ -80,10 +78,6 @@ typedef int ldb_error;
"Message can not be None");
}
/*
* Wrap a small bit of talloc
*/
/*
* Wrap struct ldb_val
*/
@ -133,7 +127,6 @@ typedef int ldb_error;
//talloc_free($1);
}
/*
* Wrap struct ldb_result
*/
@ -413,8 +406,8 @@ static void py_ldb_debug(void *context, enum ldb_debug_level level, const char *
%typemap(in,numinputs=1) (void (*debug)(void *context, enum ldb_debug_level level, const char *fmt, va_list ap),
void *context) {
$1 = py_ldb_debug;
/* FIXME: Should be decreased somewhere as well. Perhaps register a destructor and
tie it to the ldb context ? */
/* FIXME: Should be decreased somewhere as well. Perhaps register a
destructor and tie it to the ldb context ? */
Py_INCREF($input);
$2 = $input;
}
@ -518,16 +511,13 @@ fail:
ldb_error transaction_cancel();
#ifdef SWIGPYTHON
bool __contains__(ldb_dn *dn)
%typemap(in,numinputs=0) struct ldb_result **result_as_bool (struct ldb_result *tmp) { $1 = &tmp; }
%typemap(argout) struct ldb_result **result_as_bool { $result = ((*$1)->count > 0)?Py_True:Py_False; }
%typemap(freearg) struct ldb_result **result_as_bool { talloc_free(*$1); }
ldb_error __contains__(ldb_dn *dn, struct ldb_result **result_as_bool)
{
struct ldb_result *result;
int ret = ldb_search($self, dn, LDB_SCOPE_BASE, NULL, NULL,
&result);
/* FIXME: Check ret and set exception if necessary */
return result->count > 0;
return ldb_search($self, dn, LDB_SCOPE_BASE, NULL, NULL,
result_as_bool);
}
PyObject *parse_ldif(const char *s)