[PATCH] A few cleanups

[Jeremy Allison]

On Tue, May 16, 2017 at 12:56:20PM +0200, Volker Lendecke via samba-technical wrote:
> On Sun, May 14, 2017 at 09:02:23AM -0400, Jim Brown via samba-technical wrote:
> > You should remove '#include "ads.h"' in idmap_ad_nss.c (after adding
> > '#include "winbindd_ads.h"'.
> 
> Thanks, attached!
> 
> Review appreciated!

LGTM. Pushed !

> 
> -- 
> SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen
> phone: +49-551-370000-0, fax: +49-551-370000-9
> AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen
> http://www.sernet.de, mailto:kontakt at sernet.de

> From af1d10911e463ffd89f6cb459ad2b1432ed9d9eb Mon Sep 17 00:00:00 2001
> From: Volker Lendecke <vl at samba.org>
> Date: Thu, 11 May 2017 21:30:30 +0200
> Subject: [PATCH 1/2] libsmb: proto.h does not need ads.h
> 
> Signed-off-by: Volker Lendecke <vl at samba.org>
> ---
>  source3/libsmb/proto.h | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h
> index c5e28ef..137c355 100644
> --- a/source3/libsmb/proto.h
> +++ b/source3/libsmb/proto.h
> @@ -26,7 +26,6 @@
>  #ifndef _LIBSMB_PROTO_H_
>  #define _LIBSMB_PROTO_H_
>  
> -#include "ads.h"
>  #include "auth_info.h"
>  
>  struct smb_trans_enc_state;
> -- 
> 2.1.4
> 
> 
> From 1bbb2c577972832f6adaf4644f613f664b7f629c Mon Sep 17 00:00:00 2001
> From: Volker Lendecke <vl at samba.org>
> Date: Thu, 11 May 2017 21:38:50 +0200
> Subject: [PATCH 2/2] winbindd: Give winbindd_ads.c its own header
> 
> Not necessary to compile all of winbind when playing with ads.h
> 
> Signed-off-by: Volker Lendecke <vl at samba.org>
> ---
>  source3/winbindd/idmap_ad_nss.c   |  2 +-
>  source3/winbindd/idmap_rfc2307.c  |  2 +-
>  source3/winbindd/winbindd_ads.c   |  1 +
>  source3/winbindd/winbindd_ads.h   | 33 +++++++++++++++++++++++++++++++++
>  source3/winbindd/winbindd_proto.h |  5 -----
>  5 files changed, 36 insertions(+), 7 deletions(-)
>  create mode 100644 source3/winbindd/winbindd_ads.h
> 
> diff --git a/source3/winbindd/idmap_ad_nss.c b/source3/winbindd/idmap_ad_nss.c
> index 87c7814..d65e1e9 100644
> --- a/source3/winbindd/idmap_ad_nss.c
> +++ b/source3/winbindd/idmap_ad_nss.c
> @@ -28,7 +28,7 @@
>  #include "includes.h"
>  #include "winbindd.h"
>  #include "../libds/common/flags.h"
> -#include "ads.h"
> +#include "winbindd_ads.h"
>  #include "libads/ldap_schema.h"
>  #include "nss_info.h"
>  #include "idmap.h"
> diff --git a/source3/winbindd/idmap_rfc2307.c b/source3/winbindd/idmap_rfc2307.c
> index 8ffa55b..668a7a4 100644
> --- a/source3/winbindd/idmap_rfc2307.c
> +++ b/source3/winbindd/idmap_rfc2307.c
> @@ -25,7 +25,7 @@
>  
>  #include "includes.h"
>  #include "winbindd.h"
> -#include "ads.h"
> +#include "winbindd_ads.h"
>  #include "idmap.h"
>  #include "smbldap.h"
>  #include "nsswitch/winbind_client.h"
> diff --git a/source3/winbindd/winbindd_ads.c b/source3/winbindd/winbindd_ads.c
> index d2e1ac4..c330b92 100644
> --- a/source3/winbindd/winbindd_ads.c
> +++ b/source3/winbindd/winbindd_ads.c
> @@ -23,6 +23,7 @@
>  
>  #include "includes.h"
>  #include "winbindd.h"
> +#include "winbindd_ads.h"
>  #include "rpc_client/rpc_client.h"
>  #include "../librpc/gen_ndr/ndr_netlogon_c.h"
>  #include "../libds/common/flags.h"
> diff --git a/source3/winbindd/winbindd_ads.h b/source3/winbindd/winbindd_ads.h
> new file mode 100644
> index 0000000..5f121c8
> --- /dev/null
> +++ b/source3/winbindd/winbindd_ads.h
> @@ -0,0 +1,33 @@
> +/*
> +   Unix SMB/CIFS implementation.
> +
> +   Winbind ADS backend functions
> +
> +   Copyright (C) Volker Lendecke 2017
> +
> +   This program is free software; you can redistribute it and/or modify
> +   it under the terms of the GNU General Public License as published by
> +   the Free Software Foundation; either version 3 of the License, or
> +   (at your option) any later version.
> +
> +   This program is distributed in the hope that it will be useful,
> +   but WITHOUT ANY WARRANTY; without even the implied warranty of
> +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +   GNU General Public License for more details.
> +
> +   You should have received a copy of the GNU General Public License
> +   along with this program.  If not, see <http://www.gnu.org/licenses/>.
> +*/
> +
> +#ifndef __WINBINDD_ADS_H__
> +#define __WINBINDD_ADS_H__
> +
> +
> +#include "ads.h"
> +
> +extern struct winbindd_methods ads_methods;
> +
> +ADS_STATUS ads_idmap_cached_connection(ADS_STRUCT **adsp,
> +				       const char *dom_name);
> +
> +#endif
> diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h
> index ebd9b44..57b363a 100644
> --- a/source3/winbindd/winbindd_proto.h
> +++ b/source3/winbindd/winbindd_proto.h
> @@ -23,8 +23,6 @@
>  #ifndef _WINBINDD_PROTO_H_
>  #define _WINBINDD_PROTO_H_
>  
> -#include "ads.h"
> -
>  /* The following definitions come from winbindd/winbindd.c  */
>  struct messaging_context *winbind_messaging_context(void);
>  struct imessaging_context *winbind_imessaging_context(void);
> @@ -956,9 +954,6 @@ NTSTATUS open_internal_lsa_conn(TALLOC_CTX *mem_ctx,
>  				struct rpc_pipe_client **lsa_pipe,
>  				struct policy_handle *lsa_hnd);
>  
> -/* The following definitions come from winbindd/winbindd_ads.c  */
> -ADS_STATUS ads_idmap_cached_connection(ADS_STRUCT **adsp, const char *dom_name);
> -
>  /* The following definitions come from winbindd/winbindd_irpc.c  */
>  NTSTATUS wb_irpc_register(void);
>  
> -- 
> 2.1.4
>