Merge branch 'master' into epoll

src/VERSION

@@ -1 +1 @@
-1.2.0
+1.3.1

src/accept.c

@@ -570,10 +570,14 @@ static void do_accept(struct listen_t *l)
 	if (l->portaccount->gauge >= l->clients_max || inbound_connects.gauge >= maxclients) {
 		if (inbound_connects.gauge >= maxclients) {
 			hlog(LOG_INFO, "%s - Denied client on fd %d from %s: MaxClients reached (%d)", l->addr_s, fd, s, inbound_connects.gauge);
-			write(fd, "# Server full\r\n", 15);
+			/* The "if" is here only to silence a compiler warning
+			 * about ignoring the result value. We're really
+			 * disconnecting the client right now, so we don't care.
+			 */
+			if (write(fd, "# Server full\r\n", 15));
 		} else {
 			hlog(LOG_INFO, "%s - Denied client on fd %d from %s: Too many clients on Listener (%d)", l->addr_s, fd, s, l->portaccount->gauge);
-			write(fd, "# Port full\r\n", 13);
+			if (write(fd, "# Port full\r\n", 13));
 		}
 		close(fd);
 		hfree(s);

src/aprsc.c

@@ -658,6 +658,7 @@ int main(int argc, char **argv)
 	struct rlimit rlim;
 	time_t cleanup_tick;
 	time_t version_tick;
+	int have_low_ports = 0;
 	
 	if (getuid() == 0)
 		set_initial_capabilities();
@@ -820,7 +821,7 @@ int main(int argc, char **argv)
 		set_uid();
 		//check_caps("after set_uid");
 		if (set_final_capabilities() >= 0)
-			hlog(LOG_INFO, "POSIX capabilities available: can bind low ports"); 
+			have_low_ports = 1;
 		check_caps("after set_final_capabilities");
 	}
 	
@@ -846,6 +847,13 @@ int main(int argc, char **argv)
 	
 	log_dest = orig_log_dest;
 	
+	/* log these only to the final log, after stderr is closed, so that
+	 * a normal, successful startup does not print out informative stuff
+	 * on the console
+	 */
+	if (have_low_ports)
+		hlog(LOG_INFO, "POSIX capabilities available: can bind low ports"); 
+	
 	hlog(LOG_INFO, "After configuration FileLimit is %d, MaxClients is %d", fileno_limit, maxclients);
 	
 	/* validate maxclients vs fileno_limit, now when it's determined */

src/version.h

@@ -12,9 +12,9 @@
  * If you're making modifications, put your own variant version
  * identification in version_branch.h. Thanks!
  */
-#define VERSION "1.2.0"
+#define VERSION "1.3.1"
 
-#define APRSC_TOCALL "APSC12"
+#define APRSC_TOCALL "APSC13"
 
 extern const char version_build[];
 extern const char verstr[];