Merge branch 'v3-3-test' of ssh://git.samba.org/data/git/samba into v3-3-test

(This used to be commit 11d74fc51c637b8129304b5de85bbe02a86a69ce)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 8b0a5f0ce24d08a4791bc664f712f000f824ab52..cd701837115600f723440b366091e19f372cc595 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1924,9 +1924,9 @@ $(LIBSMBCLIENT_SHARED_TARGET): $(LIBSMBCLIENT_SHARED_TARGET_SONAME)
        @rm -f $@
        @ln -s `basename $(LIBSMBCLIENT_SHARED_TARGET_SONAME)` $@
 
-$(LIBSMBCLIENT_STATIC_TARGET): $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ0)
+$(LIBSMBCLIENT_STATIC_TARGET): $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ1)
        @echo Linking non-shared library $@
-       @-$(AR) -rc $@ $(LIBSMBCLIENT_OBJ0)
+       @-$(AR) -rc $@ $(LIBSMBCLIENT_OBJ1)
 
 libsmbclient: $(LIBSMBCLIENT)
 

diff --git a/source3/include/libsmbclient.h b/source3/include/libsmbclient.h
index 2828e9e78054d26794e1ad1fdad0668e9f352ff9..5fe4fa8c60b9fabd000d9f5629d1af0fa749f8f4 100644 (file)
--- a/source3/include/libsmbclient.h
+++ b/source3/include/libsmbclient.h
@@ -2584,7 +2584,7 @@ void
 smbc_set_credentials(char *workgroup,
                      char *user,
                      char *password,
-                     bool use_kerberos,
+                     smbc_bool use_kerberos,
                      char *signing_state);
 
 

diff --git a/source3/libsmb/libsmb_context.c b/source3/libsmb/libsmb_context.c
index 114f775086bd224f4238a2d93ff1828e57158986..be26a92ca986762355bc261cd38f6eb0794bca7f 100644 (file)
--- a/source3/libsmb/libsmb_context.c
+++ b/source3/libsmb/libsmb_context.c
@@ -636,7 +636,7 @@ void
 smbc_set_credentials(char *workgroup,
                      char *user,
                      char *password,
-                     bool use_kerberos,
+                     smbc_bool use_kerberos,
                      char *signing_state)
 {