Fix ldap.py test on systems that *can* find the record (the search fails here locally).

[ira/wip.git] / source4 / lib / ldb / tools / cmdline.h

diff --git a/source4/lib/ldb/tools/cmdline.h b/source4/lib/ldb/tools/cmdline.h
index 9aaf37a9781b2b78d2c63633b7b15008eb6612be..3473d62a16992102da356423d77cbed867ff9f54 100644 (file)
--- a/source4/lib/ldb/tools/cmdline.h
+++ b/source4/lib/ldb/tools/cmdline.h
@@ -10,7 +10,7 @@
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
+   version 3 of the License, or (at your option) any later version.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,8 +18,7 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+   License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <popt.h>
@@ -28,6 +27,7 @@ struct ldb_cmdline {
        const char *url;
        enum ldb_scope scope;
        const char *basedn;
+       const char *modules_path;
        int interactive;
        int sorted;
        const char *editor;
@@ -43,9 +43,12 @@ struct ldb_cmdline {
        const char *sasl_mechanism;
        const char *input;
        const char *output;
+       char **controls;
 };
 
 struct ldb_cmdline *ldb_cmdline_process(struct ldb_context *ldb, int argc, const char **argv,
                                        void (*usage)(void));
 
 
+struct ldb_control **parse_controls(void *mem_ctx, char **control_strings);
+int handle_controls_reply(struct ldb_control **reply, struct ldb_control **request);