Patch for pdb_mysql and pdb_pgsql

[Uli Meis]

Hi!

As my first action I'd like to suggest a patch then ;-)
The patch applies the neccessary changes for pdb_pgsql and pdb_mysql to work
as discussed on the bug pages. I hope I'll get 3 confirmations from the
other maintainers in reply to this.

In detail(tell me if I should do this differently in the future):
--------------------

Applies to: samba-trunk, samba3 branch (no difference here)
Generated by: svn diff

I tested the patch on the samba3 branch.
Unfortunately I couldn't compile the trunk (rev 10534), I appended the make
output to this email if anyones interested.

What it does:
--------------------
lib/talloc.c function talloc_vasprintf_append

https://bugzilla.samba.org/show_bug.cgi?id=3018

This corrects talloc_asprintf_append behavior.
Grep reveals it is only used in pdb_sql and lib/talloctort.c.

Without the patch the length of the argument to append to is not calculated
with strlen.
This brakes things like some_string[some_index]='\0';

Here a simple example I checked, result is ONE and not ONEFOUR:

query->part1 = talloc_asprintf(query,"ONE TWO THREE");
query->part1[3]='\0';
talloc_asprintf_append(query->part1,"FOUR");

-------------------
passdb/pdb_sql.c

Famous bug https://bugzilla.samba.org/show_bug.cgi?id=2531
-------------------
passdb/pdb_pgsql.c

https://bugzilla.samba.org/show_bug.cgi?id=3111


That's it.

Thanks,

Uli



make output (after ./configure --with-expsam=pgsql)
------------------------
darkenemy source # make
Using FLAGS = -O -D_SAMBA_BUILD_ -I/usr/include/postgresql/pgsql -Iinclude
-I/home/kenobi/develop/samba/samba-trunk/source/include
-I/home/kenobi/develop/samba/samba-trunk/source/ubiqx
-I/home/kenobi/develop/samba/samba-trunk/source/tdb -I.
-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
-I/home/kenobi/develop/samba/samba-trunk/source
LIBS = -lcrypt -lresolv -lnsl -ldl
LDSHFLAGS = -shared -Wl,-Bsymbolic -Wl,-rpath,/usr/lib
LDFLAGS = -Wl,-rpath,/usr/lib
PIE_CFLAGS =
PIE_LDFLAGS =
Compiling dynconfig.c
In file included from include/includes.h:1028,
from dynconfig.c:21:
include/proto.h:1546: parse error before "krb5_context"
include/proto.h:1929: parse error before '*' token
include/proto.h:1931: parse error before "smb_krb5_verify_checksum"
include/proto.h:1931: parse error before "context"
include/proto.h:1936: warning: data definition has no type or storage class
include/proto.h:1937: parse error before '*' token
include/proto.h:1938: parse error before "context"
include/proto.h:1940: parse error before "smb_krb5_get_keyinfo_from_ap_req"
include/proto.h:1940: parse error before "context"
include/proto.h:1943: warning: data definition has no type or storage class
include/proto.h:1944: parse error before
"krb5_rd_req_return_keyblock_from_keytab"
include/proto.h:1944: parse error before "context"
include/proto.h:1951: warning: data definition has no type or storage class
include/proto.h:1952: parse error before "smb_krb5_parse_name_norealm"
include/proto.h:1952: parse error before "context"
include/proto.h:1954: warning: data definition has no type or storage class
include/proto.h:1955: parse error before "context"
make: *** [dynconfig.o] Error 1


On 9/25/05, Jeremy Allison <jra at samba.org> wrote:
>
> On Sat, Sep 24, 2005 at 02:14:29PM +0200, Jelmer Vernooij wrote:
> > -----BEGIN PGP SIGNED MESSAGE-----
> > Hash: SHA1
> >
> > Hi,
> >
> > The following people have showed interest in maintaining some of the
> > experimental pdb modules:
> >
> > - - Peter Rindfuss: pdb_mysql <rindfuss at wz-berlin.de>
> > - - Darrell McGuire: pdb_mysql <dmcguire at pegasys.cc>
> > - - Ulrich Meis: pdb_pgsql <kenobi at halifax.rwth-aachen.de>
> > - - Filip Jirsák: pdb_pgsql <filip at jirsak.org>
> >
> > Nobody has stepped up so far for the pdb_xml backend.
> >
> > Jerry, what do you think is easiest way to get changes in? Just let
> > the new maintainers
> > send patches to you? Or move these modules out of the tree and
> > maintained seperately (like vfs_vscan, etc)?
> >
> > I'd of course still be happy to answer any questions regarding the code.
>
> Thanks Jelmer,
>
> I think the next step would be for the people maintaining
> the pdb_mysql and pdb_pgsql to work out what patches are needed,
> and then send them one at a time to the samba-technical lists, as
> well as attach them to the bugzilla entries of the bugs they're
> fixing.
>
> I (and Jerry I'm sure) will merge them as the maintainers agree
> that these patches are "blessed" and we'll get them into the
> main trees as soon as the above people agree.
>
> Remember you need to maintain both the SAMBA_3_0 tree and
> the HEAD svn trees - the SAMBA_3_0 tree becomes the next
> release, HEAD is where more "speculative" development takes
> place.
>
> Thanks,
>
> Jeremy.
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: pdb.patch
Type: application/octet-stream
Size: 7843 bytes
Desc: not available
Url : http://lists.samba.org/archive/samba-technical/attachments/20050927/cc298857/pdb.obj