summaryrefslogtreecommitdiffstats
path: root/source/lib/ldap_escape.c
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2007-02-28 14:35:26 +0000
committerGerald Carter <jerry@samba.org>2007-02-28 14:35:26 +0000
commit80236f0d60ce013134c1ed5422d148e541f70a4f (patch)
treef71326fa71c0323e6b5d87b75b289d0608480f87 /source/lib/ldap_escape.c
parentf05f5dce39b11e937fb19270b7bcc888582edf35 (diff)
downloadsamba-80236f0d60ce013134c1ed5422d148e541f70a4f.tar.gz
samba-80236f0d60ce013134c1ed5422d148e541f70a4f.tar.xz
samba-80236f0d60ce013134c1ed5422d148e541f70a4f.zip
r21585: Start syncing the monster that will become 3.0.25pre1
Still todo: * release notes * few minor outstanding patches * additional idmap man pages
Diffstat (limited to 'source/lib/ldap_escape.c')
-rw-r--r--source/lib/ldap_escape.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/lib/ldap_escape.c b/source/lib/ldap_escape.c
index fcb787e9e85..26230884341 100644
--- a/source/lib/ldap_escape.c
+++ b/source/lib/ldap_escape.c
@@ -36,7 +36,7 @@
char *escape_ldap_string_alloc(const char *s)
{
size_t len = strlen(s)+1;
- char *output = SMB_MALLOC(len);
+ char *output = (char *)SMB_MALLOC(len);
const char *sub;
int i = 0;
char *p = output;
@@ -68,7 +68,7 @@ char *escape_ldap_string_alloc(const char *s)
if (sub) {
len = len + 3;
- output = SMB_REALLOC(output, len);
+ output = (char *)SMB_REALLOC(output, len);
if (!output) {
return NULL;
}