commit - 2b0b2661ea2037500c5a4744bc7383ba0c7fd133
commit + 71b02f6390ca350eee6c13259140143e34e0dd25
blob - 74a236425d5b1df27dea26258c7e6644edcf7a88
blob + 0eac060cab77e8d58cf641739431835a8beab823
--- config.c
+++ config.c
@@ -548,7 +548,7 @@ config_recv(struct conf *conf, struct imsg *imsg)
 		addr->conf = conf;
 		addr->sock = imsg->fd;
 		event_set(&addr->evsock, addr->sock, EV_READ|EV_PERSIST,
-		    do_accept, addr);
+		    server_accept, addr);
 		if ((addr->ctx = tls_server()) == NULL)
 			fatal("tls_server failure");
 		TAILQ_INSERT_HEAD(&conf->addrs, addr, addrs);
blob - d80bc112e38dbb325de8ba8dad6c380c656c5a98
blob + d6d1b90403207e8848e70b38c38bf0a7a5dca478
--- ge.c
+++ ge.c
@@ -200,7 +200,7 @@ serve(struct conf *conf, const char *host, int port, c
 		addr->conf = conf;
 		addr->sock = sock;
 		event_set(&addr->evsock, addr->sock, EV_READ|EV_PERSIST,
-		    do_accept, addr);
+		    server_accept, addr);
 
 		if ((addr->ctx = tls_server()) == NULL)
 			fatal("tls_server failure");
blob - 7ba92d68ca2c29df6d2390e6d3c8270835461222
blob + fbea6f66ad2cfcf577795bf14ae099542a713815
--- gmid.h
+++ gmid.h
@@ -408,7 +408,7 @@ void		 client_write(struct bufferevent *, void *);
 void		 start_reply(struct client*, int, const char*);
 void		 client_close(struct client *);
 struct client	*client_by_id(int);
-void		 do_accept(int, short, void *);
+void		 server_accept(int, short, void *);
 void		 server_init(struct privsep *, struct privsep_proc *, void *);
 int		 server_configure_done(struct conf *);
 void		 server(struct privsep *ps, struct privsep_proc *);
blob - d63f3022c0606dd3e98e113372f6962200c9ec9d
blob + 8559b99344adc7478d8e745af031c24b490e6d5e
--- server.c
+++ server.c
@@ -1288,7 +1288,7 @@ client_close(struct client *c)
 }
 
 void
-do_accept(int sock, short et, void *d)
+server_accept(int sock, short et, void *d)
 {
 	struct address *addr = d;
 	struct client *c;