@@ -365,6 +365,9 @@

 /* Define to 1 if sysconf(_SC_PAGESIZE) is available */

 #undef HAVE_SYSCONF_SC_PAGESIZE

+/* Define to 1 if you have the `sysctlbyname' function. */

+#undef HAVE_SYSCTLBYNAME

+

 /* Define to 1 if you have the <sys/dl.h> header file. */

 #undef HAVE_SYS_DL_H

@@ -454,6 +454,8 @@ int main(int argc, char **argv)

             if (strcmp(p, "default")) {

                 if (!strcmp(p, "none")) {

                     cl_engine_set_clcb_stats_get_hostid(engine, NULL);

+                } else if (!strcmp(p, "anonymous")) {

+                    strcpy(hostid, STATS_ANON_UUID);

                 } else {

                     if (strlen(p) > 36) {

                         logg("!Invalid HostID\n");

@@ -462,7 +464,11 @@ int main(int argc, char **argv)

                         ret = 1;

                         break;

                     }

+

+                    strcpy(hostid, p);

                 }

+

+                cl_engine_set_clcb_stats_get_hostid(engine, get_hostid);

             }

         }

@@ -596,6 +596,8 @@ int scanmanager(const struct optstruct *opts)

         if (strcmp(p, "default")) {

             if (!strcmp(p, "none")) {

                 cl_engine_set_clcb_stats_get_hostid(engine, NULL);

+            } else if (!strcmp(p, "anonymous")) {

+                strcpy(hostid, STATS_ANON_UUID);

             } else {

                 if (strlen(p) > 36) {

                     logg("!Invalid HostID\n");

@@ -606,6 +608,8 @@ int scanmanager(const struct optstruct *opts)

                 strcpy(hostid, p);

             }

+

+            cl_engine_set_clcb_stats_get_hostid(engine, get_hostid);

         }

     }

@@ -15740,6 +15740,17 @@ _ACEOF

 fi

 done

+for ac_func in sysctlbyname

+do :

+  ac_fn_c_check_func "$LINENO" "sysctlbyname" "ac_cv_func_sysctlbyname"

+if test "x$ac_cv_func_sysctlbyname" = xyes; then :

+  cat >>confdefs.h <<_ACEOF

+#define HAVE_SYSCTLBYNAME 1

+_ACEOF

+

+fi

+done

+

 # Check whether --enable-mempool was given.

 if test "${enable_mempool+set}" = set; then :

@@ -350,13 +350,17 @@ main (int argc, char **argv)

         char *p = optget(opts, "stats-host-id")->strarg;

         if (strcmp(p, "default")) {

-            if (strlen(p) > 36) {

-                logg("!Invalid HostID\n");

-                optfree(opts);

-                return FCE_INIT;

-            }

+            if (!strcmp(p, "anonymous")) {

+                strcpy(hostid, STATS_ANON_UUID);

+            } else {

+                if (strlen(p) > 36) {

+                    logg("!Invalid HostID\n");

+                    optfree(opts);

+                    return FCE_INIT;

+                }

-            strcpy(hostid, p);

+                strcpy(hostid, p);

+            }

         } else {

             strcpy(hostid, "default");

         }

@@ -13,3 +13,4 @@ AC_C_FUNC_MMAP_ANONYMOUS

 AC_CHECK_FUNCS([enable_extended_FILE_stdio])

 AC_CHECK_FUNCS([timegm])

+AC_CHECK_FUNCS([sysctlbyname])