Merge branch 'master' into wip/win32-port2

2009-11-25 05:41:14 -08:00
parent 2204b852a7 b6fe5a95d3
commit 86f4c66efd
23 changed files with 108 additions and 165 deletions
--- a/kadmin/kadm_conn.c
+++ b/kadmin/kadm_conn.c
@@ -175,7 +175,7 @@ wait_for_connection(krb5_context context,
    FD_ZERO(&orig_read_set);

    for(i = 0; i < num_socks; i++) {
-#ifndef NO_LIMIT_FD_SETSIZE
+#ifdef FD_SETSIZE
 	if (socks[i] >= FD_SETSIZE)
 	    errx (1, "fd too large");
 #endif