1
0
mirror of https://github.com/samba-team/samba.git synced 2025-02-05 21:57:51 +03:00

17138 Commits

Author SHA1 Message Date
Andrew Bartlett
41493cbe68 Update OpenLDAP MMR configuration per comments by Oliver Liebel
<oliver@itc.li>

This changes the RIDs to be <serverID><DBID>, to ease later debugging.

The need to specify the port on the MMR URLs is now included in the
help.

Andrew Bartlett
(This used to be commit a5cbe8c09c6f14f95ff9ba9b8782e2100fc55695)
2008-08-20 12:21:36 +10:00
Andrew Bartlett
b33f4541f6 Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit fc6b4f03ebba015a13a6ab93221b0bc3ef8ef2ed)
2008-08-19 14:11:51 +10:00
Andrew Bartlett
aef684da31 Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit 27d07df301d60e49d36efd003f2fd2305c83c3fe)
2008-08-19 14:10:53 +10:00
Andrew Bartlett
7ef21658fb Fix up new OpenLDAP MMR code.
This changes the MMR password from hard-coded value of 'linux',
adds tests and fixes the Fedora DS backend.

Currently the MMR password matches the admin password, but we can
change this to be another random value if required.

Also require the port to be specified on the command line, so we don't
hard-code a port of 9000.

Andrew Bartlett
(This used to be commit 08257c6d6ce809fcd53f9b2b4d558fef616b74ce)
2008-08-19 14:10:14 +10:00
Oliver Liebel
805dd85291 Generate Multi-Master Replication configuration for OpenLDAP
This patches provision-backend and the related scripts to generate the
correct configuration blobs for N-way multi-master replication using
OpenLDAP.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
(This used to be commit 6ed0b3f2475022288f636605492ca27fde97cd52)
2008-08-19 12:03:04 +10:00
Andrew Bartlett
47d80366be Fix templates.ldb reprovision handling.
This sets the attributes in a seperate transaction, and allows a
forced delete of the whole file.

Andrew Bartlett
(This used to be commit 423db2468ba3dac89cebc59c8498c0b08c5f3d7b)
2008-08-19 11:43:41 +10:00
Stefan Metzmacher
4422617f7a librpc: don't build the old mszip decompression code
metze
(This used to be commit f48dfd87badcddc64a1c0bf52939188a4a8f4add)
2008-08-18 15:34:54 +02:00
Stefan Metzmacher
6cd8e2bccf ndr_compression: use zlib's inflate() for decompression
metze
(This used to be commit 25876fc4ab8ba11f00d24bb8ceb517c0e4a4d72d)
2008-08-18 15:29:02 +02:00
Stefan Metzmacher
7474196d83 zlib: mark as modified for samba
metze
(This used to be commit 0fb265e567d700b3c16eb8f28bc5f26653a819fa)
2008-08-18 15:25:41 +02:00
Stefan Metzmacher
5e4f668468 zlib: fix compiler warnings
metze
(This used to be commit ce44a608f66bf27070fd43d576551fde6f545d7c)
2008-08-18 15:25:40 +02:00
Stefan Metzmacher
41fdbffa72 zlib: we don't need the inflateReset2 prototype twice
metze
(This used to be commit 0dbbc287f65a51330c5309df5a96b3acd4d044d5)
2008-08-18 15:25:40 +02:00
Matthieu Suiche
ffa18ca49a librpc/ndr: add support for XPRESS decompression
Signed-off-by: Stefan Metzmacher <metze@samba.org>
(This used to be commit 6a9720c99d36a575ea8ed92e94ff6d2fe6f3e27d)
2008-08-18 14:52:36 +02:00
Matthieu Suiche
c222124010 lib/compression: Import of lzxpress decompression algorithm
Signed-off-by: Stefan Metzmacher <metze@samba.org>
(This used to be commit 531882dadd57eb6fa048c5d6e5fe3accc20df751)
2008-08-18 14:52:35 +02:00
Andrew Bartlett
bb80a19714 Note the ldb syntax for attribute syntaxes in the table.
This includes additional Samba-specific syntaxes made available from
the ldif_handlers code.

This commit also changes some table to use #defines, to ensure
consistancy in other parts of the code.

Andrew Bartlett
(This used to be commit e26a5efd9a580ed3728e1f449e367b1cd4a73b5f)
2008-08-18 20:30:27 +10:00
Andrew Bartlett
1dc5e75218 Allow attributes to be overwritten, not just added to
(This used to be commit 0aebae91be0fba7ffa94d73946a94aea930a252a)
2008-08-18 20:21:31 +10:00
Andrew Bartlett
dbde9cbea0 Fix segfaults when loading the schema fails.
(This used to be commit 9643db1a011edc95aa903908cec708b3a3566e71)
2008-08-18 20:20:24 +10:00
Andrew Bartlett
4c18073b13 Ensure we fail to proceed if the schema won't load.
(This used to be commit 07107c45c35a11979bf68a14b2c4df9415880fcb)
2008-08-18 15:12:08 +10:00
Andrew Bartlett
5c6364ba06 Remove references to the unused @SUBCLASS feature.
This was removed from ldb_tdb a while ago

Andrew Bartlett
(This used to be commit fcb87e77860b449ac3483ccec5e6b5ed087540f2)
2008-08-18 12:01:27 +10:00
Andrew Bartlett
46c94dd8b2 Merge the two attribute syntax tables.
This merges the table once found in the oLschema2ldif tool (and moved
many times) with the table used for DRSUAPI.

The OpenLDAP schema map has been updated, to ensure that despite a
number of attributes being declared as OIDs, they are actually used as
strings (as they are actually LDAP class/attribute names).

Andrew Bartlett
(This used to be commit 61f2958c84beeedcf369ccdc02afed0c8055b108)
2008-08-18 10:16:45 +10:00
Michael Adam
613b8d398e configure: use AS_HELP_STRING for --with-disable-ext-lib
Michael
(This used to be commit 88cf5d8b708d6247772b33128f0e212a4c2e9ba8)
2008-08-16 00:49:20 +02:00
Michael Adam
a903c39d2b configure: use AS_HELP_STRING for --enable-developer
Michael
(This used to be commit b10d4723891c39693100bfaaf1ac29adce9f7a86)
2008-08-16 00:49:20 +02:00
Michael Adam
982aa673e2 configure: use AS_HELP_STRING for --enable-debug.
Michael
(This used to be commit 1f4bf8fbd5bfc9c58bb5668fe25586766605b268)
2008-08-16 00:49:20 +02:00
Michael Adam
37b6e7886b configure: use AS_HELP_STRING for --with-selftest-prefix.
Michael
(This used to be commit eea4f597acf743fa783be3e5809e24aebc79f238)
2008-08-16 00:49:20 +02:00
Michael Adam
56bf6489a6 configure: use AS_HELP_STRING for --with-logfilebase.
Michael
(This used to be commit f9c15b817a24bed26a339479c53fc2f5cc5b36df)
2008-08-16 00:49:19 +02:00
Michael Adam
42104c3d11 configure: use AS_HELP_STRING for --with-piddir
Michael
(This used to be commit f05a9fe46ff428e48be9a5af4a6769cd78712c11)
2008-08-16 00:49:19 +02:00
Michael Adam
3ebf7f0427 configure: use AS_HELP_STRING for --with-lockdir.
Michael
(This used to be commit ed4a6e780a3f57854338520e4608cfc8dce4ef3e)
2008-08-16 00:49:19 +02:00
Michael Adam
76c96ad6d7 configure: use AS_HELP_STRING for --ntp-signd-socket-dir.
Michael
(This used to be commit dd07dcbc916236d80d9a7087860a6f504bbb09e8)
2008-08-16 00:49:19 +02:00
Michael Adam
d143e5fcab configure: use AS_HELP_STRING for --with-winbindd-privileged-socket-dir.
Michael
(This used to be commit 3bf8116531d4eb0cc25bc7bac70ae3c77642a5a3)
2008-08-16 00:49:18 +02:00
Michael Adam
cc7d7ba95b configure: use AS_HELP_STRING for --with-winbindd-socket-dir .
Michael
(This used to be commit 1304eda283b29fff8960633b1329c0a1611e1ca3)
2008-08-16 00:49:18 +02:00
Michael Adam
7b3bb57051 configure: use AS_HELP_STRING for --with-privatedir
Michael
(This used to be commit eafde5bee0a68fd4cf61ae64dfb24e4deb16b95a)
2008-08-16 00:49:18 +02:00
Michael Adam
df4e1ad130 configure: format help string for --with-fhs with AS_HELP_STRING().
Michael
(This used to be commit 837d0b3eb213ce6d0ce5345308d1b42ae2b08d67)
2008-08-16 00:49:18 +02:00
Michael Adam
44b6ffae0b configure: remove duplicate definition of --with-winbindd-socket-dir.
I think this should have gone with fa361354433fb9a5c09c84997a7c51f3052c294e.

Michael
(This used to be commit 91fcaac68b215461a13c1b517f6cede29af5e55c)
2008-08-16 00:49:18 +02:00
Andrew Bartlett
76bcaa10ac Fix the build, after the ad2oLschema changes.
(This used to be commit 7361821b21ef78c564c41466783048606a0b6e98)
2008-08-15 21:20:05 +10:00
Andrew Bartlett
489525a639 Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit fa03d750e4577a610dc410d45d49789110b1b4f1)
2008-08-15 21:16:40 +10:00
Andrew Bartlett
4bdb752cc5 Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit b4b14b748e6babc93faee23fe8f5c03ec2d25cbb)
2008-08-15 20:41:50 +10:00
Andrew Bartlett
16112762e7 Generate the subSchema in cn=Aggregate
This reads the schema from the in-memory structure, when the magic
attributes are requested.  The code is a modified version of that used
in the ad2oLschema tool (now shared).

The schema_fsmo module handles the insertion of the generated result.

As such, this commit also removes these entries from the setup/schema.ldif

Metze's previous stub of this functionality is also removed.

Andrew Bartlett
(This used to be commit c7c32ec7b42bdf0f7b669644516438c71b364e60)
2008-08-15 20:40:57 +10:00
Andrew Bartlett
e387677f51 Rework generation of the objectClass and attributeType lines.
Now that these are subroutines, we can factor them out into a file the
CN=Aggregate schema code can also use.

Andrew Bartlett
(This used to be commit e3591a6a35ddb60398a03a4fa0545cc6158946ef)
2008-08-15 13:18:48 +10:00
Andrew Bartlett
a3faed4bfe Paramaterise the seperator in ad2OLschema
This will allow me to add a new mode, with the CN=Aggregate schema
format automatically generated.

Andrew Bartlett
(This used to be commit 7d2a890a7077e446e45527847f78bba84d22bc4c)
2008-08-15 12:08:10 +10:00
Andrew Bartlett
427b3baba3 Don't segfault in RPC-ATSVC.
(This used to be commit e711f7d26a632ec93c1e2a3db52c37e1c0de4214)
2008-08-15 09:46:51 +10:00
Stefan Metzmacher
c1c6c1b609 RAW-OPEN: be more strict in create_option checking
metze
(This used to be commit d548f5dee5980eae0aea25f1314238eb4f963568)
2008-08-14 15:14:53 +02:00
Stefan Metzmacher
e75f1072b6 Revert "krb5: always generate the acceptor subkey as the same enctype as the used service key"
This reverts commit dbb94133e0313cae933d261af0bf1210807a6d11.

As we fixed gensec_gssapi to only return a session key when it's
have the correct session key, this hack isn't needed anymore.

metze
(This used to be commit 697cd1896bccaa55ee422f17d9312d787ca699ed)
2008-08-14 13:13:52 +02:00
Stefan Metzmacher
69d074af81 gsskrb5: always return an acceptor subkey
For non cfx keys it's the same as the intiator subkey.
This matches windows behavior.

metze
(This used to be commit 6a8b07c39558f240b89e833ecba15d8b9fc020e8)
2008-08-14 13:13:52 +02:00
Stefan Metzmacher
26853e4607 gensec_gssapi: only cache the session key in STAGE_DONE
The key may change because we switch from initiator to acceptor
subkey.

metze
(This used to be commit 66244092a457b2cde6339cb31dcfa73b122ba9b5)
2008-08-14 13:13:52 +02:00
Stefan Metzmacher
affba1f75c SMB2-CREATE: add a special test for FILE_ATTRIBUTE_ENCRYPTED
Some standalone server (and samba4) doesn't support this.

metze
(This used to be commit 6d8fd4c0089d7e632ec91027a77321aca8c6acc7)
2008-08-14 13:13:52 +02:00
Stefan Metzmacher
d6abf13510 SMB2-CREATE: be more strict in checking file attributes
metze
(This used to be commit ba9d0f6b3c60346df757e7c4c3f5704c0bf26d11)
2008-08-14 13:13:51 +02:00
Stefan Metzmacher
80f2f10839 SMB2-CREATE: be more strict in error checking
metze
(This used to be commit d7d4df78c1de19d0cd7a63daaa2fa0863a243a12)
2008-08-14 13:13:51 +02:00
Stefan Metzmacher
548ed8d958 ntvfs_generic: fix handling of create_options for SMB2
metze
(This used to be commit cbd585d2a1e179615eba773cb07385524369c686)
2008-08-14 13:13:51 +02:00
Stefan Metzmacher
2a336a63d7 libcli/smb2: add SMB2_CREATE_OPTIONS_NOT_SUPPORTED_MASK
SMB2 returns NOT_SUPPORTED to some more NTCREATE_OPTIONS.

metze
(This used to be commit 3ea08d430370717463ffab44fed9c42db1002d97)
2008-08-14 13:13:51 +02:00
Stefan Metzmacher
cc60d5a032 pvfs: fix handling of create_option flags
metze
(This used to be commit 3c6cadf76861d6522c5ec41953df1ba2fac4910d)
2008-08-14 13:13:51 +02:00
Stefan Metzmacher
dbcdbb3348 libcli/raw: fix the special NTCREATE_OPTIONS_*_MASK values
We now reuse ignored values for the ntvfs backend private flags.

metze
(This used to be commit 14eda93aeface307e1ffd1ea012d8f236fa78290)
2008-08-14 13:13:50 +02:00