Andrew Bartlett ae977ef247 Fix merge errors on C provision interface after jelmer's good work. ...

Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet

Conflicts:

	source/torture/local/torture.c
(This used to be commit 5bf1c89cf8af08fbcf4f5089079920840daad7b8)

2008-04-11 11:11:42 +10:00

..

samba

Fix merge errors on C provision interface after jelmer's good work.

2008-04-11 11:11:42 +10:00

subunit

Convert some more files to GPLv3.

2008-03-28 01:08:49 -05:00

ac_pkg_swig.m4

r26247: Don't allow use of older SWIG versions.

2007-12-21 05:47:25 +01:00

config.m4

Remove define that appears to cause configure test breakage on Julien's machine.

2008-03-27 22:26:37 +01:00

config.mk

build: we don't rely on bash yet:-) '==' should be just '='

2008-03-13 15:56:39 +01:00

misc_wrap.c

Install public header files again and include required prototypes.

2008-04-02 04:53:27 +02:00

misc.i

Install public header files again and include required prototypes.

2008-04-02 04:53:27 +02:00

misc.py

python: Make SamDB.set_ntds_invocation_id take a string.

2008-01-25 00:51:09 +01:00

modules.c

Add manually written Python binding for libnet_Join.

2008-04-08 05:16:07 +02:00

modules.h

r26599: Attempt to also support provisioning using Python in the BECOME-DC test.

2007-12-26 11:57:08 -06:00

pyrpc.h

Add python bindings for drsuapi.

2008-04-08 03:23:53 +02:00

pytalloc.c

python: Fix deallocation bug in pytalloc.

2008-01-14 19:53:06 +01:00

pytalloc.h

python: Allow wrapping pointers within talloc'ed memory that are not talloc contexts.

2008-01-14 19:53:05 +01:00

smbpython.c

r26599: Attempt to also support provisioning using Python in the BECOME-DC test.

2007-12-26 11:57:08 -06:00

STATUS

LDAP now works with the python provision!

2008-02-08 17:12:25 +11:00

uuidmodule.c

Don't talloc_free() the UUID before we return.

2008-03-13 09:53:32 +11:00