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

[Günther Deschner]

The branch, v3-6-test has been updated
       via  1fff258 libcli/named_pipe_auth: add forward declaration in npa_tstream.h.
       via  00e5d08 s3-waf: check for pthread support.
       via  f7411da s3-proto: move remaining krb5 protos to krb5_protos.h
      from  8deb28c s3: remove various references to server side dcerpc structs (which are not needed).

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


- Log -----------------------------------------------------------------
commit 1fff2580d791a92137f9d5ab27dcb4a82188f020
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 29 23:58:18 2011 +0200

    libcli/named_pipe_auth: add forward declaration in npa_tstream.h.
    
    Guenther
    (cherry picked from commit 89ceb489784358f9476bb6be0ad3ab9ea4d1b9c2)

commit 00e5d087ca0ce1c5258d89aec44d59adeb681b50
Author: Günther Deschner <gd at samba.org>
Date:   Wed Apr 27 16:07:35 2011 +0200

    s3-waf: check for pthread support.
    
    Guenther
    (cherry picked from commit cad8fafa0391e9f13c2958c45ca5ec57f93f1e7b)

commit f7411daa8cb1bb8222a09d112031a259cbd69ac8
Author: Günther Deschner <gd at samba.org>
Date:   Tue May 3 12:05:47 2011 +0200

    s3-proto: move remaining krb5 protos to krb5_protos.h
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Tue May  3 15:38:40 CEST 2011 on sn-devel-104
    (cherry picked from commit 9c48345e32c9aebd93c67103ea6984d74f2061b4)

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

Summary of changes:
 libcli/named_pipe_auth/npa_tstream.h |    1 +
 source3/include/krb5_protos.h        |    6 ++++++
 source3/include/proto.h              |    7 -------
 source3/wscript                      |   31 +++++++++++++++++++++++++++++++
 4 files changed, 38 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/named_pipe_auth/npa_tstream.h b/libcli/named_pipe_auth/npa_tstream.h
index f222317..1d85de7 100644
--- a/libcli/named_pipe_auth/npa_tstream.h
+++ b/libcli/named_pipe_auth/npa_tstream.h
@@ -23,6 +23,7 @@
 struct tevent_req;
 struct tevent_context;
 struct auth_session_info_transport;
+struct tsocket_address;
 
 struct tevent_req *tstream_npa_connect_send(TALLOC_CTX *mem_ctx,
 					    struct tevent_context *ev,
diff --git a/source3/include/krb5_protos.h b/source3/include/krb5_protos.h
index 530122b..e9f282b 100644
--- a/source3/include/krb5_protos.h
+++ b/source3/include/krb5_protos.h
@@ -146,3 +146,9 @@ int cli_krb5_get_ticket(TALLOC_CTX *mem_ctx,
 			time_t *tgs_expire,
 			const char *impersonate_princ_s);
 
+/* The following definitions come from libsmb/clikrb5.c  */
+
+bool unwrap_edata_ntstatus(TALLOC_CTX *mem_ctx,
+			   DATA_BLOB *edata,
+			   DATA_BLOB *edata_out);
+bool unwrap_pac(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, DATA_BLOB *unwrapped_pac_data);
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 157a4ab..213ce12 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1674,13 +1674,6 @@ NTSTATUS cli_force_encryption(struct cli_state *c,
 			const char *password,
 			const char *domain);
 
-/* The following definitions come from libsmb/clikrb5.c  */
-
-bool unwrap_edata_ntstatus(TALLOC_CTX *mem_ctx, 
-			   DATA_BLOB *edata, 
-			   DATA_BLOB *edata_out);
-bool unwrap_pac(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, DATA_BLOB *unwrapped_pac_data);
-
 /* The following definitions come from libsmb/clilist.c  */
 
 NTSTATUS cli_list_old(struct cli_state *cli,const char *Mask,uint16 attribute,
diff --git a/source3/wscript b/source3/wscript
index 32c688c..a1043c8 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -1713,6 +1713,37 @@ main() {
     if Options.options.with_profiling_data:
         conf.DEFINE('WITH_PROFILE', 1);
 
+    PTHREAD_CFLAGS='error'
+    PTHREAD_LDFLAGS='error'
+
+    if PTHREAD_LDFLAGS == 'error':
+        if conf.CHECK_FUNCS_IN('pthread_attr_init', 'pthread'):
+            PTHREAD_CFLAGS='-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS'
+            PTHREAD_LDFLAGS='-lpthread'
+    if PTHREAD_LDFLAGS == 'error':
+        if conf.CHECK_FUNCS_IN('pthread_attr_init', 'pthreads'):
+            PTHREAD_CFLAGS='-D_THREAD_SAFE'
+            PTHREAD_LDFLAGS='-lpthreads'
+    if PTHREAD_LDFLAGS == 'error':
+        if conf.CHECK_FUNCS_IN('pthread_attr_init', 'c_r'):
+            PTHREAD_CFLAGS='-D_THREAD_SAFE -pthread'
+            PTHREAD_LDFLAGS='-pthread'
+    if PTHREAD_LDFLAGS == 'error':
+        if conf.CHECK_FUNC('pthread_attr_init'):
+            PTHREAD_CFLAGS='-D_REENTRANT'
+            PTHREAD_LDFLAGS='-lpthread'
+    # especially for HP-UX, where the CHECK_FUNC macro fails to test for
+    # pthread_attr_init. On pthread_mutex_lock it works there...
+    if PTHREAD_LDFLAGS == 'error':
+        if conf.CHECK_FUNCS_IN('pthread_mutex_lock', 'pthread'):
+            PTHREAD_CFLAGS='-D_REENTRANT'
+            PTHREAD_LDFLAGS='-lpthread'
+
+    if PTHREAD_CFLAGS != 'error' and PTHREAD_LDFLAGS != 'error':
+        conf.ADD_CFLAGS(PTHREAD_CFLAGS)
+        conf.ADD_LDFLAGS(PTHREAD_LDFLAGS)
+        conf.CHECK_HEADERS('pthread.h')
+        conf.DEFINE('HAVE_PTHREAD', '1')
 
     if conf.CHECK_HEADERS('gpfs_gpl.h'):
         conf.DEFINE('HAVE_GPFS', '1')


-- 
Samba Shared Repository