[SCM] Samba Shared Repository - branch master updated

[Ralph Böhme]

The branch, master has been updated
       via  08a5fbd s3: Fix the build when compiling without JSON support
      from  6dc9f70 tests/blackbox: add test for net ads JSON output

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


- Log -----------------------------------------------------------------
commit 08a5fbd86702c28b51eeac6c2b1bd1f3713fe10d
Author: Martin Schwenke <martin at meltin.net>
Date:   Sun Sep 23 08:47:28 2018 +1000

    s3: Fix the build when compiling without JSON support
    
    [3762/3895] Compiling source3/utils/net_ads_gpo.c
    ../source3/utils/net_ads.c: In function ‘net_ads_cldap_netlogon_json’:
    ../source3/utils/net_ads.c:311:2: error: parameter name omitted
      (ADS_STRUCT *, const char *,
      ^
    ../source3/utils/net_ads.c:311:2: error: parameter name omitted
    ../source3/utils/net_ads.c:312:16: error: parameter name omitted
       const struct NETLOGON_SAM_LOGON_RESPONSE_EX *)
                    ^
    ../source3/utils/net_ads.c: In function ‘net_ads_info_json’:
    ../source3/utils/net_ads.c:520:1: error: parameter name omitted
     static int net_ads_info_json(ADS_STRUCT *)
     ^
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Ralph Böhme <slow at samba.org>
    Autobuild-Date(master): Mon Sep 24 07:03:09 CEST 2018 on sn-devel-144

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

Summary of changes:
 source3/utils/net_ads.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 77d9eec..1f05550 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -308,8 +308,9 @@ failure:
 #else /* [HAVE_JANSSON] */
 
 static int net_ads_cldap_netlogon_json
-	(ADS_STRUCT *, const char *,
-	 const struct NETLOGON_SAM_LOGON_RESPONSE_EX *)
+	(ADS_STRUCT *ads,
+	 const char *addr,
+	 const struct NETLOGON_SAM_LOGON_RESPONSE_EX * reply)
 {
 	d_fprintf(stderr, _("JSON support not available\n"));
 
@@ -517,7 +518,7 @@ failure:
 
 #else /* [HAVE_JANSSON] */
 
-static int net_ads_info_json(ADS_STRUCT *)
+static int net_ads_info_json(ADS_STRUCT *ads)
 {
 	d_fprintf(stderr, _("JSON support not available\n"));
 


-- 
Samba Shared Repository