Jelmer Vernooij
6267dd7853
Clean up some git merges gone wrong.
...
(This used to be commit 42eb6b33462228467e65a51bbf624c481802b090)
2008-05-10 20:59:17 +02:00
Jelmer Vernooij
cc9c4aaa8d
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
...
Conflicts:
source/Makefile
source/auth/config.mk
source/auth/gensec/config.mk
source/build/m4/public.m4
source/build/make/python.mk
source/build/make/rules.mk
source/build/smb_build/header.pm
source/build/smb_build/main.pl
source/build/smb_build/makefile.pm
source/dsdb/config.mk
source/dsdb/samdb/ldb_modules/config.mk
source/kdc/config.mk
source/lib/events/config.mk
source/lib/events/events.c
source/lib/ldb/config.mk
source/lib/nss_wrapper/config.mk
source/lib/policy/config.mk
source/lib/util/config.mk
source/libcli/smb2/config.mk
source/libnet/config.mk
source/librpc/config.mk
source/nbt_server/config.mk
source/ntptr/ntptr_base.c
source/ntvfs/posix/config.mk
source/ntvfs/sysdep/config.mk
source/param/config.mk
source/rpc_server/config.mk
source/rpc_server/service_rpc.c
source/scripting/ejs/config.mk
source/scripting/python/config.mk
source/smb_server/config.mk
source/smbd/server.c
source/torture/config.mk
source/torture/smb2/config.mk
source/wrepl_server/config.mk
(This used to be commit 13bbd420681519894a4036729c43273912c9b402)
2008-04-25 10:04:20 +01:00
Kai Blin
240d959005
libnet: Make UserInfo accept a SID as input as well, fix wb_cmd_getpwuid
...
(This used to be commit 5f3a70f285ad8a412105c0e498e486f93fc279bc)
2008-04-24 11:17:23 +02:00
Jelmer Vernooij
dd0da89e84
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
...
(This used to be commit ece878c1f9251b83598508e23ce0015b4db72f0a)
2008-04-17 13:05:25 +02:00
Jelmer Vernooij
21fc767378
Specify event_context to ldb_wrap_connect explicitly.
...
(This used to be commit b4e1ae07a284c044704322446c94351c2decff91)
2008-04-17 12:23:44 +02:00
Andrew Bartlett
4d8f3f1902
Fix the expectations on the unixinfo test.
...
Andrew Bartlett
(This used to be commit 0df2b3e0b56007850cf83cfdcdb45ca29e162d34)
2008-04-17 12:03:49 +02:00
Jelmer Vernooij
bbb826bdac
Add convenience function for getting at event context from ejs code.
...
(This used to be commit b659e83cd6b627dd0ae04064bccff7220a5bd1ce)
2008-04-17 01:37:42 +02:00
Jelmer Vernooij
7c4a45de26
make sure header can be included more than once.
...
(This used to be commit 38ed501ac8993e84ea7f02d4633bc83b490dfe61)
2008-04-16 11:43:37 +02:00
Andrew Bartlett
2ddd23a875
Re-add 'db' subdirectory for LDAP backend provision
...
Andrew Bartlett
(This used to be commit 19890c0d15adf4f099365f276a4bfdd3f4de52b6)
2008-04-15 17:10:47 +02:00
Andrew Bartlett
dfedfae1cd
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
...
(This used to be commit 66327b8bd8dbde140b93f000a81ba13e743f27b0)
2008-04-15 16:56:15 +02:00
Andrew Bartlett
f8f4856ab7
Fix provision-backend script
...
Andrew Bartlett
(This used to be commit ee6e4f8da229ddeca856a6db94236367aae06f63)
2008-04-15 15:52:52 +02:00
Jelmer Vernooij
fd52fe8616
Fix pointers when pushing strings to python during pidl generation.
...
(This used to be commit ca72187b3e71a037780d42a57e46b60e75f724f6)
2008-04-15 14:32:13 +02:00
Jelmer Vernooij
983b66b8f1
Saner names for Python objects.
...
(This used to be commit f4de8d2c1c956bc85b91dc7aab20e5e7671f51bc)
2008-04-15 12:51:31 +02:00
Jelmer Vernooij
1a8bfba545
Fix warnings.
...
(This used to be commit 88013ca9775a6ff5e5a393f9d8238dbcd197f26f)
2008-04-15 12:15:43 +02:00
Jelmer Vernooij
d04926914a
Fix the build.
...
(This used to be commit ecaa5bb83b5cf319718d15aff96152d70fa19f7f)
2008-04-15 01:40:32 +02:00
Jelmer Vernooij
91baa45dfd
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake4
...
(This used to be commit 0239011ced6c864f85b47a342438228a8f6940ee)
2008-04-14 23:30:17 +02:00
Jelmer Vernooij
1b5f32128d
Use RpcInterfaceTestCase everywhere.
...
(This used to be commit 799095b4e567f4495adf7d1d7bcb81dda6782959)
2008-04-14 23:28:14 +02:00
Jelmer Vernooij
18f8f5d656
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake4
...
(This used to be commit 1ef3830bb0d6e91e3b00e880784ca0741d9b4d49)
2008-04-14 20:00:32 +02:00
Jelmer Vernooij
a15b6f1606
Fix unresolved symbols.
...
(This used to be commit 8573e828d1b68c47b3c1754e9be230b2e78d9d52)
2008-04-14 20:00:04 +02:00
Jelmer Vernooij
2cdfaedee2
Make sure credentials are specified when running the Python winreg RPC tests.
...
(This used to be commit 280339e3d126f5c72dc271051b72839fde0c5c9f)
2008-04-14 19:20:43 +02:00
Jelmer Vernooij
1bcbc4afcf
Allow command line options in the subunitrun script.
...
(This used to be commit 524ec0796efebd48e7b5b2eb5fcc92ecc13c0071)
2008-04-14 19:13:41 +02:00
Jelmer Vernooij
c1d9167fbc
Also look in the environment for smb.conf path.
...
(This used to be commit 8be7d93735a357a3b73a1c4413d6fd9ec09b7555)
2008-04-14 19:01:32 +02:00
Jelmer Vernooij
02f3695897
Add convenience TestCase class for testing RPC interfaces.
...
(This used to be commit 2f19f981449bf6f4d29f231259817c8b66104a9b)
2008-04-14 18:30:07 +02:00
Jelmer Vernooij
e9017ba418
Use _OBJ_FILES variables in a couple more places.
...
(This used to be commit 92856d5054106894b65cd1a1b5119c0facfc4cff)
2008-04-14 17:22:58 +02:00
Andrew Bartlett
5a73810e12
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
...
(This used to be commit 79854f0aa6a9899bb72d302cbca695b8b3a3b0dc)
2008-04-14 15:26:26 +02:00
Jelmer Vernooij
f800cf250f
Move standard make compilation rules to build/make.
...
(This used to be commit ceda3312a98b069d0711f3cb33de3ae71e91ebaa)
2008-04-14 14:51:57 +02:00
Andrew Bartlett
a96bba21fa
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
...
(This used to be commit 92751a73cd854365d365db854179bfd5aeabe7a2)
2008-04-14 13:49:47 +02:00
Jelmer Vernooij
f78bc8c489
Remove prototypes from build.h in preparation of removing build.h
...
altogether.
(This used to be commit dbeab2a9cdee4e5f69afeb2603ba29cbed56debd)
2008-04-14 11:54:50 +02:00
Andrew Bartlett
ca78fa8cae
Re-run SWIG
...
(This used to be commit 2f8010582607ad7389cac3de4945ea0ee46941b3)
2008-04-14 11:53:28 +02:00
Andrew Bartlett
5a37b3fc5d
Fix newuser and setpassword scripts, and port to idmap.
...
The new idmap world does not use the unixUser any more, so we need to
set up the entry (if wanted) in the idmap database. Users without a
backing unix user will get an allocated uid by idmap later.
Andrew Bartlett
(This used to be commit 8bd8bc1475ddf22d4702dcd17028a9043a5e629f)
2008-04-14 11:51:02 +02:00
Andrew Bartlett
434e625e45
Add in a way to get at the private_path() function from python
...
Andrew Bartlett
(This used to be commit 416d2e3a5233f0c243e45857cfda5126c34ac265)
2008-04-14 11:48:43 +02:00
Andrew Bartlett
e44f0e7b75
Don't reopen the sam.ldb again
...
Andrew Bartlett
(This used to be commit b51b8a2d846284de4dff736fc18cf747c188de96)
2008-04-11 19:33:52 +10:00
Andrew Bartlett
393007315d
Far less cryptic traceback when you have an existing smb.conf
...
When the user has an existing smb.conf, but no [netlogon] or [sysvol]
share, the provision script would trigger a traceback. While we still
need to abort in this situation, we do so now with a useful error.
Andrew Bartlett
(This used to be commit 10a8b7ea487f9725f69b02c4dd9cf5e1f67a23ab)
2008-04-11 19:04:43 +10:00
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
Jelmer Vernooij
ad8e3e4192
Add infrastructure for returning ProvisionResult in C provision code.
...
(This used to be commit 98c3d34eb233be284e8c8994cca337be25c72968)
2008-04-10 05:23:17 +02:00
Jelmer Vernooij
12840597c8
No longer install unused smbscript binary.
...
(This used to be commit ca0e373e57eb225a1f5d96813e9ea9ccee971b96)
2008-04-09 17:43:37 +02:00
Andrew Bartlett
b202b6e7d4
Fix up provision to specify SERVERDN in more places.
...
Andrew Bartlett
(This used to be commit d01d542502f25d6c731204ecb3d33720a1706581)
2008-04-09 15:32:49 +10:00
Andrew Bartlett
9d2948f4bd
Don't fill in the secrets DB unless we make the entries.
...
Leave filling in (we still initialise it) the secrets DB for the join
or vampire code.
Andrew Bartlett
(This used to be commit c93208c13ce91b334eadf0ea02fa41354e761e97)
2008-04-09 14:57:57 +10:00
Jelmer Vernooij
ac10ac62c1
Add docstring, PEP8.
...
(This used to be commit f8cac3735c9a19baa313c4b61abee144da303ce1)
2008-04-09 03:51:41 +02:00
Jelmer Vernooij
ad823b04da
Remove length arguments, add tests for unixinfo.GidToSid and unixinfo.UidToSid.
...
(This used to be commit cae61e32e5b61a02c2986b74bd1d7e58460b1e80)
2008-04-08 14:58:38 +02:00
Jelmer Vernooij
dcc44f1757
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into pidldocs
...
(This used to be commit c8dbf00b4490d804e1aac96a3fb66ff726bf9ef6)
2008-04-08 13:32:38 +02:00
Andrew Bartlett
0e59c73fe3
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
...
(This used to be commit c0416a0b73f06ef57db1b83a75433e36b93a9981)
2008-04-08 17:31:36 +10:00
Andrew Bartlett
b2805c50ee
Re-add support for the --ldap-backend-port option to provision-backend
...
This option allows Fedora DS multi-master replication to work. I've
tried to update the wiki and scripts to the largely consistant with
each other.
Andrew Bartlett
(This used to be commit 42393c830733b2cc99ebccdafe944fcf3d82734f)
2008-04-08 17:28:25 +10:00
Jelmer Vernooij
8db14bf26b
Add manually written Python binding for libnet_Join.
...
(This used to be commit 374654b43d9f9e8381991cedc433ce410a914f7a)
2008-04-08 05:16:07 +02:00
Jelmer Vernooij
b5d84a74d1
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
...
Conflicts:
source/auth/credentials/config.mk
source/auth/gensec/config.mk
source/build/smb_build/makefile.pm
source/heimdal_build/config.mk
source/lib/events/config.mk
source/lib/nss_wrapper/config.mk
source/lib/policy/config.mk
source/lib/registry/config.mk
source/lib/socket_wrapper/config.mk
source/lib/tdb/config.mk
source/lib/tls/config.mk
source/lib/util/config.mk
source/libcli/config.mk
source/libcli/ldap/config.mk
source/libnet/config.mk
source/librpc/config.mk
source/param/config.mk
source/rpc_server/config.mk
source/scripting/ejs/config.mk
source/smbd/process_model.mk
(This used to be commit 760378e0294dd0cd4523a83448328478632d7e3d)
2008-04-08 03:45:06 +02:00
Jelmer Vernooij
1f474f4a54
Add trivial test for unixinfo interface.
...
(This used to be commit b6b7171f70114bd27ca8db09964c65cacb9cea92)
2008-04-08 03:29:12 +02:00
Jelmer Vernooij
5cf6c42658
Add python bindings for drsuapi.
...
(This used to be commit ba3f0312f0dda47fb16ed9b8eee3750b209e0dad)
2008-04-08 03:23:53 +02:00
Jelmer Vernooij
f253c3ad91
Add python bindings for unixinfo.
...
(This used to be commit 068c2f858a0c7e325cb8a1f2ca36e32b31fe1f77)
2008-04-08 03:18:43 +02:00
Jelmer Vernooij
57bf8d2e33
Add Python bindings for DFS.
...
(This used to be commit 4319971ccb42618a3298a5f26f63fa4c9b255849)
2008-04-08 02:48:54 +02:00
Andrew Bartlett
c764791100
Clean up provision and rootdse module to hard-code less stuff.
...
In particular, allow for the server DN to be in a different site
(possible outcome of a DRS replication).
Andrew Bartlett
(This used to be commit 9ee4e39fe178317f42fd9a0adceea24b55dfe0f1)
2008-04-04 12:25:19 +11:00