Fix merge errors on C provision interface after jelmer's good work.
authorAndrew Bartlett <abartlet@samba.org>
Fri, 11 Apr 2008 01:11:42 +0000 (11:11 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 11 Apr 2008 01:11:42 +0000 (11:11 +1000)
commit5bf1c89cf8af08fbcf4f5089079920840daad7b8
treeaaf5c5593c837cbcc9a7d147c59eea8459c8f34e
parente77ab2fbd1836bc2f9c7b2a819b06ddccf1fa78f
parenta3e1b835656470f1a80f0fa69f53a9df849baee3
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
source/param/provision.c
source/param/provision.h
source/scripting/python/samba/provision.py
source/torture/libnet/libnet_BecomeDC.c
source/torture/local/torture.c