[PATCH] Small cleanups

[Jeremy Allison]

On Tue, Apr 18, 2017 at 04:05:08PM +0200, vl--- via samba-technical wrote:
> Hi!
> 
> Review appreciated!

LGTM. Pushed !

> From dc4945a0ad797514b48f65099cdac2a2a70cb308 Mon Sep 17 00:00:00 2001
> From: Volker Lendecke <vl at samba.org>
> Date: Mon, 17 Apr 2017 17:04:07 +0200
> Subject: [PATCH 1/2] smbldap: pdb_ipa is gone
> 
> Signed-off-by: Volker Lendecke <vl at samba.org>
> ---
>  source3/include/smbldap.h | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/source3/include/smbldap.h b/source3/include/smbldap.h
> index ec5ff1c..4ee4a0b 100644
> --- a/source3/include/smbldap.h
> +++ b/source3/include/smbldap.h
> @@ -60,8 +60,6 @@ struct smbldap_state {
>  
>  /* struct used by both pdb_ldap.c and pdb_nds.c */
>  
> -struct ipasam_privates;
> -
>  struct ldapsam_privates {
>  	struct smbldap_state *smbldap_state;
>  
> @@ -81,10 +79,6 @@ struct ldapsam_privates {
>  	/* Is this NDS ldap? */
>  	int is_nds_ldap;
>  
> -	/* Is this IPA ldap? */
> -	int is_ipa_ldap;
> -	struct ipasam_privates *ipasam_privates;
> -
>  	/* ldap server location parameter */
>  	char *location;
>  
> -- 
> 2.1.4
> 
> 
> From 9ce777bd26940412eaf402e25ac5a63e2e6ec830 Mon Sep 17 00:00:00 2001
> From: Volker Lendecke <vl at samba.org>
> Date: Mon, 17 Apr 2017 17:12:27 +0200
> Subject: [PATCH 2/2] smbldap: Move ldapsam_privates to pdb_ldap.h
> 
> Signed-off-by: Volker Lendecke <vl at samba.org>
> ---
>  source3/include/smbldap.h | 30 ------------------------------
>  source3/passdb/pdb_ldap.h | 30 ++++++++++++++++++++++++++++++
>  2 files changed, 30 insertions(+), 30 deletions(-)
> 
> diff --git a/source3/include/smbldap.h b/source3/include/smbldap.h
> index 4ee4a0b..b287d62 100644
> --- a/source3/include/smbldap.h
> +++ b/source3/include/smbldap.h
> @@ -58,36 +58,6 @@ struct smbldap_state {
>  	struct timeval last_rebind; /* monotonic */
>  };
>  
> -/* struct used by both pdb_ldap.c and pdb_nds.c */
> -
> -struct ldapsam_privates {
> -	struct smbldap_state *smbldap_state;
> -
> -	/* Former statics */
> -	LDAPMessage *result;
> -	LDAPMessage *entry;
> -	int index;
> -
> -	const char *domain_name;
> -	struct dom_sid domain_sid;
> -
> -	/* configuration items */
> -	int schema_ver;
> -
> -	char *domain_dn;
> -
> -	/* Is this NDS ldap? */
> -	int is_nds_ldap;
> -
> -	/* ldap server location parameter */
> -	char *location;
> -
> -	struct {
> -		char *filter;
> -		LDAPMessage *result;
> -	} search_cache;
> -};
> -
>  /* The following definitions come from lib/smbldap.c  */
>  
>  NTSTATUS smbldap_init(TALLOC_CTX *mem_ctx,
> diff --git a/source3/passdb/pdb_ldap.h b/source3/passdb/pdb_ldap.h
> index 0420314..e55b0a4 100644
> --- a/source3/passdb/pdb_ldap.h
> +++ b/source3/passdb/pdb_ldap.h
> @@ -26,6 +26,36 @@
>  #ifndef _PASSDB_PDB_LDAP_H_
>  #define _PASSDB_PDB_LDAP_H_
>  
> +/* struct used by both pdb_ldap.c and pdb_nds.c */
> +
> +struct ldapsam_privates {
> +	struct smbldap_state *smbldap_state;
> +
> +	/* Former statics */
> +	LDAPMessage *result;
> +	LDAPMessage *entry;
> +	int index;
> +
> +	const char *domain_name;
> +	struct dom_sid domain_sid;
> +
> +	/* configuration items */
> +	int schema_ver;
> +
> +	char *domain_dn;
> +
> +	/* Is this NDS ldap? */
> +	int is_nds_ldap;
> +
> +	/* ldap server location parameter */
> +	char *location;
> +
> +	struct {
> +		char *filter;
> +		LDAPMessage *result;
> +	} search_cache;
> +};
> +
>  /* The following definitions come from passdb/pdb_ldap.c  */
>  
>  const char** get_userattr_list( TALLOC_CTX *mem_ctx, int schema_ver );
> -- 
> 2.1.4
>