diff -r -u reference/source/nsswitch/winbind_nss_irix.c samba-3.0.7/source/nsswitch/winbind_nss_irix.c --- reference/source/nsswitch/winbind_nss_irix.c Sun Apr 4 17:37:18 2004 +++ samba-3.0.7/source/nsswitch/winbind_nss_irix.c Tue Sep 21 18:01:06 2004 @@ -122,7 +122,7 @@ } static void -dequeue_request() +dequeue_request(void) { nsd_file_t *rq; struct winbindd_request *request; @@ -332,7 +332,22 @@ NSS_STATUS status; long timeout; - timeout = 1000; + switch (rq->f_index) { + case LOOKUP: + timeout = nsd_attr_fetch_long(rq->f_attrs, + "lookup_timeout", 10, 10 * 1000); + break; + case LIST: + timeout = nsd_attr_fetch_long(rq->f_attrs, + "list_timeout", 10, 10 * 1000); + break; + default: + nsd_logprintf(NSD_LOG_OPER, + "send_next_request (winbind) " + "invalid request type %d\n", rq->f_index); + rq->f_status = NS_BADREQ; + return NSD_NEXT; + } nsd_logprintf(NSD_LOG_MIN, "send_next_request (winbind) %d to = %d\n", rq->f_cmd_data, timeout);