mirror of
https://github.com/samba-team/samba.git
synced 2025-11-30 20:23:49 +03:00
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
This commit is contained in:
@@ -1353,7 +1353,7 @@ static void dcesrv_sock_reply_done(struct tevent_req *subreq)
|
||||
ret = tstream_writev_queue_recv(subreq, &sys_errno);
|
||||
TALLOC_FREE(subreq);
|
||||
if (ret == -1) {
|
||||
status = map_nt_error_from_unix(sys_errno);
|
||||
status = map_nt_error_from_unix_common(sys_errno);
|
||||
dcesrv_terminate_connection(substate->dce_conn, nt_errstr(status));
|
||||
return;
|
||||
}
|
||||
@@ -1436,7 +1436,7 @@ static void dcesrv_sock_accept(struct stream_connection *srv_conn)
|
||||
socket_get_fd(srv_conn->socket),
|
||||
&dcesrv_conn->stream);
|
||||
if (ret == -1) {
|
||||
status = map_nt_error_from_unix(errno);
|
||||
status = map_nt_error_from_unix_common(errno);
|
||||
DEBUG(0, ("dcesrv_sock_accept: "
|
||||
"failed to setup tstream: %s\n",
|
||||
nt_errstr(status)));
|
||||
|
||||
Reference in New Issue
Block a user