diff --git a/kadmin/kadmind.c b/kadmin/kadmind.c
index c3711b170..e4e2b05a2 100644
--- a/kadmin/kadmind.c
+++ b/kadmin/kadmind.c
@@ -182,11 +182,12 @@ main(int argc, char **argv)
 	 */
 
 	if(roken_getsockname(STDIN_FILENO, sa, &sa_size) < 0 &&
-	   SOCK_ERRNO == ENOTSOCK) {
+	   rk_SOCK_ERRNO == ENOTSOCK) {
 #endif
 	    parse_ports(context, port_str ? port_str : "+");
 	    pidfile(NULL);
-	    start_server(context, &sfd);
+	    start_server(context);
+	    sfd = STDIN_FILENO;
 #ifndef NO_INETD
 	} else {
 	    sfd = STDIN_FILENO;