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 /libcli/nbt | |
| 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 'libcli/nbt')
| -rw-r--r-- | libcli/nbt/namerefresh.c | 2 | ||||
| -rw-r--r-- | libcli/nbt/nameregister.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libcli/nbt/namerefresh.c b/libcli/nbt/namerefresh.c index 79c6c1f2ea..b525356c74 100644 --- a/libcli/nbt/namerefresh.c +++ b/libcli/nbt/namerefresh.c @@ -331,7 +331,7 @@ _PUBLIC_ NTSTATUS nbt_name_refresh_wins(struct nbt_name_socket *nbtsock, } if (!tevent_req_poll(subreq, ev)) { - status = map_nt_error_from_unix(errno); + status = map_nt_error_from_unix_common(errno); talloc_free(frame); return status; } diff --git a/libcli/nbt/nameregister.c b/libcli/nbt/nameregister.c index 204fb6f328..ff5418c85e 100644 --- a/libcli/nbt/nameregister.c +++ b/libcli/nbt/nameregister.c @@ -283,7 +283,7 @@ NTSTATUS nbt_name_register_bcast(struct nbt_name_socket *nbtsock, } if (!tevent_req_poll(subreq, ev)) { - status = map_nt_error_from_unix(errno); + status = map_nt_error_from_unix_common(errno); talloc_free(frame); return status; } @@ -498,7 +498,7 @@ _PUBLIC_ NTSTATUS nbt_name_register_wins(struct nbt_name_socket *nbtsock, } if (!tevent_req_poll(subreq, ev)) { - status = map_nt_error_from_unix(errno); + status = map_nt_error_from_unix_common(errno); talloc_free(frame); return status; } |