diff options
| author | Tom Yu <tlyu@mit.edu> | 2004-09-21 18:20:16 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2004-09-21 18:20:16 +0000 |
| commit | ac8eb05c5bae434c5da93b417d32b0ecfdb642e4 (patch) | |
| tree | ad6a5234c0ae45a9c775025cb80e605b7709a3db /src/kadmin/server | |
| parent | 54ba1d03b1c26b25f6c23fdd0c7ba58c7d9e2066 (diff) | |
| download | krb5-ac8eb05c5bae434c5da93b417d32b0ecfdb642e4.tar.gz krb5-ac8eb05c5bae434c5da93b417d32b0ecfdb642e4.tar.xz krb5-ac8eb05c5bae434c5da93b417d32b0ecfdb642e4.zip | |
* configure.in: Check for sockaddr_in.sin_len and
sockaddr.sa_len. Check for sys/param.h in case we need NBBY
somewhere.
* auth.h, svc_auth.h: Namespace cleanup.
* svc.h, rpc_commondata.c: New global svc_maxfd.
* svc.c (svc_getreqset): Break inner part of loop out into
local function svc_do_xprt(). Don't use rpc_dtablesize();
instead, use svc_maxfd.
* svc_run.c: Don't use rpc_dtablesize().
* clnt_generic.c, clnt_simple.c, getrpcport.c:
* svc_tcp.c, svc_udp.c: Set sockaddr_in.sin_len when available.
* ovsec_kadmd.c (kadm_svc_run): Don't use rpc_dtablesize().
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16770 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin/server')
| -rw-r--r-- | src/kadmin/server/ChangeLog | 4 | ||||
| -rw-r--r-- | src/kadmin/server/ovsec_kadmd.c | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/kadmin/server/ChangeLog b/src/kadmin/server/ChangeLog index 5b5464565..df708f813 100644 --- a/src/kadmin/server/ChangeLog +++ b/src/kadmin/server/ChangeLog @@ -1,3 +1,7 @@ +2004-09-21 Tom Yu <tlyu@mit.edu> + + * ovsec_kadmd.c (kadm_svc_run): Don't use rpc_dtablesize(). + 2004-08-20 Alexandra Ellwood <lxs@mit.edu> * ovsec_kadmd.c (main), server_stubs.c (*): diff --git a/src/kadmin/server/ovsec_kadmd.c b/src/kadmin/server/ovsec_kadmd.c index a880360e3..8709198d6 100644 --- a/src/kadmin/server/ovsec_kadmd.c +++ b/src/kadmin/server/ovsec_kadmd.c @@ -682,7 +682,6 @@ void kadm_svc_run(params) kadm5_config_params *params; { fd_set rfd; - int sz = gssrpc__rpc_dtablesize(); struct timeval timeout; while(signal_request_exit == 0) { @@ -709,7 +708,9 @@ kadm5_config_params *params; timeout.tv_usec = 0; rfd = svc_fdset; FD_SET(schpw, &rfd); - switch(select(sz, (fd_set *) &rfd, NULL, NULL, &timeout)) { +#define max(a, b) (((a) > (b)) ? (a) : (b)) + switch(select(max(schpw, svc_maxfd) + 1, + (fd_set *) &rfd, NULL, NULL, &timeout)) { case -1: if(errno == EINTR) continue; |