[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-1343-g6657598

[Günther Deschner]

The branch, master has been updated
       via  6657598168724d4fe076f9014c2b5c16a034fe52 (commit)
      from  f092d689c577293d011912be5ded5ebf8aa49fc9 (commit)

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


- Log -----------------------------------------------------------------
commit 6657598168724d4fe076f9014c2b5c16a034fe52
Author: Matt Kraai <mkraai at beckman.com>
Date:   Wed Aug 26 14:50:28 2009 -0700

    Do not redefine strupr
    
    Signed-off-by: Günther Deschner <gd at samba.org>

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

Summary of changes:
 source3/configure.in      |    1 +
 source3/libaddns/dnsgss.c |    2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index 34e923d..3255751 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -1016,6 +1016,7 @@ AC_CHECK_HEADERS(sys/mman.h)
 AC_CHECK_FUNCS(shmget shm_open)
 AC_CHECK_FUNCS(gettext dgettext)
 AC_CHECK_FUNCS(bindtextdomain textdomain)
+AC_CHECK_FUNCS(strupr)
 
 # Find a method of generating a stack trace
 AC_CHECK_HEADERS(execinfo.h libexc.h libunwind.h)
diff --git a/source3/libaddns/dnsgss.c b/source3/libaddns/dnsgss.c
index e7ea041..1e3d464 100644
--- a/source3/libaddns/dnsgss.c
+++ b/source3/libaddns/dnsgss.c
@@ -31,6 +31,7 @@
 /*********************************************************************
 *********************************************************************/
 
+#ifndef HAVE_STRUPR
 static int strupr( char *szDomainName )
 {
 	if ( !szDomainName ) {
@@ -42,6 +43,7 @@ static int strupr( char *szDomainName )
 	}
 	return ( 0 );
 }
+#endif
 
 #if 0
 /*********************************************************************


-- 
Samba Shared Repository