[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  fa99ae7 tls: Fix warning Wunused-variable
      from  3823451 nsswitch: Also set h_errnop for nss_wins functions

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


- Log -----------------------------------------------------------------
commit fa99ae70f1e1b01bbe80261335615cc51bc660d7
Author: Lukas Slebodnik <lslebodn at redhat.com>
Date:   Sat Sep 17 18:03:12 2016 +0200

    tls: Fix warning Wunused-variable
    
    The variable error_pos is used only with enabled ENABLE_GNUTLS
    There are warnings if compiled witout gnutls
    
    ../source4/lib/tls/tls_tstream.c: In function ‘_tstream_tls_connect_send’:
    ../source4/lib/tls/tls_tstream.c:1053:14:
        warning: unused variable ‘error_pos’ [-Wunused-variable]
      const char *error_pos;
                  ^~~~~~~~~
    ../source4/lib/tls/tls_tstream.c: In function ‘_tstream_tls_accept_send’:
    ../source4/lib/tls/tls_tstream.c:1333:14:
         warning: unused variable ‘error_pos’ [-Wunused-variable]
      const char *error_pos;
                  ^~~~~~~~~
    
    Signed-off-by: Lukas Slebodnik <lslebodn at redhat.com>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Wed Sep 21 00:01:09 CEST 2016 on sn-devel-144

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

Summary of changes:
 source4/lib/tls/tls_tstream.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/lib/tls/tls_tstream.c b/source4/lib/tls/tls_tstream.c
index 5045e88..28fe332 100644
--- a/source4/lib/tls/tls_tstream.c
+++ b/source4/lib/tls/tls_tstream.c
@@ -1050,8 +1050,8 @@ struct tevent_req *_tstream_tls_connect_send(TALLOC_CTX *mem_ctx,
 {
 	struct tevent_req *req;
 	struct tstream_tls_connect_state *state;
-	const char *error_pos;
 #if ENABLE_GNUTLS
+	const char *error_pos;
 	struct tstream_tls *tlss;
 	int ret;
 #endif /* ENABLE_GNUTLS */
@@ -1330,8 +1330,8 @@ struct tevent_req *_tstream_tls_accept_send(TALLOC_CTX *mem_ctx,
 	struct tevent_req *req;
 	struct tstream_tls_accept_state *state;
 	struct tstream_tls *tlss;
-	const char *error_pos;
 #if ENABLE_GNUTLS
+	const char *error_pos;
 	int ret;
 #endif /* ENABLE_GNUTLS */
 


-- 
Samba Shared Repository