diff options
author | Andrew Bartlett <abartlet@samba.org> | 2011-06-20 14:55:32 +1000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-20 08:12:03 +0200 |
commit | a1f04e8abc761ef1ba211420ff1dbda50fcf527d (patch) | |
tree | 77f452c87c7e859341728e2835bd7493b6d8c9c7 /source4/libcli/smb2 | |
parent | 018f4a5889743f742a59e9ad72056b2ea09adfe9 (diff) | |
download | samba-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/libcli/smb2')
-rw-r--r-- | source4/libcli/smb2/connect.c | 2 | ||||
-rw-r--r-- | source4/libcli/smb2/session.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/libcli/smb2/connect.c b/source4/libcli/smb2/connect.c index c5cacc3e0b..0e3bf1512b 100644 --- a/source4/libcli/smb2/connect.c +++ b/source4/libcli/smb2/connect.c @@ -381,7 +381,7 @@ NTSTATUS smb2_connect(TALLOC_CTX *mem_ctx, ok = tevent_req_poll(subreq, ev); if (!ok) { - status = map_nt_error_from_unix(errno); + status = map_nt_error_from_unix_common(errno); TALLOC_FREE(frame); return status; } diff --git a/source4/libcli/smb2/session.c b/source4/libcli/smb2/session.c index 0f285ecd87..d46cdefc69 100644 --- a/source4/libcli/smb2/session.c +++ b/source4/libcli/smb2/session.c @@ -318,7 +318,7 @@ NTSTATUS smb2_session_setup_spnego(struct smb2_session *session, ok = tevent_req_poll(subreq, ev); if (!ok) { - status = map_nt_error_from_unix(errno); + status = map_nt_error_from_unix_common(errno); TALLOC_FREE(frame); return status; } |