summaryrefslogtreecommitdiff
path: root/source4/ldap_server
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-06-20 14:55:32 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-06-20 08:12:03 +0200
commita1f04e8abc761ef1ba211420ff1dbda50fcf527d (patch)
tree77f452c87c7e859341728e2835bd7493b6d8c9c7 /source4/ldap_server
parent018f4a5889743f742a59e9ad72056b2ea09adfe9 (diff)
downloadsamba-a1f04e8abc761ef1ba211420ff1dbda50fcf527d.tar.gz
samba-a1f04e8abc761ef1ba211420ff1dbda50fcf527d.tar.bz2
samba-a1f04e8abc761ef1ba211420ff1dbda50fcf527d.zip
libcli/util Rename common map_nt_error_from_unix to avoid duplicate symbol
The two error tables need to be combined, but for now seperate the names. (As the common parts of the tree now use the _common function, errmap_unix.c must be included in the s3 autoconf build). Andrew Bartlett Autobuild-User: Andrew Bartlett <abartlet@samba.org> Autobuild-Date: Mon Jun 20 08:12:03 CEST 2011 on sn-devel-104
Diffstat (limited to 'source4/ldap_server')
-rw-r--r--source4/ldap_server/ldap_extended.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/ldap_server/ldap_extended.c b/source4/ldap_server/ldap_extended.c
index f70b8084d7..5cfa2d3b16 100644
--- a/source4/ldap_server/ldap_extended.c
+++ b/source4/ldap_server/ldap_extended.c
@@ -82,7 +82,7 @@ static void ldapsrv_starttls_postprocess_done(struct tevent_req *subreq)
conn, &conn->sockets.tls);
TALLOC_FREE(subreq);
if (ret == -1) {
- NTSTATUS status = map_nt_error_from_unix(sys_errno);
+ NTSTATUS status = map_nt_error_from_unix_common(sys_errno);
DEBUG(1,("ldapsrv_starttls_postprocess_done: accept_tls_loop: "
"tstream_tls_accept_recv() - %d:%s => %s",