From c6b8fad5dc38e66387d90d79fa3356738368b061 Mon Sep 17 00:00:00 2001
From: Asanka Herath <asanka@secure-endpoints.com>
Date: Mon, 14 Sep 2009 13:47:38 -0400
Subject: [PATCH] Consistency updates for lib/kadm5 and don't check fd_set size
 if it's not necessary

---
 lib/kadm5/NTMakefile      | 4 ++--
 lib/kadm5/ipropd_master.c | 2 ++
 lib/kadm5/ipropd_slave.c  | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/kadm5/NTMakefile b/lib/kadm5/NTMakefile
index 6ae003fb7..029893d0d 100644
--- a/lib/kadm5/NTMakefile
+++ b/lib/kadm5/NTMakefile
@@ -219,7 +219,7 @@ $(LIBKADM5CLNT): $(LIBKADM5CLNT_OBJS)
 $(LIBKADM5SRV): $(BINDIR)\libkadm5srv.dll
 
 $(BINDIR)\libkadm5srv.dll: $(LIBKADM5SRV_OBJS) $(LIBKRB5) $(LIBROKEN) $(LIBHDB) $(LIBCOMERR) $(LIBASN1) $(LIBSQLITE)
-	$(DLLGUILINK_C) -out:$@ -implib:$(LIBKADM5SRV) -def:libkadm5srv-exports.def $**
+	$(DLLGUILINK) -implib:$(LIBKADM5SRV) -def:libkadm5srv-exports.def
 	$(_VC_MANIFEST_EMBED_DLL)
 	$(_VC_MANIFEST_CLEAN)
 	$(_CODESIGN)
@@ -247,7 +247,7 @@ $(OBJ)\default_keys.exe: $(OBJ)\default_keys.obj
 	$(_VC_MANIFEST_CLEAN)
 
 $(OBJ)\sample_passwd_check.dll: $(OBJ)\sample_passwd_check.obj
-	$(DLLGUILINK)
+	$(DLLGUILINK)		#TODO: Define exports
 	$(_VC_MANIFEST_EMBED_DLL)
 	$(_VC_MANIFEST_CLEAN)
 
diff --git a/lib/kadm5/ipropd_master.c b/lib/kadm5/ipropd_master.c
index 749040b18..e3d574d0f 100644
--- a/lib/kadm5/ipropd_master.c
+++ b/lib/kadm5/ipropd_master.c
@@ -852,8 +852,10 @@ main(int argc, char **argv)
 	struct timeval to = {30, 0};
 	uint32_t vers;
 
+#ifndef NO_LIMIT_FD_SETSIZE
 	if (signal_fd >= FD_SETSIZE || listen_fd >= FD_SETSIZE)
 	    krb5_errx (context, 1, "fd too large");
+#endif
 
 	FD_ZERO(&readset);
 	FD_SET(signal_fd, &readset);
diff --git a/lib/kadm5/ipropd_slave.c b/lib/kadm5/ipropd_slave.c
index 8a5658c04..322b928e9 100644
--- a/lib/kadm5/ipropd_slave.c
+++ b/lib/kadm5/ipropd_slave.c
@@ -657,8 +657,10 @@ main(int argc, char **argv)
 	    fd_set readset;
 	    struct timeval to;
 
+#ifndef NO_LIMIT_FD_SETSIZE
 	    if (master_fd >= FD_SETSIZE)
 		krb5_errx (context, 1, "fd too large");
+#endif
 
 	    FD_ZERO(&readset);
 	    FD_SET(master_fd, &readset);