[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  6d14128 s3-aio-pthread: num threads should be int
      from  6411faf auth/gensec: align common elements between gse_context and gensec_gssapi_state

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 6d141282424f1eb62ee225a32e376162b773e7a8
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Jan 18 18:12:57 2012 +0100

    s3-aio-pthread: num threads should be int
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Wed Jan 18 21:04:20 CET 2012 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source3/modules/vfs_aio_pthread.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_aio_pthread.c b/source3/modules/vfs_aio_pthread.c
index b6d4e1e..aeacf28 100644
--- a/source3/modules/vfs_aio_pthread.c
+++ b/source3/modules/vfs_aio_pthread.c
@@ -61,10 +61,8 @@ static void aio_pthread_handle_completion(struct event_context *event_ctx,
 
 static int aio_get_num_threads(struct vfs_handle_struct *handle)
 {
-	return lp_parm_bool(SNUM(handle->conn),
-				"aio_pthread",
-				"aio num threads",
-				100);
+	return lp_parm_int(SNUM(handle->conn),
+			   "aio_pthread", "aio num threads", 100);
 }
 
 /************************************************************************


-- 
Samba Shared Repository