summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Peach <jpeach@samba.org>2006-04-18 06:26:23 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:16:24 -0500
commite69b32e8c28cc0e56c181f2148f29fa60e0114f7 (patch)
treeba24f4dc898959ea0e53fc2c04ca2475d881875b
parent6ca1ba38147403bc5a8a3f1ec560c0671b1f9463 (diff)
downloadsamba-e69b32e8c28cc0e56c181f2148f29fa60e0114f7.tar.gz
samba-e69b32e8c28cc0e56c181f2148f29fa60e0114f7.tar.bz2
samba-e69b32e8c28cc0e56c181f2148f29fa60e0114f7.zip
r15116: Allow the user to set winbind nss timeouts in seconds on IRIX. Don't
convert the default timeout to milliseconds twice. (This used to be commit 853ebd6e84cf52a309945f39cdf188ca346da8eb)
-rw-r--r--source3/nsswitch/winbind_nss_irix.c12
-rw-r--r--source3/nsswitch/winbind_nss_irix.h4
2 files changed, 7 insertions, 9 deletions
diff --git a/source3/nsswitch/winbind_nss_irix.c b/source3/nsswitch/winbind_nss_irix.c
index fd15f57940..05085ba1f3 100644
--- a/source3/nsswitch/winbind_nss_irix.c
+++ b/source3/nsswitch/winbind_nss_irix.c
@@ -335,11 +335,11 @@ send_next_request(nsd_file_t *rq, struct winbindd_request *request)
switch (rq->f_index) {
case LOOKUP:
timeout = nsd_attr_fetch_long(rq->f_attrs,
- "lookup_timeout", 10, 10 * 1000);
+ "lookup_timeout", 10, 10);
break;
case LIST:
timeout = nsd_attr_fetch_long(rq->f_attrs,
- "list_timeout", 10, 10 * 1000);
+ "list_timeout", 10, 10);
break;
default:
nsd_logprintf(NSD_LOG_OPER,
@@ -366,9 +366,11 @@ send_next_request(nsd_file_t *rq, struct winbindd_request *request)
/*
* Set up callback and timeouts
*/
- nsd_logprintf(NSD_LOG_MIN, "send_next_request (winbind) fd = %d\n",winbindd_fd);
- nsd_callback_new(winbindd_fd,winbind_callback,NSD_READ);
- nsd_timeout_new(rq,timeout,winbind_timeout,(void *)0);
+ nsd_logprintf(NSD_LOG_MIN, "send_next_request (winbind) fd = %d\n",
+ winbindd_fd);
+
+ nsd_callback_new(winbindd_fd, winbind_callback, NSD_READ);
+ nsd_timeout_new(rq, timeout * 1000, winbind_timeout, NULL);
return NSD_CONTINUE;
}
diff --git a/source3/nsswitch/winbind_nss_irix.h b/source3/nsswitch/winbind_nss_irix.h
index 7878abb981..339e316ff9 100644
--- a/source3/nsswitch/winbind_nss_irix.h
+++ b/source3/nsswitch/winbind_nss_irix.h
@@ -41,8 +41,4 @@ typedef enum
NSS_STATUS_TRYAGAIN=NS_TRYAGAIN
} NSS_STATUS;
-#define NSD_MEM_STATIC 0
-#define NSD_MEM_VOLATILE 1
-#define NSD_MEM_DYNAMIC 2
-
#endif /* _WINBIND_NSS_IRIX_H */