svn commit: samba r15116 - branches/SAMBA_3_0/source/nsswitch trunk/source/nsswitch

[jpeach at samba.org]

Author: jpeach
Date: 2006-04-18 06:26:23 +0000 (Tue, 18 Apr 2006)
New Revision: 15116

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15116

Log:
Allow the user to set winbind nss timeouts in seconds on IRIX. Don't
convert the default timeout to milliseconds twice.

Modified:
   branches/SAMBA_3_0/source/nsswitch/winbind_nss_irix.c
   branches/SAMBA_3_0/source/nsswitch/winbind_nss_irix.h
   trunk/source/nsswitch/winbind_nss_irix.c
   trunk/source/nsswitch/winbind_nss_irix.h


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbind_nss_irix.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbind_nss_irix.c	2006-04-18 03:45:09 UTC (rev 15115)
+++ branches/SAMBA_3_0/source/nsswitch/winbind_nss_irix.c	2006-04-18 06:26:23 UTC (rev 15116)
@@ -335,11 +335,11 @@
         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 @@
 	/*
 	 * 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;
 }
 

Modified: branches/SAMBA_3_0/source/nsswitch/winbind_nss_irix.h
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbind_nss_irix.h	2006-04-18 03:45:09 UTC (rev 15115)
+++ branches/SAMBA_3_0/source/nsswitch/winbind_nss_irix.h	2006-04-18 06:26:23 UTC (rev 15116)
@@ -41,8 +41,4 @@
   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 */

Modified: trunk/source/nsswitch/winbind_nss_irix.c
===================================================================
--- trunk/source/nsswitch/winbind_nss_irix.c	2006-04-18 03:45:09 UTC (rev 15115)
+++ trunk/source/nsswitch/winbind_nss_irix.c	2006-04-18 06:26:23 UTC (rev 15116)
@@ -335,11 +335,11 @@
         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 @@
 	/*
 	 * 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;
 }
 

Modified: trunk/source/nsswitch/winbind_nss_irix.h
===================================================================
--- trunk/source/nsswitch/winbind_nss_irix.h	2006-04-18 03:45:09 UTC (rev 15115)
+++ trunk/source/nsswitch/winbind_nss_irix.h	2006-04-18 06:26:23 UTC (rev 15116)
@@ -41,8 +41,4 @@
   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 */