r13166: Patches form Brad Hards

(This used to be commit 335050b30d832f529fb8fdd4f96e4bb3de93f38c)

4 files changed, 35 insertions, 5 deletions

diff --git a/source4/lib/ldb/configure.in b/source4/lib/ldb/configure.in
index d7b9e566de..385c0caef0 100644
--- a/source4/lib/ldb/configure.in
+++ b/source4/lib/ldb/configure.in
@@ -15,7 +15,7 @@ AC_DEFUN([SMB_ENABLE], [echo -n ""])
 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
diff --git a/source4/lib/ldb/include/ldb.h b/source4/lib/ldb/include/ldb.h
index 9a637ff9d5..087790ac68 100644
--- a/source4/lib/ldb/include/ldb.h
+++ b/source4/lib/ldb/include/ldb.h
@@ -276,7 +276,37 @@ struct ldb_parse_tree {
 
 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 @@ struct ldb_attrib_handler {
 
   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_request {
 
 	struct ldb_control **controls;
 	struct ldb_credentials *creds;
-}; 
+};
 
 int ldb_request(struct ldb_context *ldb, struct ldb_request *request);
 
diff --git a/source4/lib/ldb/ldap.m4 b/source4/lib/ldb/ldap.m4
index a9e3fb5678..716b66e07f 100644
--- a/source4/lib/ldb/ldap.m4
+++ b/source4/lib/ldb/ldap.m4
@@ -6,7 +6,7 @@ with_ldap_support=auto
 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
diff --git a/source4/lib/ldb/sqlite3.m4 b/source4/lib/ldb/sqlite3.m4
index d4a4c95870..352085da74 100644
--- a/source4/lib/ldb/sqlite3.m4
+++ b/source4/lib/ldb/sqlite3.m4
@@ -6,7 +6,7 @@ with_sqlite3_support=no
 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