summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2008-01-04 13:59:52 -0800
committerJeremy Allison <jra@samba.org>2008-01-04 13:59:52 -0800
commit3aea92c97f4037deca26bbbe991db022ae47b34c (patch)
treecbdbde0a021376ef85f9297e1858ef9bb763e352 /source3
parent6503c7338e2c46bf3c660759c078ff51835a40e9 (diff)
parent4aba7475effff485f265fb975cf467fffd6c7db0 (diff)
downloadsamba-3aea92c97f4037deca26bbbe991db022ae47b34c.tar.gz
samba-3aea92c97f4037deca26bbbe991db022ae47b34c.tar.bz2
samba-3aea92c97f4037deca26bbbe991db022ae47b34c.zip
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit 4e1bf48e7eab927e70fde3408a42c56e06b9b178)
Diffstat (limited to 'source3')
-rw-r--r--source3/libads/ldap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index 44560c852d..975e926864 100644
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -52,7 +52,7 @@ static void gotalarm_sig(void)
gotalarm = 1;
}
-LDAP *ldap_open_with_timeout(const char *server, int port, unsigned int to)
+ LDAP *ldap_open_with_timeout(const char *server, int port, unsigned int to)
{
LDAP *ldp = NULL;