[SCM] Resolv Wrapper Repository - branch master updated
Andreas Schneider
asn at samba.org
Fri Oct 24 06:51:22 MDT 2014
The branch, master has been updated
via 8946b82 Add ChangeLog file.
via 725468b Add Jakub to AUTHORS file.
via c62f067 rwrap: Fix the cleanup of the ns ext resources.
from e124906 cmake: Fix tests on Solaris.
http://gitweb.samba.org/?p=resolv_wrapper.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 8946b825573edec795765fbd8d38ac2497702d7c
Author: Andreas Schneider <asn at samba.org>
Date: Fri Oct 24 10:13:23 2014 +0200
Add ChangeLog file.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 725468b833c5983f7c850a34245e3b216df13bc9
Author: Andreas Schneider <asn at samba.org>
Date: Fri Oct 24 10:13:01 2014 +0200
Add Jakub to AUTHORS file.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit c62f067e182956d6ab57a8c596f9e1bd03827dc1
Author: Andreas Schneider <asn at samba.org>
Date: Fri Oct 24 11:16:09 2014 +0200
rwrap: Fix the cleanup of the ns ext resources.
We should never set nssocks to something different than -1. And we only
should set it in the init function!
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
-----------------------------------------------------------------------
Summary of changes:
AUTHORS | 1 +
ChangeLog | 5 +++++
src/resolv_wrapper.c | 11 ++++++-----
3 files changed, 12 insertions(+), 5 deletions(-)
create mode 100644 ChangeLog
Changeset truncated at 500 lines:
diff --git a/AUTHORS b/AUTHORS
index 50384bd..9e366a4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1 +1,2 @@
Andreas Schneider
+Jakub Hrozek
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..0d399bd
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,5 @@
+ChangeLog
+==========
+
+version 1.0.0 (released 2014-10-24)
+ * Initial release
diff --git a/src/resolv_wrapper.c b/src/resolv_wrapper.c
index 8d0d67e..35f426d 100644
--- a/src/resolv_wrapper.c
+++ b/src/resolv_wrapper.c
@@ -1067,8 +1067,7 @@ static int rwrap_res_ninit(struct __res_state *state)
state->_u._ext.nscount = 0;
#ifdef HAVE_RESOLV_IPV6_NSADDRS
for (i = 0; i < state->_u._ext.nscount; i++) {
- free(state->_u._ext.nsaddrs[i]);
- state->_u._ext.nssocks[i] = 0;
+ SAFE_FREE(state->_u._ext.nsaddrs[i]);
}
#endif
@@ -1120,15 +1119,17 @@ static void rwrap_res_nclose(struct __res_state *state)
{
#ifdef HAVE_RESOLV_IPV6_NSADDRS
int i;
+#endif
+
+ libc_res_nclose(state);
+#ifdef HAVE_RESOLV_IPV6_NSADDRS
if (state != NULL) {
for (i = 0; i < state->_u._ext.nscount; i++) {
SAFE_FREE(state->_u._ext.nsaddrs[i]);
- state->_u._ext.nssocks[i] = 0;
}
}
#endif
- libc_res_nclose(state);
}
#if defined(HAVE_RES_NCLOSE)
@@ -1137,7 +1138,7 @@ void res_nclose(struct __res_state *state)
void __res_nclose(struct __res_state *state)
#endif
{
- libc_res_nclose(state);
+ rwrap_res_nclose(state);
}
/****************************************************************************
--
Resolv Wrapper Repository
More information about the samba-cvs
mailing list