svn commit: samba r13166 - in branches/SAMBA_4_0/source/lib/ldb: . include

[idra at samba.org]

Author: idra
Date: 2006-01-26 16:37:37 +0000 (Thu, 26 Jan 2006)
New Revision: 13166

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13166

Log:

Patches form Brad Hards


Modified:
   branches/SAMBA_4_0/source/lib/ldb/configure.in
   branches/SAMBA_4_0/source/lib/ldb/include/ldb.h
   branches/SAMBA_4_0/source/lib/ldb/ldap.m4
   branches/SAMBA_4_0/source/lib/ldb/sqlite3.m4


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/configure.in
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/configure.in	2006-01-26 14:06:22 UTC (rev 13165)
+++ branches/SAMBA_4_0/source/lib/ldb/configure.in	2006-01-26 16:37:37 UTC (rev 13166)
@@ -15,7 +15,7 @@
 AC_INIT(include/ldb.h)
 WITH_GCOV=0
 AC_ARG_ENABLE(gcov,
-	[  --enable-gcov	Enable GCOV code coverage tests],
+	AS_HELP_STRING([--enable-gcov],[enable GCOV code coverage tests]),
 	[ WITH_GCOV=1])
 AC_SUBST(WITH_GCOV)
 AC_PROG_CC

Modified: branches/SAMBA_4_0/source/lib/ldb/include/ldb.h
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/include/ldb.h	2006-01-26 14:06:22 UTC (rev 13165)
+++ branches/SAMBA_4_0/source/lib/ldb/include/ldb.h	2006-01-26 16:37:37 UTC (rev 13166)
@@ -276,7 +276,37 @@
 
 struct ldb_parse_tree *ldb_parse_tree(void *mem_ctx, const char *s);
 char *ldb_filter_from_tree(void *mem_ctx, struct ldb_parse_tree *tree);
+
+/**
+   Encode a binary blob
+
+   This function encodes a binary blob using the encoding rules in RFC
+   2254 (Section 4). This function also escapes any non-printable
+   characters.
+
+   \param ctx the memory context to allocate the return string in.
+   \param val the (potentially) binary data to be encoded
+
+   \return the encoded data as a null terminated string
+
+   \sa <a href="http://www.ietf.org/rfc/rfc2252.txt">RFC 2252</a>.
+*/
 char *ldb_binary_encode(void *ctx, struct ldb_val val);
+
+/**
+   Encode a string
+
+   This function encodes a string using the encoding rules in RFC 2254
+   (Section 4). This function also escapes any non-printable
+   characters.
+
+   \param mem_ctx the memory context to allocate the return string in.
+   \param string the string to be encoded
+
+   \return the encoded data as a null terminated string
+
+   \sa <a href="http://www.ietf.org/rfc/rfc2252.txt">RFC 2252</a>.
+*/
 char *ldb_binary_encode_string(void *mem_ctx, const char *string);
 
 /*
@@ -328,7 +358,7 @@
 
   This is the well-known LDAP attribute syntax for a Directory String.
 
-  See <a href="http://www.ietf.org/rfc/rfc2252.txt">RFC 2252</a>, Section 4.3.2 
+  \sa <a href="http://www.ietf.org/rfc/rfc2252.txt">RFC 2252</a>, Section 4.3.2 
 */
 #define LDB_SYNTAX_DIRECTORY_STRING     "1.3.6.1.4.1.1466.115.121.1.15"
 
@@ -532,7 +562,7 @@
 
 	struct ldb_control **controls;
 	struct ldb_credentials *creds;
-}; 
+};
 
 int ldb_request(struct ldb_context *ldb, struct ldb_request *request);
 

Modified: branches/SAMBA_4_0/source/lib/ldb/ldap.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/ldap.m4	2006-01-26 14:06:22 UTC (rev 13165)
+++ branches/SAMBA_4_0/source/lib/ldb/ldap.m4	2006-01-26 16:37:37 UTC (rev 13166)
@@ -6,7 +6,7 @@
 AC_MSG_CHECKING([for LDAP support])
 
 AC_ARG_WITH(ldap,
-[  --with-ldap             LDAP support (default yes)],
+AS_HELP_STRING([--with-ldap],[LDAP backend support (default=yes)]),
 [ case "$withval" in
     yes|no)
 	with_ldap_support=$withval

Modified: branches/SAMBA_4_0/source/lib/ldb/sqlite3.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/sqlite3.m4	2006-01-26 14:06:22 UTC (rev 13165)
+++ branches/SAMBA_4_0/source/lib/ldb/sqlite3.m4	2006-01-26 16:37:37 UTC (rev 13166)
@@ -6,7 +6,7 @@
 AC_MSG_CHECKING([for SQLITE3 support])
 
 AC_ARG_WITH(sqlite3,
-[  --with-sqlite3          SQLITE3 support (default=no)],
+AS_HELP_STRING([--with-sqlite3],[SQLITE3 backend support (default=no)]),
 [ case "$withval" in
     yes|no|auto)
 	with_sqlite3_support=$withval