@@ -116,6 +116,7 @@ int main(int argc, char **argv)

 	}

 	ctx->opts = opts;

+        /* And our config file options */

 	clamdopts = optparse(optget(opts, "config-file")->strarg, 0, NULL, 1, OPT_CLAMD, 0, NULL);

 	if (clamdopts == NULL) {

 		logg("!Clamonacc: can't parse clamd configuration file %s\n", optget(opts, "config-file")->strarg);

@@ -123,12 +124,14 @@ int main(int argc, char **argv)

 	}

 	ctx->clamdopts = clamdopts;

+        /* Make sure we're good to begin spinup */

         ret = startup_checks(ctx);

         if (ret) {

             goto clean_up;

         }

 #ifndef _WIN32

+        /* Daemonize if sanity checks are good to go */

         if (!optget(ctx->opts, "foreground")->enabled) {

             if (-1 == daemonize()) {

                 logg("!Clamonacc: could not daemonize\n");

@@ -156,9 +159,10 @@ int main(int argc, char **argv)

 			break;

 	}

-        ctx->maxthreads = optget(ctx->clamdopts, "OnAccessMaxThreads")->numarg;

         /* Setup our event queue */

+        ctx->maxthreads = optget(ctx->clamdopts, "OnAccessMaxThreads")->numarg;

+

         switch(onas_scan_queue_start(&ctx)) {

             case CL_SUCCESS:

                 break;

@@ -297,7 +301,7 @@ static int startup_checks(struct onas_context *ctx) {

 	char faerr[128];

 #endif

 	int ret = 0;

-        cl_error_t err = CL_SUCCESS;

+	cl_error_t err = CL_SUCCESS;

 	if(optget(ctx->opts, "help")->enabled) {

 		help();

@@ -312,25 +316,33 @@ static int startup_checks(struct onas_context *ctx) {

 	}

 #if defined(FANOTIFY)

-        ctx->fan_fd = fanotify_init(FAN_CLASS_CONTENT | FAN_UNLIMITED_QUEUE | FAN_UNLIMITED_MARKS, O_LARGEFILE | O_RDONLY);

-        if (ctx->fan_fd < 0) {

-            logg("!Clamonacc: fanotify_init failed: %s\n", cli_strerror(errno, faerr, sizeof(faerr)));

-            if (errno == EPERM)

-                logg("!Clamonacc: clamonacc must have elevated permissions ... exiting ...\n");

-            ret = 2;

-            goto done;

-        }

+	ctx->fan_fd = fanotify_init(FAN_CLASS_CONTENT | FAN_UNLIMITED_QUEUE | FAN_UNLIMITED_MARKS, O_LARGEFILE | O_RDONLY);

+	if (ctx->fan_fd < 0) {

+		logg("!Clamonacc: fanotify_init failed: %s\n", cli_strerror(errno, faerr, sizeof(faerr)));

+		if (errno == EPERM) {

+			logg("!Clamonacc: clamonacc must have elevated permissions ... exiting ...\n");

+		}

+		ret = 2;

+		goto done;

+	}

 #endif

-        if (curl_global_init(CURL_GLOBAL_NOTHING)) {

-            ret = 2;

-            goto done;

-        }

+	if (curl_global_init(CURL_GLOBAL_NOTHING)) {

+		ret = 2;

+		goto done;

+	}

 	if (0 == onas_check_remote(&ctx, &err)) {

+

+		if (CL_SUCCESS != err) {

+			logg("!Clamonacc: daemon is local, but a connection could not be established\n");

+			ret = 2;

+			goto done;

+		}

+

 		if(!optget(ctx->clamdopts, "OnAccessExcludeUID")->enabled &&

-				!optget(ctx->clamdopts, "OnAccessExcludeUname")->enabled) {

-			logg("!Clamonacc: neither OnAccessExcludeUID or OnAccessExcludeUname is specified ... it is reccomended you exclude the clamd instance UID or uname to prevent infinite event scanning loops\n");

+				!optget(ctx->clamdopts, "OnAccessExcludeUname")->enabled && !optget(ctx->clamdopts, "OnAccessExcludeRootUID")->enabled) {

+			logg("!Clamonacc: at least one of OnAccessExcludeUID, OnAccessExcludeUname, or OnAccessExcludeRootUID must be specified ... it is reccomended you exclude the clamd instance UID or uname to prevent infinite event scanning loops\n");

 			ret = 2;

 			goto done;

 		}

@@ -98,17 +98,20 @@ int onas_check_remote(struct onas_context  **ctx, cl_error_t *err) {

 #ifndef _WIN32

 	if((opt = optget((*ctx)->clamdopts, "LocalSocket"))->enabled) {

-		return 0;

+		opt = optget((*ctx)->clamdopts, "LocalSocket");

+                (*ctx)->portnum = 0;

+		ret = 0;

+	} else {

+		opt = optget((*ctx)->clamdopts, "TCPAddr");

+                (*ctx)->portnum = optget((*ctx)->clamdopts, "TCPSocket")->numarg;

+		ret = 1;

 	}

-#endif

+#else

 	if(!(opt = optget((*ctx)->clamdopts, "TCPSocket"))->enabled) {

 		return 0;

 	}

+#endif

-

-	(*ctx)->portnum = optget((*ctx)->clamdopts, "TCPSocket")->numarg;

-

-	opt = optget((*ctx)->clamdopts, "TCPAddr");

 	while (opt) {

 		if (opt->strarg) {

@@ -119,21 +122,21 @@ int onas_check_remote(struct onas_context  **ctx, cl_error_t *err) {

 			logg("!ClamClient: Clamonacc does not support binding to INADDR_ANY, \

 					please specify an address with TCPAddr in your clamd.conf config file\n");

 			*err = CL_EARG;

-			return 1;

+			return ret;

 		}

 		curlcode = onas_curl_init(&curl, ipaddr, (*ctx)->portnum, timeout);

 		if (CURLE_OK != curlcode) {

 			logg("!ClamClient: could not init curl, %s\n", curl_easy_strerror(curlcode));

 			*err = CL_EARG;

-			return 1;

+			return ret;

 		}

                 curlcode = curl_easy_perform(curl);

 		if (CURLE_OK != curlcode) {

 			logg("!ClamClient: could not connect to remote clam daemon, %s\n", curl_easy_strerror(curlcode));

 			*err = CL_EARG;

-			return 1;

+			return ret;

 		}

 #ifndef ONAS_DEBUG

@@ -141,7 +144,7 @@ int onas_check_remote(struct onas_context  **ctx, cl_error_t *err) {

 			logg("!ClamClient: could not ping clamd, %s\n", curl_easy_strerror(curlcode));

 			*err = CL_EARG;

                     curl_easy_cleanup(curl);

-                    return 1;

+                    return ret;

                 }

 #endif

@@ -150,11 +153,7 @@ int onas_check_remote(struct onas_context  **ctx, cl_error_t *err) {

 		opt = opt->nextarg;

 	}

-	if (*err == CL_SUCCESS) {

-		return 1;

-	} else {

-		return 0;

-	}

+	return ret;

 }

 CURLcode onas_curl_init(CURL **curl, const char *ipaddr, int64_t port, int64_t timeout) {