[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

On Thu, 2010-10-21 at 22:35 +0200, Stefan (metze) Metzmacher wrote:
> -----------------------------------------------------------------------
> > 
> > Summary of changes:
> >  lib/socket_wrapper/wscript          |    2 +-
> >  lib/socket_wrapper/wscript_build    |    2 +-
> >  lib/tdb/include/tdb.h               |    1 +
> >  lib/tdb/tdb.exports                 |    1 +
> >  lib/tdb/tdb.signatures              |    1 +
> >
> > diff --git a/lib/tdb/include/tdb.h b/lib/tdb/include/tdb.h
> > index 115c6fa..38d8197 100644
> > --- a/lib/tdb/include/tdb.h
> > +++ b/lib/tdb/include/tdb.h
> > @@ -101,6 +101,7 @@ void tdb_set_max_dead(struct tdb_context *tdb, int max_dead);
> >  
> >  int tdb_reopen(struct tdb_context *tdb);
> >  int tdb_reopen_all(int parent_longlived);
> > +__attribute__((deprecated)) void tdb_logging_function(struct tdb_context *tdb, tdb_log_func);
> >  void tdb_set_logging_function(struct tdb_context *tdb, const struct tdb_logging_context *log_ctx);
> >  enum TDB_ERROR tdb_error(struct tdb_context *tdb);
> >  const char *tdb_errorstr(struct tdb_context *tdb);
> > diff --git a/lib/tdb/tdb.exports b/lib/tdb/tdb.exports
> > index 73b8fd6..09b9a96 100644
> > --- a/lib/tdb/tdb.exports
> > +++ b/lib/tdb/tdb.exports
> > @@ -23,6 +23,7 @@
> >             tdb_freelist_size;
> >             tdb_get_flags;
> >             tdb_get_logging_private;
> > +           tdb_logging_function;
> >             tdb_get_seqnum;
> >             tdb_hash_size;
> >             tdb_increment_seqnum_nonblock;
> > diff --git a/lib/tdb/tdb.signatures b/lib/tdb/tdb.signatures
> > index 7706d18..1201077 100644
> > --- a/lib/tdb/tdb.signatures
> > +++ b/lib/tdb/tdb.signatures
> > @@ -56,6 +56,7 @@ void tdb_increment_seqnum_nonblock (struct tdb_context *);
> >  void tdb_remove_flags (struct tdb_context *, unsigned int);
> >  void tdb_setalarm_sigptr (struct tdb_context *, volatile sig_atomic_t *);
> >  void tdb_set_logging_function (struct tdb_context *, const struct tdb_logging_context *);
> > +void tdb_logging_function(struct tdb_context *tdb, tdb_log_func);
> >  void tdb_set_max_dead (struct tdb_context *, int);
> >  int tdb_check (struct tdb_context *, int (*) (TDB_DATA, TDB_DATA, void *), void *);
> >  TDB_DATA tdb_null;
> What have this tdb changes todo with the rest?
They shouldn't have been committed in the first place, I've reverted
them now.

These changes are present in the Debian package since we didn't change
the major version number when we removed the tdb_logging_function from
tdb. I was considering adding them upstream again as well, but that
really should have been a separate commit.

Cheers,

Jelmer
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part
URL: <http://lists.samba.org/pipermail/samba-cvs/attachments/20101023/40c95e2a/attachment.pgp>