Modify "struct stat" in lib/export/samples/nsprobe.c to avoid redefinition in

some OSes - rt20831

diff --git a/CHANGES b/CHANGES
index db9a6d23dc7a1975e533e3a5fc89ddedc87db851..f4750d17833b4730e4005e6b202facfa1133730f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2832.  [bug]           Modify "struct stat" in lib/export/samples/nsprobe.c
+                       to avoid redefinition in some OSes [RT 20831]
+
 2831.  [security]      Do not attempt to validate or cache
                        out-of-bailiwick data returned with a secure
                        answer; it must be re-fetched from its original

diff --git a/lib/export/samples/nsprobe.c b/lib/export/samples/nsprobe.c
index 1fc364c9d057a7345bdd375e9241aa0e75125965..19632cc60470464f527deb2e3d104a797f10f813 100644 (file)
--- a/lib/export/samples/nsprobe.c
+++ b/lib/export/samples/nsprobe.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsprobe.c,v 1.5 2009/09/29 15:06:06 fdupont Exp $ */
+/* $Id: nsprobe.c,v 1.6 2010/01/07 18:31:34 sar Exp $ */
 
 #include <config.h>
 
@@ -107,7 +107,7 @@ struct probe_trans {
        ISC_LIST(struct probe_ns) nslist;
 };
 
-struct stat {
+struct lcl_stat {
        unsigned long valid;
        unsigned long ignore;
        unsigned long nxdomain;
@@ -300,7 +300,7 @@ static void
 update_stat(struct probe_trans *trans) {
        struct probe_ns *pns;
        struct server *server;
-       struct stat local_stat;
+       struct lcl_stat local_stat;
        unsigned int err_count = 0;
        const char *stattype;