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/libnet | |
| 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/libnet')
| -rw-r--r-- | source4/libnet/libnet_become_dc.c | 2 | ||||
| -rw-r--r-- | source4/libnet/libnet_site.c | 2 | ||||
| -rw-r--r-- | source4/libnet/libnet_unbecome_dc.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source4/libnet/libnet_become_dc.c b/source4/libnet/libnet_become_dc.c index a68f4c5ea0..4d845ca1f0 100644 --- a/source4/libnet/libnet_become_dc.c +++ b/source4/libnet/libnet_become_dc.c @@ -769,7 +769,7 @@ static void becomeDC_send_cldap(struct libnet_BecomeDC_state *s) lpcfg_cldap_port(s->libnet->lp_ctx), &dest_address); if (ret != 0) { - c->status = map_nt_error_from_unix(errno); + c->status = map_nt_error_from_unix_common(errno); if (!composite_is_ok(c)) return; } diff --git a/source4/libnet/libnet_site.c b/source4/libnet/libnet_site.c index f49108b28a..a74dd59a22 100644 --- a/source4/libnet/libnet_site.c +++ b/source4/libnet/libnet_site.c @@ -64,7 +64,7 @@ NTSTATUS libnet_FindSite(TALLOC_CTX *ctx, struct libnet_context *lctx, struct li &dest_address); if (ret != 0) { r->out.error_string = NULL; - status = map_nt_error_from_unix(errno); + status = map_nt_error_from_unix_common(errno); return status; } diff --git a/source4/libnet/libnet_unbecome_dc.c b/source4/libnet/libnet_unbecome_dc.c index 4bffc5079e..85d47a91f9 100644 --- a/source4/libnet/libnet_unbecome_dc.c +++ b/source4/libnet/libnet_unbecome_dc.c @@ -277,7 +277,7 @@ static void unbecomeDC_send_cldap(struct libnet_UnbecomeDC_state *s) lpcfg_cldap_port(s->libnet->lp_ctx), &dest_address); if (ret != 0) { - c->status = map_nt_error_from_unix(errno); + c->status = map_nt_error_from_unix_common(errno); if (!composite_is_ok(c)) return; } |