The branch, master has been updated
via 7c1fd74 At Michael's suggestion, factor common code into a
function. My bad :-).
from 33d9a22 smbd: Print ACL used to create hash in vfs_xattr_common
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 7c1fd74ba5261aa447c54872e49b374b543b1831
Author: Jeremy Allison <j...@samba.org>
Date: Tue Sep 11 09:06:45 2012 -0700
At Michael's suggestion, factor common code into a function. My bad :-).
Autobuild-User(master): Jeremy Allison <j...@samba.org>
Autobuild-Date(master): Tue Sep 11 20:08:37 CEST 2012 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
lib/ldb/common/ldb_parse.c | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/ldb/common/ldb_parse.c b/lib/ldb/common/ldb_parse.c
index f47ef43..33e8444 100644
--- a/lib/ldb/common/ldb_parse.c
+++ b/lib/ldb/common/ldb_parse.c
@@ -111,6 +111,13 @@ struct ldb_val ldb_binary_decode(TALLOC_CTX *mem_ctx,
const char *str)
return ret;
}
+static bool need_encode(unsigned char cval)
+{
+ if (cval < 0x20 || cval > 0x7E || strchr(" *()\\&|!\"", cval)) {
+ return true;
+ }
+ return false;
+}
/*
encode a blob as a RFC2254 binary string, escaping any
@@ -124,8 +131,7 @@ char *ldb_binary_encode(TALLOC_CTX *mem_ctx, struct ldb_val
val)
unsigned char *buf = val.data;
for (i=0;i<val.length;i++) {
- unsigned int cval = buf[i];
- if (cval < 0x20 || cval > 0x7E || strchr(" *()\\&|!\"",
buf[i])) {
+ if (need_encode(buf[i])) {
len += 2;
}
}
@@ -134,8 +140,7 @@ char *ldb_binary_encode(TALLOC_CTX *mem_ctx, struct ldb_val
val)
len = 0;
for (i=0;i<val.length;i++) {
- unsigned int cval = buf[i];
- if (cval < 0x20 || cval > 0x7E || strchr(" *()\\&|!\"",
buf[i])) {
+ if (need_encode(buf[i])) {
snprintf(ret+len, 4, "\\%02X", buf[i]);
len += 3;
} else {
--
Samba Shared Repository
