Consistency updates for lib/kadm5 and don't check fd_set size if it's not necessary
This commit is contained in:

committed by
Love Hornquist Astrand

parent
a79bf3464d
commit
c6b8fad5dc
@@ -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)
|
||||
|
||||
|
@@ -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);
|
||||
|
@@ -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);
|
||||
|
Reference in New Issue
Block a user