Fix debug handling in libsmbclient.c.

Also, PLEASE, PLEASE, PLEASE, do not include bashism and Cisms in shell
scripts.
(This used to be commit 7f6367aac8c5440e1d4e97b26571b205140488ae)

diff --git a/source3/autogen.sh b/source3/autogen.sh
index 869f1d2f5e570ac8c1027f49a36258e27fd6dc1d..32dfd9f72a5d1b2ee025911d4915e8ed47a02f5d 100755 (executable)
--- a/source3/autogen.sh
+++ b/source3/autogen.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 
 # Run this script to build samba from CVS.
 
@@ -15,7 +15,7 @@ AUTOCONFFOUND="0"
 ## Look for autoheader 
 ##
 for i in $TESTAUTOHEADER; do
-       if which $i >& /dev/null; then
+       if which $i > /dev/null; then
                if [ `$i --version | head -1 | cut -d.  -f 2` -ge 53 ]; then
                        AUTOHEADER=$i
                        AUTOHEADERFOUND="1"
@@ -29,7 +29,7 @@ done
 ##
 
 for i in $TESTAUTOCONF; do
-       if which $i >& /dev/null; then
+       if which $i > /dev/null; then
                if [ `$i --version | head -1 | cut -d.  -f 2` -ge 53 ]; then
                        AUTOCONF=$i
                        AUTOCONFFOUND="1"
@@ -42,7 +42,7 @@ done
 ## 
 ## do we have it?
 ##
-if [ "$AUTOCONFFOUND" == "0" -o "$AUTOHEADERFOUND" == "0" ]; then
+if [ "$AUTOCONFFOUND" = "0" -o "$AUTOHEADERFOUND" = "0" ]; then
        echo "$0: need autoconf 2.53 or later to build samba from CVS" >&2
        exit 1
 fi

diff --git a/source3/libsmb/libsmbclient.c b/source3/libsmb/libsmbclient.c
index c04736d8f59a19653cf693bb0541d5615bb1d8b5..a0223568f1f80648d0df6f8e30c47d1e96b0a2e8 100644 (file)
--- a/source3/libsmb/libsmbclient.c
+++ b/source3/libsmb/libsmbclient.c
@@ -2670,8 +2670,8 @@ SMBCCTX * smbc_init_context(SMBCCTX * context)
        if (!smbc_initialized) {
                /* Do some library wide intialisations the first time we get called */
 
-               /* Do we still need this ? */
-               DEBUGLEVEL = 10;
+               /* Set this to what the user wants */
+               DEBUGLEVEL = context->debug;
                
                setup_logging( "libsmbclient", True);