samba-cvs.cvs
[Top] [All Lists]

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

Subject: [SCM] Samba Shared Repository - branch v3-4-test updated
From: Karolin Seeger
Date: Tue, 10 Nov 2009 03:51:48 -0600 CST
The branch, v3-4-test has been updated
       via  268fb01... s3: Do not redefine strupr.
      from  6be57c3... Fix bug 6880 - cannot list workgroup servers reported by 
Alban Browaeys <prahal@xxxxxxxxx> with fix. Revert 
2e989bab0764c298a2530a2d4c8690258eba210c with extra comments - this broke 
workgroup enumeration. Jeremy.

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


- Log -----------------------------------------------------------------
commit 268fb0106c892c4dd22e0e9bd5392a1e04121d2e
Author: Matt Kraai <mkraai@xxxxxxxxxxx>
Date:   Wed Aug 26 14:50:28 2009 -0700

    s3: Do not redefine strupr.
    
    Fixes bug #6751 (Fails to compile on QNX because of conflicting types for
    strupr).
    
    Signed-off-by: Günther Deschner <gd@xxxxxxxxx>
    (cherry picked from commit 6657598168724d4fe076f9014c2b5c16a034fe52)

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

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 ca86a9e..6644bdd 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -1057,6 +1057,7 @@ AC_CHECK_HEADERS(sys/mman.h)
 # setbuffer, shmget, shm_open are needed for smbtorture
 AC_CHECK_FUNCS(shmget shm_open)
 AC_CHECK_FUNCS(gettext dgettext)
+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

<Prev in Thread] Current Thread [Next in Thread>