[SCM] Samba Shared Repository - branch v3-5-test updated

[Karolin Seeger]

The branch, v3-5-test has been updated
       via  68ea976... s3: Fix bug 7202 for multi-threaded applications
       via  3c68414... s3: Fix bug 7202
      from  5543629... s3-winreg: Fix _winreg_QueryValue crash bugs and implement windows behavior.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test


- Log -----------------------------------------------------------------
commit 68ea9765177f1c343750d9a5d199ec5af52b9678
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Mar 21 17:49:06 2010 +0100

    s3: Fix bug 7202 for multi-threaded applications
    
    Thanks to Sergey Tereschenko <serg.partizan at gmail.com> for providing good
    feedback!
    
    Volker

commit 3c68414b2fe1e8db66469b4b6374b26b5fe9fbcb
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Mar 20 15:23:17 2010 +0100

    s3: Fix bug 7202
    
    Make sure _nss_wins_gethostbyname_r has a talloc stackframe available
    
    Thanks to Sergey Tereschenko <serg.partizan at gmail.com> for reporting the bug!
    
    Volker

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

Summary of changes:
 nsswitch/wins.c      |    5 +++++
 source3/configure.in |    1 +
 2 files changed, 6 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/nsswitch/wins.c b/nsswitch/wins.c
index 80f0119..aa95ec7 100644
--- a/nsswitch/wins.c
+++ b/nsswitch/wins.c
@@ -333,11 +333,14 @@ _nss_wins_gethostbyname_r(const char *hostname, struct hostent *he,
 	int i, count;
 	fstring name;
 	size_t namelen;
+	TALLOC_CTX *frame;
 
 #if HAVE_PTHREAD
 	pthread_mutex_lock(&wins_nss_mutex);
 #endif
 
+	frame = talloc_stackframe();
+
 	memset(he, '\0', sizeof(*he));
 	fstrcpy(name, hostname);
 
@@ -421,6 +424,8 @@ _nss_wins_gethostbyname_r(const char *hostname, struct hostent *he,
 
   out:
 
+	TALLOC_FREE(frame);
+
 #if HAVE_PTHREAD
 	pthread_mutex_unlock(&wins_nss_mutex);
 #endif
diff --git a/source3/configure.in b/source3/configure.in
index f744761..a9b9e47 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6336,6 +6336,7 @@ if test x"$PTHREAD_CFLAGS" != xerror -a x"$PTHREAD_LDFLAGS" != xerror; then
 	AC_CHECK_HEADERS(pthread.h)
 	CFLAGS=$ac_save_CFLAGS
 	LDFLAGS=$ac_save_LDFLAGS
+	AC_DEFINE(HAVE_PTHREAD, 1, [Do we have pthreads around?])
 fi
 
 #################################################


-- 
Samba Shared Repository