[SCM] Samba Shared Repository - branch master updated

[simo]

On Tue, 2012-04-10 at 11:15 +0200, Andrew Bartlett wrote:
> index cafc020..f07bbc9 100644
> --- a/lib/ldb/include/ldb_private.h
> +++ b/lib/ldb/include/ldb_private.h
> @@ -181,4 +181,12 @@ struct ldb_val ldb_binary_decode(TALLOC_CTX
> *mem_ctx, const char *str);
>  const char *ldb_options_find(struct ldb_context *ldb, const char
> *options[],
>                              const char *option_name);
>  
> +struct ldif_read_file_state {
> +       FILE *f;
> +       size_t line_no;
> +};

Andrew,
can you put this back in ldb_ldif.c and provide a getter function for
the line number instead ?
Let's avoid keeping spreading structures all over.

> +struct ldb_ldif *ldb_ldif_read_file_state(struct ldb_context *ldb, 
> +                                         struct ldif_read_file_state
> *state);
> + 
-- 
Simo Sorce
Samba Team GPL Compliance Officer <simo at samba.org>
Principal Software Engineer at Red Hat, Inc. <simo at redhat.com>