samba.git
15 years agoidmap_adex: Add new idmap plugin for support RFC2307 enabled AD forests.
Gerald (Jerry) Carter [Fri, 19 Sep 2008 17:27:15 +0000 (12:27 -0500)]
idmap_adex: Add new idmap plugin for support RFC2307 enabled AD forests.

The adex idmap/nss_info plugin is an adapation of the Likewise
Enterprise plugin with support for OU based cells removed
(since the Windows pieces to manage the cells are not available).

This plugin supports

  * The RFC2307 schema for users and groups.
  * Connections to trusted domains
  * Global catalog searches
  * Cross forest trusts
  * User and group aliases

Prerequiste: Add the following attributes to the Partial Attribute
Set in global catalog:

  * uidNumber
  * uid
  * gidNumber

A basic config using the current trunk code would look like

 [global]
      idmap backend = adex
      idmap uid = 10000 - 19999
      idmap gid = 20000 - 29999
      idmap config US:backend = adex
      idmap config US:range = 20000 - 29999
      winbind nss info = adex

       winbind normalize names = yes
       winbind refresh tickets = yes
       template homedir = /home/%D/%U
       template shell = /bin/bash

15 years agoMerge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel
Andrew Bartlett [Mon, 22 Sep 2008 21:23:40 +0000 (14:23 -0700)]
Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel

15 years agoThis torture test and skipping of the server-side check was bogus.
Andrew Bartlett [Mon, 22 Sep 2008 21:23:22 +0000 (14:23 -0700)]
This torture test and skipping of the server-side check was bogus.

The IDL is declared to force the MessageType to 3 on output, so we
instead checked the same thing 255 times...

Andrew Bartlett

15 years agore-run make idl.
Günther Deschner [Tue, 16 Sep 2008 14:04:43 +0000 (16:04 +0200)]
re-run make idl.

Guenther

15 years agonetapi: add more fields to USER_INFO_X.
Günther Deschner [Tue, 16 Sep 2008 14:04:31 +0000 (16:04 +0200)]
netapi: add more fields to USER_INFO_X.

Guenther

15 years agonetapi: add NetFile testsuite.
Günther Deschner [Fri, 12 Sep 2008 15:24:37 +0000 (17:24 +0200)]
netapi: add NetFile testsuite.

Guenther

15 years agonetapi: fix case statement in example NetUserSetModals code.
Günther Deschner [Mon, 22 Sep 2008 17:31:44 +0000 (19:31 +0200)]
netapi: fix case statement in example NetUserSetModals code.

Guenther

15 years agos4: allways initialize the process model before it's used
Stefan Metzmacher [Mon, 22 Sep 2008 16:15:24 +0000 (18:15 +0200)]
s4: allways initialize the process model before it's used

metze

15 years agocreate-tarball: Adapt script to changed directory structure.
Karolin Seeger [Mon, 22 Sep 2008 15:57:59 +0000 (08:57 -0700)]
create-tarball: Adapt script to changed directory structure.

Karolin

15 years agocreate-tarball: Don't remove /*.
Karolin Seeger [Mon, 22 Sep 2008 15:55:01 +0000 (08:55 -0700)]
create-tarball: Don't remove /*.

These strings do appear several times. Extend the grep pattern to
get the right string only. This avoids the removal of /*!

Karolin

15 years agocreate-tarball: Remove trailing/leading whitespaces.
Karolin Seeger [Mon, 22 Sep 2008 15:53:40 +0000 (08:53 -0700)]
create-tarball: Remove trailing/leading whitespaces.

Karolin

15 years agoprocess incoming connections and fork a samba3 in inetd mode
Stefan Metzmacher [Mon, 22 Sep 2008 01:57:31 +0000 (03:57 +0200)]
process incoming connections and fork a samba3 in inetd mode

15 years agos3: link @tallocdir@/testsuite_main.o into talloctort
Stefan Metzmacher [Sun, 21 Sep 2008 22:21:26 +0000 (00:21 +0200)]
s3: link @tallocdir@/testsuite_main.o into talloctort

metze

15 years agolib/talloc: move main() out of testsuite.c
Stefan Metzmacher [Sun, 21 Sep 2008 22:20:39 +0000 (00:20 +0200)]
lib/talloc: move main() out of testsuite.c

metze

15 years agos3: link libreplace/test/main.c into replacetort
Stefan Metzmacher [Sun, 21 Sep 2008 21:46:10 +0000 (23:46 +0200)]
s3: link libreplace/test/main.c into replacetort

metze

15 years agolibreplace: move main() out of testsuite.c
Stefan Metzmacher [Sun, 21 Sep 2008 21:59:58 +0000 (23:59 +0200)]
libreplace: move main() out of testsuite.c

metze

15 years agoFix merged build.
Jelmer Vernooij [Sun, 21 Sep 2008 21:57:59 +0000 (23:57 +0200)]
Fix merged build.

15 years agoTorture suite: Revert some changes because they aren't necessary
Matthias Dieter Wallnöfer [Fri, 19 Sep 2008 14:03:20 +0000 (16:03 +0200)]
Torture suite: Revert some changes because they aren't necessary

This reverts some changes made by me because they aren't necessary. The "ZERO_STRUCT"'s remain in.

15 years agoRegistry client: Remove all conversion helper functions
Matthias Dieter Wallnöfer [Fri, 19 Sep 2008 13:53:02 +0000 (15:53 +0200)]
Registry client: Remove all conversion helper functions

15 years agoRegistry client library: Remove two elementar conversion functions
Matthias Dieter Wallnöfer [Fri, 19 Sep 2008 12:35:35 +0000 (14:35 +0200)]
Registry client library: Remove two elementar conversion functions

15 years agoRevert "Registry tool "regtree": Removing an error message"
Matthias Dieter Wallnöfer [Fri, 19 Sep 2008 10:57:26 +0000 (12:57 +0200)]
Revert "Registry tool "regtree": Removing an error message"

This reverts commit f37a57fa366e2b0d77f9c1bd232d42a0f2cceb52.

15 years agoTorture suite: Fixes the tests to not segfault again SAMBA 4 registry server
Matthias Dieter Wallnöfer [Mon, 15 Sep 2008 19:09:32 +0000 (21:09 +0200)]
Torture suite: Fixes the tests to not segfault again SAMBA 4 registry server

15 years agoRegistry client: Fixup the "patchfile" library
Matthias Dieter Wallnöfer [Mon, 15 Sep 2008 17:00:07 +0000 (19:00 +0200)]
Registry client: Fixup the "patchfile" library

Rework and enhance the "patchfile" library (used in "regdiff")

15 years agoRegistry client: Implement the "winreg_QueryValue" call
Matthias Dieter Wallnöfer [Mon, 15 Sep 2008 16:59:17 +0000 (18:59 +0200)]
Registry client: Implement the "winreg_QueryValue" call

This is needed for the registry patchfile library

15 years agoRegistry client library: Use "talloc_zero" to avoid uninitialized values
Matthias Dieter Wallnöfer [Mon, 15 Sep 2008 11:04:40 +0000 (13:04 +0200)]
Registry client library: Use "talloc_zero" to avoid uninitialized values

15 years agoRegistry tool "regdiff": Add the event context for remote connections
Matthias Dieter Wallnöfer [Sun, 14 Sep 2008 01:29:07 +0000 (03:29 +0200)]
Registry tool "regdiff": Add the event context for remote connections

Adds the event context for remote connections to make the tool working again.

15 years agoRegistry client library: Fixes the creation of new keys
Matthias Dieter Wallnöfer [Sat, 13 Sep 2008 13:02:56 +0000 (15:02 +0200)]
Registry client library: Fixes the creation of new keys

Giving the right permissions

15 years agoRegistry client library: Fix some buffer problems
Matthias Dieter Wallnöfer [Sat, 13 Sep 2008 12:26:08 +0000 (14:26 +0200)]
Registry client library: Fix some buffer problems

This buffer maximum values are used in Windows (2000), so I take them also for SAMBA 4.

15 years agoRegistry client library: Various fixup's and corrections
Matthias Dieter Wallnöfer [Sat, 13 Sep 2008 10:30:47 +0000 (12:30 +0200)]
Registry client library: Various fixup's and corrections

I reverted the change with the string conversions because they aren't needed and included
many fixup's and improvements in the code. We should be able now to connect to a Windows WINREG server
 without a problem.

15 years agoRegistry tools "regshell" and "regtree": Small fixup's
Matthias Dieter Wallnöfer [Sat, 13 Sep 2008 10:26:03 +0000 (12:26 +0200)]
Registry tools "regshell" and "regtree": Small fixup's

I fixed up my fault regarding the handling of the default value (if it doesn't exist
it hasn't the index number zero and you get immediately the subvalues). Then I corrected an error in regshell to find the right registry context.

15 years agoRegistry client: Various cleanups and charset conversions
Matthias Dieter Wallnöfer [Fri, 12 Sep 2008 18:26:13 +0000 (20:26 +0200)]
Registry client: Various cleanups and charset conversions

This patch contains various changes to the "rpc.c" file to clean it up and introduces the right string charset conversions (UNIX <-> UTF16).

15 years agoRegistry tool "regshell": Handle the default attribute in the right way
Matthias Dieter Wallnöfer [Fri, 12 Sep 2008 15:02:30 +0000 (17:02 +0200)]
Registry tool "regshell": Handle the default attribute in the right way

This commit introduces the default attribute in "regshell"

15 years agoRegistry tool "regtree": Removing an error message
Matthias Dieter Wallnöfer [Fri, 12 Sep 2008 14:57:22 +0000 (16:57 +0200)]
Registry tool "regtree": Removing an error message

The error message "Error occurred while fetching values" doesn't seem very useful, so remove it.

15 years agoRegistry tool "regtree": Handle the default attribute in the right way
Matthias Dieter Wallnöfer [Fri, 12 Sep 2008 14:41:49 +0000 (16:41 +0200)]
Registry tool "regtree": Handle the default attribute in the right way

This commit introduces the default attribute in "regtree"

15 years agoMerge branch 'master' of ssh://git.samba.org/data/git/samba
Jelmer Vernooij [Sun, 21 Sep 2008 21:11:30 +0000 (23:11 +0200)]
Merge branch 'master' of ssh://git.samba.org/data/git/samba

15 years agoAvoid printing characters when in immediate mode.
Jelmer Vernooij [Sun, 21 Sep 2008 21:09:56 +0000 (23:09 +0200)]
Avoid printing characters when in immediate mode.

15 years agoAttempt to fix bug 5778
Volker Lendecke [Sun, 21 Sep 2008 18:39:17 +0000 (20:39 +0200)]
Attempt to fix bug 5778

Jeff, Steve, please check!

15 years agonetlogon: move password change code out to rpccli_netlogon_set_trust_password.
Günther Deschner [Sun, 21 Sep 2008 16:57:26 +0000 (18:57 +0200)]
netlogon: move password change code out to rpccli_netlogon_set_trust_password.

Guenther

15 years agonetlogon: refactor just_change_the_password a bit.
Günther Deschner [Sat, 20 Sep 2008 16:20:29 +0000 (18:20 +0200)]
netlogon: refactor just_change_the_password a bit.

Guenther

15 years agonetlogon: use init_netr_CryptPassword in "just_change_the_password"
Günther Deschner [Sat, 20 Sep 2008 15:01:20 +0000 (17:01 +0200)]
netlogon: use init_netr_CryptPassword in "just_change_the_password"

Guenther

15 years agonetlogon: add init_netr_CryptPassword.
Günther Deschner [Sat, 20 Sep 2008 15:00:30 +0000 (17:00 +0200)]
netlogon: add init_netr_CryptPassword.

Guenther

15 years agobuild: rebuild only changed IDL files.
Günther Deschner [Sat, 20 Sep 2008 15:02:00 +0000 (17:02 +0200)]
build: rebuild only changed IDL files.

Let"s see how this works now.

Guenther

15 years agoPrint status (one character per test) when not running selftest with --immediate.
Jelmer Vernooij [Sun, 21 Sep 2008 20:26:44 +0000 (22:26 +0200)]
Print status (one character per test) when not running selftest with --immediate.

15 years agoRevert "Rename smbd -> samba."
Jelmer Vernooij [Sun, 21 Sep 2008 19:32:40 +0000 (21:32 +0200)]
Revert "Rename smbd -> samba."

This reverts commit 0e9008be35a5b334bd65e6417193d4b8f27bdc36.

15 years agoUse absolute paths for wbinfo rather than relying on it being in PATH.
Jelmer Vernooij [Sun, 21 Sep 2008 19:29:13 +0000 (21:29 +0200)]
Use absolute paths for wbinfo rather than relying on it being in PATH.

15 years agoRename smbd -> samba.
Jelmer Vernooij [Sun, 21 Sep 2008 19:26:40 +0000 (21:26 +0200)]
Rename smbd -> samba.

15 years agoMerge branch 'master' of ssh://git.samba.org/data/git/samba into wsgi
Jelmer Vernooij [Sun, 21 Sep 2008 18:08:00 +0000 (20:08 +0200)]
Merge branch 'master' of ssh://git.samba.org/data/git/samba into wsgi

15 years agoAllow SWAT to be run outside of smbd.
Jelmer Vernooij [Sun, 21 Sep 2008 18:06:18 +0000 (20:06 +0200)]
Allow SWAT to be run outside of smbd.

15 years agoSupport POST requests again, provide more variables in environment.
Jelmer Vernooij [Sun, 21 Sep 2008 18:01:00 +0000 (20:01 +0200)]
Support POST requests again, provide more variables in environment.

15 years agoMake standard SWAT script print received headers.
Jelmer Vernooij [Sun, 21 Sep 2008 18:00:44 +0000 (20:00 +0200)]
Make standard SWAT script print received headers.

15 years agoFirst GET request works. SWAT now displays a Hello world message.
Jelmer Vernooij [Sun, 21 Sep 2008 17:03:12 +0000 (19:03 +0200)]
First GET request works. SWAT now displays a Hello world message.

15 years agoProperly call WSGI request handler when requests come in.
Jelmer Vernooij [Sun, 21 Sep 2008 16:45:09 +0000 (18:45 +0200)]
Properly call WSGI request handler when requests come in.

15 years agoFix the build -- appweb is no more
Volker Lendecke [Sun, 21 Sep 2008 16:09:55 +0000 (18:09 +0200)]
Fix the build -- appweb is no more

15 years agoRemove support for ESP in the web server.
Jelmer Vernooij [Sun, 21 Sep 2008 14:53:29 +0000 (16:53 +0200)]
Remove support for ESP in the web server.

15 years agoMake use of TALLOC_ZERO_P
Volker Lendecke [Sat, 13 Sep 2008 17:41:42 +0000 (19:41 +0200)]
Make use of TALLOC_ZERO_P

15 years agoRemove some dependencies of the web server on esp.
Jelmer Vernooij [Sat, 24 May 2008 16:13:30 +0000 (18:13 +0200)]
Remove some dependencies of the web server on esp.

15 years agoAdd input / error stream objects in WSGI implementation.
Jelmer Vernooij [Sat, 24 May 2008 13:43:37 +0000 (15:43 +0200)]
Add input / error stream objects in WSGI implementation.

15 years agoAdd more parts of the WSGI implementation.
Jelmer Vernooij [Sat, 24 May 2008 01:54:47 +0000 (03:54 +0200)]
Add more parts of the WSGI implementation.

15 years agoAdd initial work on WSGI support in the web server.
Jelmer Vernooij [Fri, 23 May 2008 19:21:07 +0000 (21:21 +0200)]
Add initial work on WSGI support in the web server.

15 years agoRename http to esp, in preparation of adding a python backend.
Jelmer Vernooij [Fri, 23 May 2008 18:40:05 +0000 (20:40 +0200)]
Rename http to esp, in preparation of adding a python backend.

15 years agoNo longer set PATH during selftest, was only required for smbscript.
Jelmer Vernooij [Sun, 21 Sep 2008 13:55:08 +0000 (15:55 +0200)]
No longer set PATH during selftest, was only required for smbscript.

15 years agoStop installing JS libraries.
Jelmer Vernooij [Sun, 21 Sep 2008 13:08:16 +0000 (15:08 +0200)]
Stop installing JS libraries.

15 years agoRemove remaining obsolete EJS tests.
Jelmer Vernooij [Sun, 21 Sep 2008 03:43:39 +0000 (05:43 +0200)]
Remove remaining obsolete EJS tests.

15 years agoFix last samba3sam.py test.
Jelmer Vernooij [Sun, 21 Sep 2008 03:21:56 +0000 (05:21 +0200)]
Fix last samba3sam.py test.

15 years agoFix DNs - only one more samba3sam test failing now.
Jelmer Vernooij [Sun, 21 Sep 2008 01:42:27 +0000 (03:42 +0200)]
Fix DNs - only one more samba3sam test failing now.

15 years agoMerge branch 'master' of ssh://git.samba.org/data/git/samba into noejs
Jelmer Vernooij [Sun, 21 Sep 2008 00:32:19 +0000 (02:32 +0200)]
Merge branch 'master' of ssh://git.samba.org/data/git/samba into noejs

15 years agoDon't expose ldb_request in the Python API but rather use regular
Jelmer Vernooij [Sat, 20 Sep 2008 13:06:26 +0000 (15:06 +0200)]
Don't expose ldb_request in the Python API but rather use regular
parameters.

15 years agoMore code simplifications.
Jelmer Vernooij [Sat, 20 Sep 2008 12:35:21 +0000 (14:35 +0200)]
More code simplifications.

15 years agoFix ldb standalone build.
Simo Sorce [Fri, 19 Sep 2008 19:49:39 +0000 (15:49 -0400)]
Fix ldb standalone build.
Add shared-build target to the ldb library, and make it possible to build
it against libtalloc, libevents, libtdb as shared libraries.

15 years agoFix libevents standalone build
Simo Sorce [Fri, 19 Sep 2008 19:20:47 +0000 (15:20 -0400)]
Fix libevents standalone build
Make sure to build against libtalloc.a and not individual talloc objects,
so that the library can be also built against libtalloc.so and use it as
a shared library instead of statically compiling talloc.
Also add shared-build target to the events library.
Useful to build multiple standalone libraries that depend on each other
without having to install them to the final install dir during the build.

15 years agoAdd shared-build target to tdb.
Simo Sorce [Fri, 19 Sep 2008 19:15:46 +0000 (15:15 -0400)]
Add shared-build target to tdb.
Useful to build multiple standalone libraries that depend on each other
without having to install them to the final install dir during the build.

15 years agoAdd shared-build target to talloc.
Simo Sorce [Fri, 19 Sep 2008 19:15:21 +0000 (15:15 -0400)]
Add shared-build target to talloc.
Useful to build multiple standalone libraries that depend on each other
without having to install them to the final install dir during the build.

15 years agoFix standalone builds adjusting to new relative path.
Simo Sorce [Fri, 19 Sep 2008 19:12:28 +0000 (15:12 -0400)]
Fix standalone builds adjusting to new relative path.
Add shared-build target to libreplace.
Useful to build multiple standalone libraries that depend on each other
without having to install them to the final install dir during the build.

15 years agoAdd comment to explain version bump
Simo Sorce [Fri, 19 Sep 2008 17:51:40 +0000 (13:51 -0400)]
Add comment to explain version bump

15 years agoidmap: Increment the interface number after Volker's rewrite.
Gerald (Jerry) Carter [Thu, 18 Sep 2008 19:49:46 +0000 (14:49 -0500)]
idmap: Increment the interface number after Volker's rewrite.

15 years agoLDAP Server: Don't create the SASL SECBLOB output object twice
Matthias Dieter Wallnöfer [Wed, 17 Sep 2008 15:55:02 +0000 (17:55 +0200)]
LDAP Server: Don't create the SASL SECBLOB output object twice

Removes one "talloc" creation of the output object.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
15 years agoNTLMSSP Server: Correctly fills in the DNS server name and server domain
Matthias Dieter Wallnöfer [Wed, 17 Sep 2008 15:55:52 +0000 (17:55 +0200)]
NTLMSSP Server: Correctly fills in the DNS server name and server domain

Don't rely on "get*" system calls but rather on SAMBA "lp_*" calls.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
15 years agoMerge branch 'master' of ssh://git.samba.org/data/git/samba into noejs
Jelmer Vernooij [Fri, 19 Sep 2008 14:26:00 +0000 (16:26 +0200)]
Merge branch 'master' of ssh://git.samba.org/data/git/samba into noejs

15 years agoAdd support for implementing LDB modules in Python.
Jelmer Vernooij [Fri, 19 Sep 2008 14:17:52 +0000 (16:17 +0200)]
Add support for implementing LDB modules in Python.

15 years agoFix dependencies for nbt python module.
Jelmer Vernooij [Fri, 19 Sep 2008 11:00:11 +0000 (13:00 +0200)]
Fix dependencies for nbt python module.

15 years agoProvide tdb.open and ldb.open python functions.
Jelmer Vernooij [Fri, 19 Sep 2008 10:47:52 +0000 (12:47 +0200)]
Provide tdb.open and ldb.open python functions.

15 years agoFix formatting.
Jelmer Vernooij [Fri, 19 Sep 2008 10:44:00 +0000 (12:44 +0200)]
Fix formatting.

15 years agoFix path to ndrdump in blackbox test, don't start smb server for ndrdump
Jelmer Vernooij [Fri, 19 Sep 2008 10:07:03 +0000 (12:07 +0200)]
Fix path to ndrdump in blackbox test, don't start smb server for ndrdump
tests.

15 years agoSimplify code, remove print statements.
Jelmer Vernooij [Fri, 19 Sep 2008 10:04:13 +0000 (12:04 +0200)]
Simplify code, remove print statements.

15 years agoRemove unused scripts.
Jelmer Vernooij [Fri, 19 Sep 2008 09:05:19 +0000 (11:05 +0200)]
Remove unused scripts.

15 years agofind_unused_makefilevars: Support parsing simple includes.
Jelmer Vernooij [Fri, 19 Sep 2008 09:04:18 +0000 (11:04 +0200)]
find_unused_makefilevars: Support parsing simple includes.

15 years agoMake sure modify operations succeed.
Jelmer Vernooij [Fri, 19 Sep 2008 08:56:35 +0000 (10:56 +0200)]
Make sure modify operations succeed.

15 years agoinitialize a COM context.
Jelmer Vernooij [Fri, 19 Sep 2008 00:39:03 +0000 (02:39 +0200)]
initialize a COM context.

15 years agoFix COM compilation, add framework for COM python module.
Jelmer Vernooij [Fri, 19 Sep 2008 00:27:40 +0000 (02:27 +0200)]
Fix COM compilation, add framework for COM python module.

15 years agoFix objectclass tests.
Jelmer Vernooij [Thu, 18 Sep 2008 23:43:04 +0000 (01:43 +0200)]
Fix objectclass tests.

15 years agoMerge branch 'master' of ssh://git.samba.org/data/git/samba into noejs
Jelmer Vernooij [Thu, 18 Sep 2008 22:06:14 +0000 (00:06 +0200)]
Merge branch 'master' of ssh://git.samba.org/data/git/samba into noejs

15 years agoAdd test for Sid.__repr__.
Jelmer Vernooij [Thu, 18 Sep 2008 22:05:34 +0000 (00:05 +0200)]
Add test for Sid.__repr__.

15 years agoGenerate with 1.3.36.
Jelmer Vernooij [Thu, 18 Sep 2008 21:55:50 +0000 (23:55 +0200)]
Generate with 1.3.36.

15 years agoImplement __repr__ for Sid.
Jelmer Vernooij [Thu, 18 Sep 2008 21:54:53 +0000 (23:54 +0200)]
Implement __repr__ for Sid.

15 years agoImprove formatting.
Jelmer Vernooij [Thu, 18 Sep 2008 21:46:58 +0000 (23:46 +0200)]
Improve formatting.

15 years agoFix tests, be less verbose.
Jelmer Vernooij [Thu, 18 Sep 2008 20:56:58 +0000 (22:56 +0200)]
Fix tests, be less verbose.

15 years agoFix some tests.
Jelmer Vernooij [Thu, 18 Sep 2008 19:53:08 +0000 (21:53 +0200)]
Fix some tests.

15 years agoRemove python extension, simplify some code.
Jelmer Vernooij [Thu, 18 Sep 2008 19:32:30 +0000 (21:32 +0200)]
Remove python extension, simplify some code.

15 years agoStop writing js include dir in selftest.
Jelmer Vernooij [Thu, 18 Sep 2008 18:48:09 +0000 (20:48 +0200)]
Stop writing js include dir in selftest.

15 years agoMerge branch 'master' of ssh://git.samba.org/data/git/samba into noejs
Jelmer Vernooij [Thu, 18 Sep 2008 18:29:05 +0000 (20:29 +0200)]
Merge branch 'master' of ssh://git.samba.org/data/git/samba into noejs

Conflicts:
source4/main.mk