From 830051b494ea52475e9349e6908ff8576a990051 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 1 Mar 2008 21:18:12 +0100
Subject: Remove unused variable, fix (80, 'Other error') exceptions from ldb
 python bindings (This used to be commit
 2303063cbd2e65580618124ef8ecf42867d2b952)

---
 source4/lib/ldb/ldb.i      | 4 ++--
 source4/lib/ldb/ldb_wrap.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'source4/lib/ldb')

diff --git a/source4/lib/ldb/ldb.i b/source4/lib/ldb/ldb.i
index 2c04662f25..da4c52f778 100644
--- a/source4/lib/ldb/ldb.i
+++ b/source4/lib/ldb/ldb.i
@@ -548,7 +548,6 @@ PyObject *PyExc_LdbError;
 };
 
 %typemap(in,numinputs=1) ldb_msg *add_msg {
-    ldb_error ret;
     int dict_pos, msg_pos;
     PyObject *key, *value;
     ldb_msg_element *msgel;
@@ -559,7 +558,8 @@ PyObject *PyExc_LdbError;
         msg_pos = dict_pos = 0;
         while (PyDict_Next($input, &dict_pos, &key, &value)) {
             if (!strcmp(PyString_AsString(key), "dn")) {
-                if (ldb_dn_from_pyobject($1, value, $self, &$1->dn) != 0) {
+                /* using argp0 (magic SWIG value) here is a hack */
+                if (ldb_dn_from_pyobject($1, value, argp1, &$1->dn) != 0) {
                     SWIG_exception(SWIG_TypeError, "unable to import dn object");
                 }
             } else {
diff --git a/source4/lib/ldb/ldb_wrap.c b/source4/lib/ldb/ldb_wrap.c
index 937cb7e47c..7886778b3a 100644
--- a/source4/lib/ldb/ldb_wrap.c
+++ b/source4/lib/ldb/ldb_wrap.c
@@ -4707,7 +4707,6 @@ SWIGINTERN PyObject *_wrap_Ldb_add(PyObject *SWIGUNUSEDPARM(self), PyObject *arg
   }
   arg1 = (ldb *)(argp1);
   {
-    ldb_error ret;
     int dict_pos, msg_pos;
     PyObject *key, *value;
     ldb_msg_element *msgel;
@@ -4718,7 +4717,8 @@ SWIGINTERN PyObject *_wrap_Ldb_add(PyObject *SWIGUNUSEDPARM(self), PyObject *arg
       msg_pos = dict_pos = 0;
       while (PyDict_Next(obj1, &dict_pos, &key, &value)) {
         if (!strcmp(PyString_AsString(key), "dn")) {
-          if (ldb_dn_from_pyobject(arg2, value, obj0, &arg2->dn) != 0) {
+          /* using argp0 (magic SWIG value) here is a hack */
+          if (ldb_dn_from_pyobject(arg2, value, argp1, &arg2->dn) != 0) {
             SWIG_exception(SWIG_TypeError, "unable to import dn object");
           }
         } else {
-- 
cgit