[SCM] SAMBA-CTDB repository - branch v3-4-ctdb updated - 3.4.7-ctdb-4-177-g05b3d5b
Michael Adam
obnox at samba.org
Wed Jun 23 09:06:50 MDT 2010
The branch, v3-4-ctdb has been updated
via 05b3d5ba0c22ff94838c3c9304cb8c237e041920 (commit)
via 696da5d673760b122f4495d8a5cf747fb4a5ad62 (commit)
via e875e4762ab1477be513eaa56fda7d260fa6ae7e (commit)
via 876c417e5632c350918aa38d45253e837d402914 (commit)
via b618f7cc589252cba56dffea0c918e688d1203a8 (commit)
via 9b705b738a0295c3d26e78967bf1a49f6661a6ac (commit)
via 2d539ff41cf49754078e36bdf08bda7f00665f8e (commit)
via 3eb9eb8c290070e29d53f1ae731e878398b1885f (commit)
via a3c7d3fb1a28e17183c3422a1517ba08fc6abb2a (commit)
via 8106d6cb5c42552948483a110dc0cc5e9c56d0ae (commit)
via 567ce9232f24ee47a46c90cf24ffe1da93d23831 (commit)
via f5b66ea630331a0bc87d8757790d989fb413de3a (commit)
via 120d4724241bf168cceae5edc4090cb116788a2c (commit)
via 110053ee13ef06072dad4ae7b94cc49b55311884 (commit)
via f4605eb8dee84caf920b0c68913b584e2a4bac1b (commit)
via f05bd40f2b9cd9981072347067acd93396299055 (commit)
via 94ed38172929919f0af0bd253c92872b6cc52dee (commit)
via fc4644a9e426ade590784119a2b2dd6dca8c4314 (commit)
via 60a283c88781658bcb56cd9193aad74c45fdd77d (commit)
via 49a6eae272cf16bd35805a009f705e2135e4840e (commit)
via e2524b9b2ab2abb9443090494cba4b5b1d2164ba (commit)
via 2c2573d3eebd0e243e6c5825ed3df0e86fb3f8a3 (commit)
via 3bebd7c305c3757e03349e4f80b6b28f1511aec5 (commit)
via 1c70cd5730dbff536c9282dbcaff859a181f92a8 (commit)
via 53376ad28752092d0596f77f4ca02aeff6c027bc (commit)
via 2d59edb5387eae2b0952325f56b3c980bfa0c147 (commit)
via 9a0eff2ec66df7a291354c12b222c29232470bd1 (commit)
via b3ed805501f2aee9552a75b343804886701a4b62 (commit)
via c6a0b3fba0c86247cfe37ba2d911d75e324682c1 (commit)
via b56c46fd803e0de027b18d83f83e48d69f66fb26 (commit)
via 488ff5620ddfaa58f630049397d257c5d485b1c9 (commit)
via 35be3971627853848ee68e9e02618d0da8baa6a7 (commit)
via f205be5d765333175a12c00f0b7d7c6c0e7ea66a (commit)
via cf8ee56c9bb446bb433d3ff31343036bbf7e605d (commit)
via b37f3f08e1e272176c10d33ad68755de01c09a2c (commit)
via 408b4f929a75c5ecaf135178824a0f43cfc7a249 (commit)
via 4baeb5034a7a90be998cd00a3998ccb1280dbdf6 (commit)
via 9d0739b56851a52529af136a3c3079286d8fe3eb (commit)
via 0f693db6931740fd05c0b2847439adfa5e046991 (commit)
via c7a8153593e643f13532e64fa64d2e1d6ce08061 (commit)
via 8fdd50b5eda09c2d0bce28f4b429f4c38506f956 (commit)
via b6186dc7451e6b8c8da5cbdc1c9e74ed20a80d74 (commit)
via f5368b319b73f0a53f91dfa6e49f909837a61077 (commit)
via 59f7ad18a0199d75370e3fafccb299739412876e (commit)
via 88636489cb1873dbd696e5b2e1712f02d440a4a1 (commit)
via 870d42b4f81d4db672d7162a48c7739d746515a1 (commit)
via 5744398ef6d19c6758e3818892bcd5168bb443b6 (commit)
via 4d93d0e62cb1d5a9b172e1d6d32cb726d8a83300 (commit)
via 345b8dca83aa4d9f72e6691b4a3464c115437061 (commit)
via 182fcd14a619c67fdee83208f4502feb989a5460 (commit)
via 7f5915908f0ec3536bb934586f0e3f4c9ff7f6e3 (commit)
via 6fb92e89335c7b3f74406c98f5f9846eafe590d6 (commit)
via a760c3f880f1b770f6fba623d9ae4ff861197d05 (commit)
via 468e58af7d430fed81c99f747a5c64ebd85204b6 (commit)
via 10d57b9836700285a9decc20df73a7168a21182e (commit)
via 61c09d9c5d9b9cce2bd78cd48d1158064d7d9258 (commit)
via ff07f45dfea338af148045c3b8e99ee049bc242d (commit)
via c15dfdbdd5f85241c7a6f9218c1da6ebefc01d69 (commit)
via 39a9a9f38163baabe2cd38be709b5c60ff6c7bb2 (commit)
via 532e7ec52311826ba30c325e0536c2c27f4ce0fc (commit)
via 4203516451ea14e9cf32339a6a278dd9a0caea8a (commit)
via ddbc35d2c5f76bfe729bea14cf144aa211686d21 (commit)
via a8f71b4e9a9f38f12cd8e70405488f98ad54a75a (commit)
via 2d52f7c27a8cd9bf6e793d5b643528cb3b3d3750 (commit)
via 674b9ba2077e9f6f8284e898549d9f0b276e33fb (commit)
via 2f3cd3934c7befe207fa5685a5d2bbaadaf0b8dd (commit)
via 34b78c127fb8d46c33bc10234ab66051387655d1 (commit)
via 8594d73dc2eef2de3b87881cfabd4c8c94b321c4 (commit)
via f6c019d259da27ae076f6229707c76f8535cc25e (commit)
via b1b80b93621ede45f6b158aacf8e1ea0340cd7c3 (commit)
via 08689ca34893848503790942bd9adbc27a35f7cf (commit)
via 1ff81b5394766e90214b5bc0fee05bbb91ce9c8a (commit)
via ef04b29ea0adc13bf67fead999e461c728af1913 (commit)
via 9994c8f6b54a850033f8940203fa012cd1d6b3b4 (commit)
via 58ad06be449c28b929fec3f60724c3d8da7d02df (commit)
via d39b08001d121f9c95146adfddd422b99c8eaa41 (commit)
via f243058f33f92144a82bb3746ca594214482bd71 (commit)
via 8f3875ca5490b2dd7d9dded537cc8cead83c7d5f (commit)
via db039c833627e16f66abeb25ff738ebb6365f196 (commit)
via 7f575f89c2900fc23efac08432e4a3dd54cc9e9a (commit)
via 833e613ccb65974a791ce923d58de840cf455960 (commit)
via 7b3ba7c9a589434d4dc812b5dfe055c1abc8aa68 (commit)
via 9e505ba3f3e5c1a0501ff193258071bd9985309a (commit)
via ea008147ac0f468f969b27c44119543564121750 (commit)
via 1bc2d672c1e9918aac07c8b5a150b8f27d95cf7e (commit)
via f09e76ffb4db0a5ff9d19ce5d8c436fbda163a12 (commit)
via df268b7b508e875a2459a14976ebf18f605a2c15 (commit)
via 331f8af273798b10f94cc10e197070f549d39344 (commit)
via d9614adabbb04e486c331456067f851217c12662 (commit)
via 95d80d7c17d2879d5d9228d8e523e64ed545058a (commit)
via 4c14b8bcb7d429f18e55f722e7f5eac35cbb916e (commit)
via 37d83fec684d517f47147f9e817fa221b7786b1d (commit)
via 2818eb65684559dc7e6bf944cd1901d4e6bc3552 (commit)
via 7685d17f9acae758b50558e08eca230673d52c12 (commit)
via 57ecf2d9f1eeae94798749e9da552836ae259f69 (commit)
via 695e490298fa302929b2e23330e00751e654c7da (commit)
via 5b908a1086e5334ce28f3a6559c43e57411b6e2d (commit)
via 153f9f4377d8603daa24b75fe2388d416fd57adf (commit)
via 0f34851e044a6e25a5c2cebc6b5543d40747b56a (commit)
via 4f31bf55a4977bfe899f4c979d5cdb5b8fbc5cf0 (commit)
via 22a480291386feb65c2782bff132d86868b92b2e (commit)
via d6f934d6f172a83b3c71c1b7f164ad605574a518 (commit)
via 8517d043d5ae2d6fac252d78e12b5920fc43f58e (commit)
via 29c53b20b4275b245d8809f0da9c34c8ce5f305c (commit)
via 70ae1a70a2c7fcf66966909a268e035f3cbd93fc (commit)
via cf88d603c625598dcd7f6013d7cd05a0d853582f (commit)
via cf6697143a38f611d9f966df648856455ea41e6b (commit)
via 989d9ab2023ae0b1d3473f1a98cbe4af6032ec83 (commit)
via b28d68c43e6e6b9162fa15f1156e6a5aad8a0ecf (commit)
via 5c49c5d9c4cfce7d8f803b340ad0692c2124a2d9 (commit)
via 2be69abc66177f9ce234d45995ba9aca4bc23c61 (commit)
via d57171b3393fa17297fd334af37aad3705eb2fed (commit)
via b0c111426d9736f2914a4597027fe58a25b08509 (commit)
via bbc5c84ea33b8eecf7b41719b3b8ef9fb04d7e95 (commit)
via 42bfb0bda8637c04bfba99b88eb8e0d98c9edfce (commit)
via f57a62d352b38ae4d4a1d1a2bc0feaab67e9b000 (commit)
via 8d8ff58becd39f6b78092c16426c90c0130bed92 (commit)
via 881a0e829491b42580df0921bdf786aae9cd41c9 (commit)
via 0fed065825971c4250e5a5df9085768d1d0d1d4f (commit)
via 1c62ee3a4b943a8cda9f37b5ac8a6cd374eb1c42 (commit)
via 342dcaa1145227288958367d2e84954725f7217e (commit)
via 644fba61c514f3ddbb2e0a62ce40d6b0ed2f4299 (commit)
via 36fc3ece1143cdc6b9703598218d2bb4d2c4e355 (commit)
via 891c949f15c37dea4435b04f7243bbbe9236ca97 (commit)
via 6f59c7eb70de8d82da80a82fe694e4d3fa33935e (commit)
via 349822855d7265976888c87a24c7b3f7eb86f2aa (commit)
via 29f623939ff4d11fe36b2857c4b49141726ab82b (commit)
via dc43a23cc9d7cc200a1eb8b8cd197b44c861bb9e (commit)
via c6ae3984c9f115fb898d594b527a5e7648bcc819 (commit)
via 091a1c0ec9d0d49fe128a756628837af45494f4a (commit)
via ad65275c0be73ee8de88e3977f2a18a515c5d63b (commit)
via 92f0c0f4eb8d12db582b778424cb0aedd1805c5f (commit)
via 2ee64baa0a224e6d3940120a68a7e56e08cfe972 (commit)
via 4fc42967c9c542562699c9014d03fd9b10b0ba47 (commit)
via 9473a445c6f255db859f27b374d8acf996cce31a (commit)
via db538cd17bfab6bad08ff20726ed5db380e7cf29 (commit)
via 377e8b5d02e63754d18f4387ee9242a65b3d3071 (commit)
via dcc84ebd2be0c0b56eb841c136a74713ebd2b0be (commit)
via 3a27a837612fd65a64a125c597860531049406ca (commit)
via ac49a3a62b1f1630a63e2c60e04dc6885e1cd06b (commit)
via 84b88f4b1be96be2d57e54eaa81937105fbcd515 (commit)
via 38b7b219ace37ab78e6881a7bdab9103ac20b62e (commit)
via 271c80c1a90a274ffc161467374e0ec0ebe2dcdf (commit)
via 1da6f5ff2e5ecb29950aeb43a4e846a2e648242e (commit)
via b96f715e00503f6919740f1ab095eeea2a62f5fc (commit)
via 4f2ee47aa80ec2310ff29aa6097cf22e7e1bbb6b (commit)
via c5a6baebaf5282d84fda65e2ac36d06a5b9510e4 (commit)
via 4b5a725f552367108d7d1fe5d82c685ce41d4a3a (commit)
via 81e28ecee5ee68c4996ac82af57cca0dac9b80bc (commit)
via 4dd09263c850b8cc5d024cf6687eff7622ebb1a1 (commit)
via effcb8ada05b263c48f0f151590bf5646516b829 (commit)
via 447ecf0ed0b6c4fdb45ac630daf6d3e5a4daa8d0 (commit)
via 5cf75441909af95df396e178c86210f9d2a1117e (commit)
via 1aaaa821ad82042cbed6187696bfc0c4d18a27de (commit)
via 971341702172e16451e0957b98acec86409ab22e (commit)
via 093cdb1f5b3b2f6a4033563c531ce7ecb8f60635 (commit)
via a4eb1be5473387ada47204f25535d085d6ce4293 (commit)
via 1d1000f8b1a6e8428950679f206e0e1123b21a88 (commit)
via d7f2242426f41254efde1b2a7e0670e1c23be27b (commit)
via 8e92356ec78ddb4c565a38c594a0b4fc30390abb (commit)
via ef19c6c3e91e5db20fae718e32f08d72985d47b2 (commit)
via a0a260c5f538fb88c88731ff93f3dd1a4596bc24 (commit)
via 490e139dc38ea99a25716a9a3decfe767b742c9a (commit)
via 1d8adca1b5c7fa2704f5c7f95d98bbe84aa497b4 (commit)
via 11e2ad9d3e27fab1131513e032e4affb9eaa5400 (commit)
via aa5646ecb88c709a6704b1a0d315ede5d826ff0e (commit)
via 6ba6d11f201ba2a81fa43470c3ca0febdb0f5727 (commit)
from e72c09a5827c2abba3534263a18c78e6c8e0582a (commit)
http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-4-ctdb
- Log -----------------------------------------------------------------
commit 05b3d5ba0c22ff94838c3c9304cb8c237e041920
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 23 13:07:23 2010 +0200
v3-4-ctdb: Bump up the vendor patch level to 9
commit 696da5d673760b122f4495d8a5cf747fb4a5ad62
Author: Michael Adam <obnox at samba.org>
Date: Mon Jun 21 12:32:14 2010 +0200
s3:net rpc registry: make getsd succeed when key sd only gives access to SD not key contents
You don't need the REG_KEY_READ permissions to access the SD of a key.
And for instance, the key HKLM\security ususally has no specific bits
set for builtin\administrators, but the READ_CONTROL_ACCESS.
I.e. builtin\administrators can get the sd but not enumerate the key.
commit e875e4762ab1477be513eaa56fda7d260fa6ae7e
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 23 12:02:31 2010 +0200
s3:idmap_ldap: use idmap_rw_new_mapping in idmap_ldap_new_mapping
commit 876c417e5632c350918aa38d45253e837d402914
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 23 12:18:35 2010 +0200
s3:idmap_ldap: add idmap_rw_ops to idmap_ldap_context and init in db_init()
commit b618f7cc589252cba56dffea0c918e688d1203a8
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 23 12:02:31 2010 +0200
s3:idmap_tdb: use idmap_rw_new_mapping in idmap_tdb_new_mapping
commit 9b705b738a0295c3d26e78967bf1a49f6661a6ac
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 23 12:12:37 2010 +0200
s3:idmap_tdb: add idmap_rw_ops to idmap_tdb_context and initialize them in init_db
commit 2d539ff41cf49754078e36bdf08bda7f00665f8e
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 23 12:02:31 2010 +0200
s3:idmap_tdb2: use idmap_rw_new_mapping in idmap_tdb2_new_mapping
commit 3eb9eb8c290070e29d53f1ae731e878398b1885f
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 23 12:01:47 2010 +0200
s3:idmap_tdb2: add rw_ops to idmap_tdb2_context and initialize in idmap_tdb2_db_init
commit a3c7d3fb1a28e17183c3422a1517ba08fc6abb2a
Author: Michael Adam <obnox at samba.org>
Date: Mon May 31 17:12:32 2010 +0200
s3:idmap: add abstract idmap_rw new_mapping mechanism without registering backends
commit 8106d6cb5c42552948483a110dc0cc5e9c56d0ae
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon May 31 10:57:52 2010 +0200
s3:winbindd: make sure we only call static_init_idmap once
metze
Signed-off-by: Michael Adam <obnox at samba.org>
commit 567ce9232f24ee47a46c90cf24ffe1da93d23831
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon May 24 14:55:17 2010 +1000
s3:winbind Ensure we always init idmap_passdb before we use it
It seems that it is possible for idmap_init_passdb_domain() to be run
before idmap_init_domain(), so ensure we run the static init functions
in both.
Andrew Bartlett
Signed-off-by: Michael Adam <obnox at samba.org>
commit f5b66ea630331a0bc87d8757790d989fb413de3a
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 22 14:13:55 2010 +0200
s3:idmap_ad: untangle two assignments from checks
commit 120d4724241bf168cceae5edc4090cb116788a2c
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 22 14:12:14 2010 +0200
s3:idmap_ad: remove unused filter_low_id and filter_high_id from idmap_ad_context
The filter range from the idmap_domain is used now.
commit 110053ee13ef06072dad4ae7b94cc49b55311884
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 22 14:09:57 2010 +0200
s3:idmap_ad: use range from idmap_domain in idmap_ad_sids_to_unixids()
commit f4605eb8dee84caf920b0c68913b584e2a4bac1b
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 22 13:13:57 2010 +0200
s3:idmap_ad: use range from idmap_domain in idmap_ad_unixids_to_sids()
commit f05bd40f2b9cd9981072347067acd93396299055
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 22 12:47:41 2010 +0200
s3:idmap_rid: remove a comment that does not apply in that place.
Probably got copied from a different location.
commit 94ed38172929919f0af0bd253c92872b6cc52dee
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 22 12:44:22 2010 +0200
s3:idmap_rid: remove unused domain_name from the idmap_rid_context.
commit fc4644a9e426ade590784119a2b2dd6dca8c4314
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 22 12:42:52 2010 +0200
s3:idmap_rid: remove range from idmap_rid_context()
Now, the idmap_domain range that is centrally parsed is used.
commit 60a283c88781658bcb56cd9193aad74c45fdd77d
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 22 12:42:06 2010 +0200
s3:idmap_rid: use range from idmap_domain in idmap_rid_sid_to_id()
commit 49a6eae272cf16bd35805a009f705e2135e4840e
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 22 12:38:19 2010 +0200
s3:idmap_rid: use ranges from idmap_domain struct in idmap_rid_id_to_sid()
commit e2524b9b2ab2abb9443090494cba4b5b1d2164ba
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 22 12:32:35 2010 +0200
s3:idmap_rid: remove unused talloc context var from idmap_rid_sids_to_unixids()
commit 2c2573d3eebd0e243e6c5825ed3df0e86fb3f8a3
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 22 12:31:41 2010 +0200
s3:idmap_rid: remove unused talloc context arg from idmap_rid_sid_to_id()
commit 3bebd7c305c3757e03349e4f80b6b28f1511aec5
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 22 12:30:58 2010 +0200
s3:idmap_rid: remove unused talloc context var from idmap_rid_unixids_to_sids()
commit 1c70cd5730dbff536c9282dbcaff859a181f92a8
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 22 12:29:57 2010 +0200
s3:idmap_rid: remove unused talloc ctx argument from idmap_rid_id_to_sid()
commit 53376ad28752092d0596f77f4ca02aeff6c027bc
Author: Michael Adam <obnox at samba.org>
Date: Mon Jun 21 17:28:37 2010 +0200
s3:idmap_rid: untangle assignment from check in idmap_rid_initialize()
commit 2d59edb5387eae2b0952325f56b3c980bfa0c147
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 23 12:39:59 2010 +0200
s3:idmap_ldap: add my (C)
commit 9a0eff2ec66df7a291354c12b222c29232470bd1
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 17 21:55:02 2010 +0200
s3:idmap_ldap: create mappings for unmapped sids in idmap_ldap_sids_to_unixids()
commit b3ed805501f2aee9552a75b343804886701a4b62
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 17 20:48:53 2010 +0200
s3:idmap_ldap: remove unreached code (and explicit error return code)
commit c6a0b3fba0c86247cfe37ba2d911d75e324682c1
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 17 20:19:46 2010 +0200
s3:idmap_ldap: add a idmap_ldap_new_mapping().
High level function to create a new mapping for an unmapped sid.
This builds logic that used to reside in the top level idmap code
in the backend.
commit b56c46fd803e0de027b18d83f83e48d69f66fb26
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 17 20:18:27 2010 +0200
s3:idmap_ldap: add idmap_ldap_get_new_id() to allocate a new id given a domain
Currently this only works with the default domain, calling out
to idmap_ldap_allocate_id(). In the future this will be extended
to also work for non-default domains.
commit 488ff5620ddfaa58f630049397d257c5d485b1c9
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 17 20:15:25 2010 +0200
s3:idmap_ldap: move idmap_ldap_set_mapping() further up.
commit 35be3971627853848ee68e9e02618d0da8baa6a7
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 17 19:45:39 2010 +0200
s3:idmap_ldap: make idmap_ldap_alloc_context a member of idmap_ldap_context
this hides this beneath the idmap structure and removes a global variable
commit f205be5d765333175a12c00f0b7d7c6c0e7ea66a
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 17 19:17:48 2010 +0200
s3:idmap_ldap: call idmap_ldap_alloc_init from idmap_ldap_init.
The alloc subsystem is now subordinate to the idmap system.
commit cf8ee56c9bb446bb433d3ff31343036bbf7e605d
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 17 19:03:46 2010 +0200
s3:idmap_ldap: remove the (now unused) range from idmap_ldap_alloc_context
commit b37f3f08e1e272176c10d33ad68755de01c09a2c
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 17 19:03:12 2010 +0200
s3:idmap_ldap: use ranges from idmap domain in idmap_ldap_allocate_id()
Second step in removing the idmap range from the idmap_ldap_alloc_context.
commit 408b4f929a75c5ecaf135178824a0f43cfc7a249
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 17 18:59:28 2010 +0200
s3:idmap_ldap: add idmap_domain arg to idmap_ldap_alloc_init and verify_idpool
First step in removing idmap ranges from the idmap_ldap_alloc_context.
The range from the domain is to be used now.
commit 4baeb5034a7a90be998cd00a3998ccb1280dbdf6
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 17 10:16:54 2010 +0200
s3:idmap_ldap: remove unused filter range from struct idmap_ldap_context
commit 9d0739b56851a52529af136a3c3079286d8fe3eb
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 17 10:16:20 2010 +0200
s3:idmap_ldap: don't load ranges - they have been loaded into struct idmap_domain
commit 0f693db6931740fd05c0b2847439adfa5e046991
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 17 10:00:49 2010 +0200
s3:idmap_ldap: use filter range from idmap domain, not idmap_ldap_context
commit c7a8153593e643f13532e64fa64d2e1d6ce08061
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 22 14:49:00 2010 +0200
s3:idmap_ldap: re-implement allocate_id in idmap methods.
commit 8fdd50b5eda09c2d0bce28f4b429f4c38506f956
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 17 09:39:11 2010 +0200
s3:idmap_tdb: add my (C)
commit b6186dc7451e6b8c8da5cbdc1c9e74ed20a80d74
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 22 09:01:32 2010 +0200
s3:idmap_tdb: properly initialize the idmap_tdb context with zero
commit f5368b319b73f0a53f91dfa6e49f909837a61077
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 17 09:35:52 2010 +0200
s3:idmap_tdb: prevent opening the idmap db more than once.
commit 59f7ad18a0199d75370e3fafccb299739412876e
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 17 08:53:54 2010 +0200
s3:idmap_tdb: rewrite sids_to_unixids to create mappings for unmapped sids.
commit 88636489cb1873dbd696e5b2e1712f02d440a4a1
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 17 08:44:04 2010 +0200
s3:idmap_tdb: add a idmap_tdb_new_mapping().
High level function to create a new mapping for an unmapped sid.
This builds logic that used to reside in the top level idmap code
in the backend. To be called inside a transaction to guarantee
atomicity of the operation.
commit 870d42b4f81d4db672d7162a48c7739d746515a1
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 17 08:43:11 2010 +0200
s3:idmap_tdb: move the set_mapping code up
commit 5744398ef6d19c6758e3818892bcd5168bb443b6
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 17 08:35:28 2010 +0200
s3:idmap_tdb: use transaction wrapper for idmap_tdb_set_mapping().
commit 4d93d0e62cb1d5a9b172e1d6d32cb726d8a83300
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 17 09:47:27 2010 +0200
s3:idmap_tdb: remove unused struct idmap_tdb_state.
commit 345b8dca83aa4d9f72e6691b4a3464c115437061
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 17 08:17:39 2010 +0200
s3:idmap_tdb: remove unused idmap_alloc_db
commit 182fcd14a619c67fdee83208f4502feb989a5460
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 17 08:17:06 2010 +0200
s3:idmap_tdb: remove unused idmap_tdb_alloc_close().
commit 7f5915908f0ec3536bb934586f0e3f4c9ff7f6e3
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 17 08:16:05 2010 +0200
s3:idmap_tdb: give idmap_domain arg to idmap_tdb_allocate_id and use ctx->db
instead of alloc_db
commit 6fb92e89335c7b3f74406c98f5f9846eafe590d6
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 17 08:12:43 2010 +0200
s3:idmap_tdb: call idmap_tdb_init_hwm() from idmap_tdb_open_db().
commit a760c3f880f1b770f6fba623d9ae4ff861197d05
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 17 08:11:19 2010 +0200
s3:idmap_tdb: move idmap_tdb_init_hwm up.
commit 468e58af7d430fed81c99f747a5c64ebd85204b6
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 17 08:07:40 2010 +0200
s3:idmap_tdb: remove unused idmap_tdb_load_ranges()
The idmap_tdb_state (which should actually be called idmap_tdb_alloc_context)
is being removed since the alloc part is combined with the id mapping part.
commit 10d57b9836700285a9decc20df73a7168a21182e
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 23 10:53:29 2010 +0200
s3:idmap_tdb: have idmap_tdb_open_db take an idmap_domain struct as argument
the other arguments are not needed any more and are removed.
commit 61c09d9c5d9b9cce2bd78cd48d1158064d7d9258
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 17 07:56:46 2010 +0200
s3:idmap_tdb: rename idmap_tdb_alloc_init->idmap_tdb_init_hwm and use db from idmap_tdb_context
instead of the special idmap_alloc_db
commit ff07f45dfea338af148045c3b8e99ee049bc242d
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 17 07:51:15 2010 +0200
s3:idmap_tdb: move definition of struct idmap_tdb_context up.
commit c15dfdbdd5f85241c7a6f9218c1da6ebefc01d69
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 17 07:43:14 2010 +0200
s3:idmap_tdb: remove filter_low_id,filter_high_id from idmap_tdb_context
These are now taken from the idmap_domain struct.
commit 39a9a9f38163baabe2cd38be709b5c60ff6c7bb2
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 17 09:46:08 2010 +0200
s3:idmap_tdb: add idmap domain arg to idmap_tdb_upgrade and use domain range
commit 532e7ec52311826ba30c325e0536c2c27f4ce0fc
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 17 07:42:00 2010 +0200
s3:idmap_tdb: use filter from idmap_domain rather than from idmap_tdb_context
commit 4203516451ea14e9cf32339a6a278dd9a0caea8a
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 17 07:35:28 2010 +0200
s3:idmap_tdb: give idmap domain argument to idmap_tdb_sid_to_id
instead of idmap_tdb_context. This is in preparation of using the
filter from the idmap_domain struct.
commit ddbc35d2c5f76bfe729bea14cf144aa211686d21
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 17 07:32:12 2010 +0200
s3:idmap_tdb: give idmap domain argument to idmap_tdb_id_to_sid
instead of idmap_tdb_context. This is in preparation of using the
filter from the idmap_domain struct.
commit a8f71b4e9a9f38f12cd8e70405488f98ad54a75a
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 22 14:41:31 2010 +0200
s3:idmap_tdb: implement allocate_id in idmap methods for tdb backend
commit 2d52f7c27a8cd9bf6e793d5b643528cb3b3d3750
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 16 09:26:17 2010 +0200
s3:idmap_tdb: add idmap_tdb_get_new_id() to allocate a new id given a domain
Currently this only works with the default domain, calling out
to idmap_tdb_allocate_id(). In the future this will be extended
to also work for non-default domains.
commit 674b9ba2077e9f6f8284e898549d9f0b276e33fb
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 16 09:19:21 2010 +0200
s3:idmap_tdb: convert idmap_tdb_allocate_id() to use transaction wrappers
commit 2f3cd3934c7befe207fa5685a5d2bbaadaf0b8dd
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 17 09:39:24 2010 +0200
s3:idmap_tdb2: add my (C)
commit 34b78c127fb8d46c33bc10234ab66051387655d1
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 23 11:30:56 2010 +0200
s3:idmap_tdb2: move idmap_tdb2_new_mapping() up. spare a prototype.
commit 8594d73dc2eef2de3b87881cfabd4c8c94b321c4
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 16 09:31:53 2010 +0200
s3:idmap_tdb2: get rid of an extra variable in idmap_tdb2_db_init().
commit f6c019d259da27ae076f6229707c76f8535cc25e
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 17 08:23:25 2010 +0200
s3:idmap_tdb2: move idmap_tdb2_set_mapping() up to its _action callback.
commit b1b80b93621ede45f6b158aacf8e1ea0340cd7c3
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 17 08:04:53 2010 +0200
s3:idmap_tdb2: use the right talloc context for db_open in idmap_tdb2_open_db()
commit 08689ca34893848503790942bd9adbc27a35f7cf
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 16 22:02:54 2010 +0200
s3:idmap_tdb2: don't check whether sid is already mapped in idmap_tdb2_new_mapping().
idmap_tdb2_new_mapping() is called from inside a transaction only
with sids, that have been verified not to be mapped directly before
that in the same transaction.
commit 1ff81b5394766e90214b5bc0fee05bbb91ce9c8a
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 16 17:40:12 2010 +0200
s3:idmap_tdb2: add the db_context to the idmap_tdb2_context
this removes the idmap_tdb2 global variable
commit ef04b29ea0adc13bf67fead999e461c728af1913
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 16 22:36:33 2010 +0200
s3:idmap_tdb2: talloc_zero (instead of talloc) the idmap_tdb2_context
commit 9994c8f6b54a850033f8940203fa012cd1d6b3b4
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 16 17:30:07 2010 +0200
s3:idmap_tdb2: rename idmap_tdb2_alloc_load -> idmap_tdb2_init_hwm
commit 58ad06be449c28b929fec3f60724c3d8da7d02df
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 16 17:28:34 2010 +0200
s3:idmap_tdb2: move idmap_tdb2_alloc_load() up to reduce need for prototype
commit d39b08001d121f9c95146adfddd422b99c8eaa41
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 16 17:26:26 2010 +0200
s3:idmap_tdb2: remove unused idmap_tdb2_state and idmap_tdb2_load_ranges
commit f243058f33f92144a82bb3746ca594214482bd71
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 16 17:24:40 2010 +0200
s3:idmap_tdb2: give idmap_tdb2_alloc_load() and idmap domain arguemnt
and use the ranges from the idmap domain for checking the HWM values
commit 8f3875ca5490b2dd7d9dded537cc8cead83c7d5f
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 16 17:21:27 2010 +0200
s3:idmap_tdb2: add an idmap_domain struct argument to idmap_tdb2_open_db()
commit db039c833627e16f66abeb25ff738ebb6365f196
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 16 17:31:52 2010 +0200
s3:idmap_tdb2: remove filter_low_id, filter_high_id, read_only from idmap_tdb2_context
Now these are taken from the idmap_domain struct.
commit 7f575f89c2900fc23efac08432e4a3dd54cc9e9a
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 16 17:17:44 2010 +0200
s3:idmap_tdb2: don't parse config and fill filter_low_id,filter_high_id,read_only
into idmap_tdb2_context in idmap_tdb2_db_init().
Now these are taken from the idmap_domain struct instead.
commit 833e613ccb65974a791ce923d58de840cf455960
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 16 17:16:23 2010 +0200
s3:idmap_tdb2: use read_only flag from idmap_domain in idmap_tdb2_sids_to_unixids().
commit 7b3ba7c9a589434d4dc812b5dfe055c1abc8aa68
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 16 17:14:51 2010 +0200
s3:idmap_tdb2: use range from idmap_domain in idmap_tdb2_allocate_id
commit 9e505ba3f3e5c1a0501ff193258071bd9985309a
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 16 17:12:44 2010 +0200
s3:idmap_tdb2: use filter from idmap_domain rather than from idmap_tdb2_context
commit ea008147ac0f468f969b27c44119543564121750
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 16 17:06:17 2010 +0200
s3:idmap_tdb2: pass idmap_domain (not idmap_tdb2_context) to idmap_tdb2_sid_to_id
commit 1bc2d672c1e9918aac07c8b5a150b8f27d95cf7e
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 16 16:02:07 2010 +0200
s3:idmap_tdb2: pass idmap_domain instead of idmap_tdb2_context to idmap_tdb2_unixids_to_sids
The reason for this will become apparent later: The ranges are being moved to
the idmap_domain: They are universal.
commit f09e76ffb4db0a5ff9d19ce5d8c436fbda163a12
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 16 15:49:30 2010 +0200
s3:idmap_tdb2: also support idmap script for named domains
this can be configured via "idmap config DOMAIN : script = foobar"
commit df268b7b508e875a2459a14976ebf18f605a2c15
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 16 15:47:23 2010 +0200
s3:idmap_tdb2: move the idmap script from idmap_tdb2_state to idmap_tdb2_context
The state (aka idmap_tdb2_alloc_context) is being removed.
The (global) idmap script was wrong there anyways.
It belongs to the per-domain context.
commit 331f8af273798b10f94cc10e197070f549d39344
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 16 15:31:55 2010 +0200
s3:idmap_tdb2: remove use of idmap_tdb2_state from idmap_tdb2_allocate_id
idmap_tdb2_state should actually be called idmap_tdb2_alloc_context.
This is being removed as the idmap and allocation is moved together.
We use the idmap_tdb2_context * that is sitting in dom->private_data.
This contains the same ranges as those in the state anyways.
Later, when we can also allocate for named domains, this will become
necessary anyways.
commit d9614adabbb04e486c331456067f851217c12662
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 16 15:31:05 2010 +0200
s3:idmap_tdb2: move definition of struct idmap_tdb2_context up.
commit 95d80d7c17d2879d5d9228d8e523e64ed545058a
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 16 15:08:16 2010 +0200
s3:idmap_tdb2: open the db after loading the ranges in idmap_tdb2_db_init().
commit 4c14b8bcb7d429f18e55f722e7f5eac35cbb916e
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 22 14:48:07 2010 +0200
s3:idmap_tdb2: remove special treatment of NULL sid from idmap_tdb2_sids_to_unixids
allocate_id has now been (re)added to the idmap methods.
commit 37d83fec684d517f47147f9e817fa221b7786b1d
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 22 14:47:11 2010 +0200
s3:idmap_tdb2: re-implement allocated_id in idmap methods.
commit 2818eb65684559dc7e6bf944cd1901d4e6bc3552
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 16 16:59:26 2010 +0200
s3:idmap: add idmap_unix_id_is_in_range() for checking an id against an idmap range
commit 7685d17f9acae758b50558e08eca230673d52c12
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 22 16:29:13 2010 +0200
s3:idmap: don't check range for passdb idmap domain
commit 57ecf2d9f1eeae94798749e9da552836ae259f69
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 16 16:07:55 2010 +0200
s3:idmap: parse ranges in idmap_init_domain().
commit 695e490298fa302929b2e23330e00751e654c7da
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 16 16:05:34 2010 +0200
s3:idmap: add low_id and high_id to the idmap_domain struct
This global data will replace the backend-specific filter_low_id
and filter_high_id. The presence of a range is generic to all
idmap configs.
commit 5b908a1086e5334ce28f3a6559c43e57411b6e2d
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 15 09:12:49 2010 +0200
s3:idmap: remove an extra blank line
commit 153f9f4377d8603daa24b75fe2388d416fd57adf
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 22 14:37:47 2010 +0200
s3:idmap: use allocate_id() from the idmap_methods in idmap_allocate_unixid()
commit 0f34851e044a6e25a5c2cebc6b5543d40747b56a
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 22 14:31:24 2010 +0200
s3:idmap: re-add the allocate_id method to the idmap_methods struct.
This has vanished with the removal of the separated idmap alloc methods.
This single "alloc" method is still needed though, for the samba-wide
Unix-ID allocator, which is used in group-mapping and ldapsam:editposix.
This method should ultimately also disappear.
commit 4f31bf55a4977bfe899f4c979d5cdb5b8fbc5cf0
Author: Michael Adam <obnox at samba.org>
Date: Mon Jun 14 16:59:19 2010 +0200
s3:net: rewrite "net idmap restore" using dbwrap
This detects the idmap backend from the current smb.conf
and stores the id mapping tables in the corresponding data bases.
Currently, only tdb and tdb2 backends are supported.
Support for the ldap backend may be implemented later.
commit 22a480291386feb65c2782bff132d86868b92b2e
Author: Michael Adam <obnox at samba.org>
Date: Mon Jun 14 12:25:11 2010 +0200
s3:net: change "net idmap dump" to use dbwrap instead of direct tdb access
This way, it will also work in a samba-ctdb cluster.
commit d6f934d6f172a83b3c71c1b7f164ad605574a518
Author: Volker Lendecke <vl at samba.org>
Date: Tue Jun 15 14:41:01 2010 +0200
v3-4-ctdb: Bump up the vendor patch level to 8
commit 8517d043d5ae2d6fac252d78e12b5920fc43f58e
Author: Volker Lendecke <vl at samba.org>
Date: Tue Jun 8 14:33:05 2010 +0200
s3: Fix starving the echo responder
When both the echo responder and the 445 socket want to send stuff to the
worker smbd, the select loop is not fair. It always chooses the smaller file
descriptor to work on. This can mean that on a busy system the echo responder
never gets around to feed its stuff to the parent.
This fix chooses the async echo responder socket when both the 445 and the echo
responder socket are readable.
Yes, it is a very hackish fix which is required *now* I think. The proper fix
would be to either assign priorities to fd's in tevent, or the from my point of
view better fix would be to make tevent kindof round-robin.
Round-robin would mean that whenever a fd has been dealt with, it is taken off
the list of interested sockets, and only if no other socket is active, all of
the ones waiting are put back. This is a bit like EPOLL_ONESHOT, which I would
like to use for this in the epoll case. Although, I need to do some research if
maybe epoll already guarantees round-robin, I did not find anything in the docs
yet.
Volker
commit 29c53b20b4275b245d8809f0da9c34c8ce5f305c
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 1 17:22:18 2010 +0200
v3-4-ctdb: Bump up the vendor patch level to 7
commit 70ae1a70a2c7fcf66966909a268e035f3cbd93fc
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 1 16:45:51 2010 +0200
s3:winbind:idmap_tdb2: honour the "idmap read only" flag in the tdb2 module.
Note that this will not prevent the idmap script from writing its
mappings to the database, but no new unix ids will be allocated via
the allocator and hence no new mappings will be autogenerated.
commit cf88d603c625598dcd7f6013d7cd05a0d853582f
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 1 15:49:17 2010 +0200
s3:winbind: set the read_only flag when parsing the config in idmap_tdb2_db_init
For the default config this is taken from lp_idmap_read_only(),
and for explicit domains per "idmap config DOMAIN : read only".
commit cf6697143a38f611d9f966df648856455ea41e6b
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 1 15:41:38 2010 +0200
s3:winbind:idmap_tdb2: add a read_only parameter to the idmap_tdb2_context.
commit 989d9ab2023ae0b1d3473f1a98cbe4af6032ec83
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 1 15:35:01 2010 +0200
s3:loadparm: add new boolean parameter "idmap read only"
This will be used to be able to put the default idmap config
read only. This can make sense for instance with the tdb2
idmap backend and using the idmap script feature.
commit b28d68c43e6e6b9162fa15f1156e6a5aad8a0ecf
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 1 15:33:28 2010 +0200
s3: remove prototype of inexistent lp_idmap_alloc_backend().
commit 5c49c5d9c4cfce7d8f803b340ad0692c2124a2d9
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 1 15:32:20 2010 +0200
s3: remove unused prototype for lp_idmap_domains().
commit 2be69abc66177f9ce234d45995ba9aca4bc23c61
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 1 14:20:08 2010 +0200
s3:winbind:idmap: fix idmap_allocate_unixid() to actually return the ID
commit d57171b3393fa17297fd334af37aad3705eb2fed
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 1 14:03:32 2010 +0200
s3:winbind:idmap_tdb2: fix a debug message
commit b0c111426d9736f2914a4597027fe58a25b08509
Author: Michael Adam <obnox at samba.org>
Date: Mon May 31 18:05:58 2010 +0200
v3-4-ctdb: Bump up the vendor patch level to 6
commit bbc5c84ea33b8eecf7b41719b3b8ef9fb04d7e95
Author: Michael Adam <obnox at samba.org>
Date: Mon May 31 15:53:27 2010 +0200
s3:loadparm: remove parameter "idmap alloc backend"
commit 42bfb0bda8637c04bfba99b88eb8e0d98c9edfce
Author: Michael Adam <obnox at samba.org>
Date: Mon May 31 15:55:01 2010 +0200
s3:docs: fix net manpage to reflect removal of net "idmap secret alloc" feature
commit f57a62d352b38ae4d4a1d1a2bc0feaab67e9b000
Author: Michael Adam <obnox at samba.org>
Date: Mon May 31 15:00:38 2010 +0200
s3:net: remove the "net idmap secret alloc" functionality.
This is now not available any more, since allocation is moved
below the id mapping layer. The functionality could be
reintroduced on a per domain basis as an e.g
"net idmap secret <domain> alloc" command.
Michael
commit 8d8ff58becd39f6b78092c16426c90c0130bed92
Author: Michael Adam <obnox at samba.org>
Date: Mon May 31 11:56:55 2010 +0200
s3:winbind:idmap: remove unused definition of idmap_alloc_methods.
Allocation is now completely handled in the allocating backends.
commit 881a0e829491b42580df0921bdf786aae9cd41c9
Author: Michael Adam <obnox at samba.org>
Date: Mon May 31 11:55:18 2010 +0200
s3:winbind:idmap: remove idmap_alloc_context from idmap.c
The registering of alloc backends is being removed.
The idmap backends are responsible for initializing
their alloc code on their own if necessary.
No list of alloc backends is maintained any more in the top level.
commit 0fed065825971c4250e5a5df9085768d1d0d1d4f
Author: Michael Adam <obnox at samba.org>
Date: Mon May 31 11:47:04 2010 +0200
s3:winbind:idmap: remove the alloc methods list from idmap.c
The registering of alloc backends is being removed.
The idmap backends are responsible for initializing
their alloc code on their own if necessary.
No list of alloc backends is maintained any more in the top level.
commit 1c62ee3a4b943a8cda9f37b5ac8a6cd374eb1c42
Author: Michael Adam <obnox at samba.org>
Date: Mon May 31 11:45:58 2010 +0200
s3:winbind:idmap: remove unused get_alloc_methods().
commit 342dcaa1145227288958367d2e84954725f7217e
Author: Michael Adam <obnox at samba.org>
Date: Mon May 31 11:44:44 2010 +0200
s3:winbind:idmap: remove unused smb_register_idmap_alloc().
The registering of alloc backends is being removed.
The idmap backends are responsible for initializing
their alloc code on their own if necessary.
commit 644fba61c514f3ddbb2e0a62ce40d6b0ed2f4299
Author: Michael Adam <obnox at samba.org>
Date: Mon May 31 11:41:05 2010 +0200
s3:winbind:idmap_ldap: remove unused idmap_ldap_alloc_methods.
commit 36fc3ece1143cdc6b9703598218d2bb4d2c4e355
Author: Michael Adam <obnox at samba.org>
Date: Mon May 31 11:38:58 2010 +0200
s3:winbind:idmap_ldap: remoce unused idmap_alloc_ldap_init
commit 891c949f15c37dea4435b04f7243bbbe9236ca97
Author: Michael Adam <obnox at samba.org>
Date: Mon May 31 11:37:40 2010 +0200
s3:winbind:idmap_ldap: don't call idmap_alloc_ldap_init in idmap_ldap_init
The registering of alloc backends is being removed.
The idmap backends are responsible for initializing
their alloc code on their own if necessary.
commit 6f59c7eb70de8d82da80a82fe694e4d3fa33935e
Author: Michael Adam <obnox at samba.org>
Date: Mon May 31 11:34:46 2010 +0200
s3:winbind:idmap_tdb: remove unused idmap_alloc_methods
commit 349822855d7265976888c87a24c7b3f7eb86f2aa
Author: Michael Adam <obnox at samba.org>
Date: Mon May 31 11:33:34 2010 +0200
s3:winbind:idmap_tdb: remove unused idmap_alloc_tdb_init()
commit 29f623939ff4d11fe36b2857c4b49141726ab82b
Author: Michael Adam <obnox at samba.org>
Date: Mon May 31 11:32:20 2010 +0200
s3:winbind:idmap_tdb: don't call idmap_alloc_tdb_init in idmap_tdb_init
The registering of alloc backends is being removed.
The idmap backends are responsible for initializing
their alloc code on their own if necessary.
commit dc43a23cc9d7cc200a1eb8b8cd197b44c861bb9e
Author: Michael Adam <obnox at samba.org>
Date: Mon May 31 11:29:00 2010 +0200
s3:winbind:idmap_tdb2: remove unused idmap_tdb2_alloc_init().
commit c6ae3984c9f115fb898d594b527a5e7648bcc819
Author: Michael Adam <obnox at samba.org>
Date: Mon May 31 11:28:02 2010 +0200
s3:winbind:idmap_tdb2: remove unused idmap_tdb2_alloc_close().
commit 091a1c0ec9d0d49fe128a756628837af45494f4a
Author: Michael Adam <obnox at samba.org>
Date: Mon May 31 11:27:18 2010 +0200
s3:winbind:idmap_tdb2: remove unused idmap_alloc_methods.
commit ad65275c0be73ee8de88e3977f2a18a515c5d63b
Author: Michael Adam <obnox at samba.org>
Date: Mon May 31 11:24:52 2010 +0200
s3:winbind:idmap_tdb2: don't call smb_register_idmap_alloc() in idmap_tdb2_init
The registering of alloc backends is being removed.
The idmap backends are responsible for initializing
their alloc code on their own if necessary.
commit 92f0c0f4eb8d12db582b778424cb0aedd1805c5f
Author: Michael Adam <obnox at samba.org>
Date: Mon May 31 10:14:18 2010 +0200
s3:winbind: make idmap_alloc_tdb_init() static.
commit 2ee64baa0a224e6d3940120a68a7e56e08cfe972
Author: Michael Adam <obnox at samba.org>
Date: Mon May 31 00:27:23 2010 +0200
s3:winbind:idmap: remove unused idmap_alloc_init().
commit 4fc42967c9c542562699c9014d03fd9b10b0ba47
Author: Michael Adam <obnox at samba.org>
Date: Sun May 30 22:24:19 2010 +0200
s3:winbind:idmap: use sids_to_unixids() with a NULL sid instead of allocate_id
commit 9473a445c6f255db859f27b374d8acf996cce31a
Author: Michael Adam <obnox at samba.org>
Date: Sun May 30 21:40:44 2010 +0200
s3:winbind:idmap: factor out common code of idmap_allocate_uid|gid()
into new idmap_allocate_unixid().
commit db538cd17bfab6bad08ff20726ed5db380e7cf29
Author: Michael Adam <obnox at samba.org>
Date: Mon May 31 00:24:18 2010 +0200
s3:winbind:idmap_tdb2_sids_to_unixids: only allocate an id for sid == NULL
This special treatment allows to eliminate the alloc methods from the
surface while still keeping the WINBINDD_ALLOCATE_[U|G]ID methods.
commit 377e8b5d02e63754d18f4387ee9242a65b3d3071
Author: Michael Adam <obnox at samba.org>
Date: Mon May 31 17:18:52 2010 +0200
s3:winbind:idmap_tdb2: add allocation of new mappings to idmap_tdb2_sids_to_unixids
This moves the new_mapping feature inside the tdb2 backend to make creations
of mappings atomic.
Note: The new internal function idmap_tdb2_get_new_id() that is used to allocate
a new unix id is prepared to function for multiple explicitly configured idmap
domains, but currently it does only work for the default domain. The extended
allocation support requires extension of the data base format to store multiple
counters (per domain). This will be added in a later step (TODO!).
commit dcc84ebd2be0c0b56eb841c136a74713ebd2b0be
Author: Michael Adam <obnox at samba.org>
Date: Thu May 20 10:28:03 2010 +0200
s3:winbindd:idmap: remove idmap_new_mapping() - now implemented in the backends
commit 3a27a837612fd65a64a125c597860531049406ca
Author: Michael Adam <obnox at samba.org>
Date: Sun May 16 00:32:10 2010 +0200
s3:idmap: add a debug message to idmap_sid_to_gid
commit ac49a3a62b1f1630a63e2c60e04dc6885e1cd06b
Author: Michael Adam <obnox at samba.org>
Date: Sun May 16 00:31:39 2010 +0200
s3:idmap: add a debug message to idmap_sid_to_uid
commit 84b88f4b1be96be2d57e54eaa81937105fbcd515
Author: Michael Adam <obnox at samba.org>
Date: Fri May 14 16:19:46 2010 +0200
s3:idmap: don't call idmap_new_mapping idmap_sid_to_gid
The setting of a new mapping is moved into the backend code
to achieve atomicity and greater flexibility.
Michael
commit 38b7b219ace37ab78e6881a7bdab9103ac20b62e
Author: Michael Adam <obnox at samba.org>
Date: Fri May 14 16:18:16 2010 +0200
s3:idmap: don't call idmap_new_mapping idmap_sid_to_unixid.
The setting of a new mapping is moved into the backend code
to achieve atomicity and greater flexibility.
Michael
commit 271c80c1a90a274ffc161467374e0ec0ebe2dcdf
Author: Michael Adam <obnox at samba.org>
Date: Fri May 14 16:11:32 2010 +0200
s3:idmap: remove the set_mapping method from the idmap API
Keep the backend implementations for possible internal use.
Michael
commit 1da6f5ff2e5ecb29950aeb43a4e846a2e648242e
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 22 17:59:18 2009 +0100
s3:idmap: remove unused method set_id_hwm from idmap API
Michael
commit b96f715e00503f6919740f1ab095eeea2a62f5fc
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 22 17:56:19 2009 +0100
s3:idmap: remove unused alloc method get_id_hwm from idmap API
Michael
commit 4f2ee47aa80ec2310ff29aa6097cf22e7e1bbb6b
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 22 15:52:34 2009 +0100
s3:idmap: remove unused method dump_data() from the idmap API
Michael
commit c5a6baebaf5282d84fda65e2ac36d06a5b9510e4
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 22 14:44:24 2009 +0100
s3:idmap: remove the remove_mapping method from API and backends
Michael
commit 4b5a725f552367108d7d1fe5d82c685ce41d4a3a
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 22 14:38:21 2009 +0100
s3:idmap: remove unused idmap_remove_mapping().
Michael
commit 81e28ecee5ee68c4996ac82af57cca0dac9b80bc
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 22 14:36:51 2009 +0100
s4: remove REMOVE_MAPPING from wb_samba3_protocol
Michael
commit 4dd09263c850b8cc5d024cf6687eff7622ebb1a1
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 22 14:34:50 2009 +0100
s3:winbind: remove the method REMOVE_MAPPING from winbind's API
Michael
commit effcb8ada05b263c48f0f151590bf5646516b829
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 22 14:31:55 2009 +0100
s3:idmap: remove unused idmap_set_mapping().
Michael
commit 447ecf0ed0b6c4fdb45ac630daf6d3e5a4daa8d0
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 22 14:30:25 2009 +0100
s4: remove SET_MAPPING from wb_samba3_protocol
Michael
commit 5cf75441909af95df396e178c86210f9d2a1117e
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 22 14:29:15 2009 +0100
s3:winbind: remove the method SET_MAPPING from winbind's API
Michael
commit 1aaaa821ad82042cbed6187696bfc0c4d18a27de
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 22 13:57:21 2009 +0100
libwbclient: unimplement wbcRemoveGidMapping()
Michael
commit 971341702172e16451e0957b98acec86409ab22e
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 22 13:56:09 2009 +0100
libwbclient: unimplement wbcRemoveUidMapping()
Michael
commit 093cdb1f5b3b2f6a4033563c531ce7ecb8f60635
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 22 13:54:03 2009 +0100
libwbclient: unimplement wbcSetGidMapping()
Michael
commit a4eb1be5473387ada47204f25535d085d6ce4293
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 22 13:51:53 2009 +0100
libwbclient: unimplement wbcSetUidMapping()
Michael
commit 1d1000f8b1a6e8428950679f206e0e1123b21a88
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 22 13:49:42 2009 +0100
s3:idmap: remove unused idmap_set_gid_hwm()
Michael
commit d7f2242426f41254efde1b2a7e0670e1c23be27b
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 22 13:49:06 2009 +0100
s3:idmap: remove unused idmap_set_uid_hwm()
Michael
commit 8e92356ec78ddb4c565a38c594a0b4fc30390abb
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 22 13:46:25 2009 +0100
s4: remove SET_HWM and SET_DUAL_HWM from wb_samba3_protocol
Michael
commit ef19c6c3e91e5db20fae718e32f08d72985d47b2
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 22 13:46:03 2009 +0100
s3:winbind: remove SET_HWM from winbind's API.
Michael
commit a0a260c5f538fb88c88731ff93f3dd1a4596bc24
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 22 13:39:33 2009 +0100
libwbclient: unimplement wbcSetGidHwm()
Michael
commit 490e139dc38ea99a25716a9a3decfe767b742c9a
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 22 13:37:11 2009 +0100
libwbclient: unimplement wbcSetUidHwm()
Michael
commit 1d8adca1b5c7fa2704f5c7f95d98bbe84aa497b4
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 22 13:33:54 2009 +0100
s3:net idmap: TEMPORARILY disable the "net idmap restore" functionality
The use of libwbclient has to be removed from net idmap restore,
since the idmap-rw-methods are removed from the winbindd API.
"net idmap restore" needs to be rewritten with plain tdb access,
more precisely with dbwrap access (also "net idmap dump" needs
rewrite), to allow for restoring mappings directly to a database,
potentially to a clustered database handled by ctdb.
commit 11e2ad9d3e27fab1131513e032e4affb9eaa5400
Author: Michael Adam <obnox at samba.org>
Date: Mon May 31 10:14:57 2010 +0200
s3: remove prototype of non-existsing function idmap_tdb_tdb_close().
commit aa5646ecb88c709a6704b1a0d315ede5d826ff0e
Author: Michael Adam <obnox at samba.org>
Date: Tue May 18 15:25:53 2010 +0200
s3:winbind:idmap_tdb2_set_mapping: untangle assignment from check
commit 6ba6d11f201ba2a81fa43470c3ca0febdb0f5727
Author: Michael Adam <obnox at samba.org>
Date: Mon May 17 10:45:04 2010 +0200
s3:winbind:idmap_tdb: don't check ranges when an invalid entry was found.
There is no point in checking the ranges this if the record found had an
invalid/unknown type: the mapping is not filled in. If it were initialized
to some defaults before, the check just might replace the status
NT_STATUS_INTERNAL_DB_ERROR with a NT_STATUS_NONE_MAPPED, which is not
as precise.
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages-3/net.8.xml | 2 +-
nsswitch/libwbclient/wbc_idmap.c | 186 +-----
nsswitch/winbind_struct_protocol.h | 6 -
source3/Makefile.in | 12 +-
source3/VERSION | 2 +-
source3/include/idmap.h | 24 +-
source3/include/proto.h | 12 +-
source3/param/loadparm.c | 11 +-
source3/smbd/process.c | 11 +
source3/utils/net_idmap.c | 256 +++++---
source3/utils/net_rpc_registry.c | 4 +-
source3/winbindd/idmap.c | 434 ++++---------
source3/winbindd/idmap_ad.c | 32 +-
source3/winbindd/idmap_adex/idmap_adex.c | 38 --
source3/winbindd/idmap_ldap.c | 790 ++++++++---------------
source3/winbindd/idmap_rid.c | 105 +---
source3/winbindd/idmap_rw.c | 79 +++
source3/winbindd/idmap_rw.h | 56 ++
source3/winbindd/idmap_tdb.c | 1010 +++++++++++-------------------
source3/winbindd/idmap_tdb2.c | 637 ++++++++-----------
source3/winbindd/idmap_util.c | 102 ++--
source3/winbindd/winbindd.c | 3 -
source3/winbindd/winbindd_idmap.c | 187 ------
source3/winbindd/winbindd_proto.h | 18 -
source3/winbindd/winbindd_sid.c | 116 ----
source4/winbind/wb_samba3_protocol.c | 6 -
26 files changed, 1446 insertions(+), 2693 deletions(-)
create mode 100644 source3/winbindd/idmap_rw.c
create mode 100644 source3/winbindd/idmap_rw.h
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages-3/net.8.xml b/docs-xml/manpages-3/net.8.xml
index de3ed4d..def4f65 100644
--- a/docs-xml/manpages-3/net.8.xml
+++ b/docs-xml/manpages-3/net.8.xml
@@ -1259,7 +1259,7 @@ Restore the mappings from the specified file or stdin.
</refsect2>
<refsect2>
-<title>IDMAP SECRET <DOMAIN>|ALLOC <secret></title>
+<title>IDMAP SECRET <DOMAIN> <secret></title>
<para>
Store a secret for the specified domain, used primarily for domains
diff --git a/nsswitch/libwbclient/wbc_idmap.c b/nsswitch/libwbclient/wbc_idmap.c
index 318e963..5b1fd36 100644
--- a/nsswitch/libwbclient/wbc_idmap.c
+++ b/nsswitch/libwbclient/wbc_idmap.c
@@ -269,200 +269,38 @@ wbcErr wbcAllocateGid(gid_t *pgid)
#define _ID_TYPE_UID 1
#define _ID_TYPE_GID 2
-/* Set an user id mapping */
+/* Set an user id mapping - not implemented any more */
wbcErr wbcSetUidMapping(uid_t uid, const struct wbcDomainSid *sid)
{
- struct winbindd_request request;
- struct winbindd_response response;
- wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
- char *sid_string = NULL;
-
- if (!sid) {
- return WBC_ERR_INVALID_PARAM;
- }
-
- /* Initialise request */
-
- ZERO_STRUCT(request);
- ZERO_STRUCT(response);
-
- /* Make request */
-
- request.data.dual_idmapset.id = uid;
- request.data.dual_idmapset.type = _ID_TYPE_UID;
-
- wbc_status = wbcSidToString(sid, &sid_string);
- BAIL_ON_WBC_ERROR(wbc_status);
-
- strncpy(request.data.dual_idmapset.sid, sid_string,
- sizeof(request.data.dual_idmapset.sid)-1);
- wbcFreeMemory(sid_string);
-
- wbc_status = wbcRequestResponsePriv(WINBINDD_SET_MAPPING,
- &request, &response);
- BAIL_ON_WBC_ERROR(wbc_status);
-
- done:
- return wbc_status;
+ return WBC_ERR_NOT_IMPLEMENTED;
}
-/* Set a group id mapping */
+/* Set a group id mapping - not implemented any more */
wbcErr wbcSetGidMapping(gid_t gid, const struct wbcDomainSid *sid)
{
- struct winbindd_request request;
- struct winbindd_response response;
- wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
- char *sid_string = NULL;
-
- if (!sid) {
- return WBC_ERR_INVALID_PARAM;
- }
-
- /* Initialise request */
-
- ZERO_STRUCT(request);
- ZERO_STRUCT(response);
-
- /* Make request */
-
- request.data.dual_idmapset.id = gid;
- request.data.dual_idmapset.type = _ID_TYPE_GID;
-
- wbc_status = wbcSidToString(sid, &sid_string);
- BAIL_ON_WBC_ERROR(wbc_status);
-
- strncpy(request.data.dual_idmapset.sid, sid_string,
- sizeof(request.data.dual_idmapset.sid)-1);
- wbcFreeMemory(sid_string);
-
- wbc_status = wbcRequestResponsePriv(WINBINDD_SET_MAPPING,
- &request, &response);
- BAIL_ON_WBC_ERROR(wbc_status);
-
- done:
- return wbc_status;
+ return WBC_ERR_NOT_IMPLEMENTED;
}
-/* Remove a user id mapping */
+/* Remove a user id mapping - not implemented any more */
wbcErr wbcRemoveUidMapping(uid_t uid, const struct wbcDomainSid *sid)
{
- struct winbindd_request request;
- struct winbindd_response response;
- wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
- char *sid_string = NULL;
-
- if (!sid) {
- return WBC_ERR_INVALID_PARAM;
- }
-
- /* Initialise request */
-
- ZERO_STRUCT(request);
- ZERO_STRUCT(response);
-
- /* Make request */
-
- request.data.dual_idmapset.id = uid;
- request.data.dual_idmapset.type = _ID_TYPE_UID;
-
- wbc_status = wbcSidToString(sid, &sid_string);
- BAIL_ON_WBC_ERROR(wbc_status);
-
- strncpy(request.data.dual_idmapset.sid, sid_string,
- sizeof(request.data.dual_idmapset.sid)-1);
- wbcFreeMemory(sid_string);
-
- wbc_status = wbcRequestResponsePriv(WINBINDD_REMOVE_MAPPING,
- &request, &response);
- BAIL_ON_WBC_ERROR(wbc_status);
-
- done:
- return wbc_status;
+ return WBC_ERR_NOT_IMPLEMENTED;
}
-/* Remove a group id mapping */
+/* Remove a group id mapping - not implemented any more */
wbcErr wbcRemoveGidMapping(gid_t gid, const struct wbcDomainSid *sid)
{
- struct winbindd_request request;
- struct winbindd_response response;
- wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
- char *sid_string = NULL;
-
- if (!sid) {
- return WBC_ERR_INVALID_PARAM;
- }
-
- /* Initialise request */
-
- ZERO_STRUCT(request);
- ZERO_STRUCT(response);
-
- /* Make request */
-
- request.data.dual_idmapset.id = gid;
- request.data.dual_idmapset.type = _ID_TYPE_GID;
-
- wbc_status = wbcSidToString(sid, &sid_string);
- BAIL_ON_WBC_ERROR(wbc_status);
-
- strncpy(request.data.dual_idmapset.sid, sid_string,
- sizeof(request.data.dual_idmapset.sid)-1);
- wbcFreeMemory(sid_string);
-
- wbc_status = wbcRequestResponsePriv(WINBINDD_REMOVE_MAPPING,
- &request, &response);
- BAIL_ON_WBC_ERROR(wbc_status);
-
- done:
- return wbc_status;
+ return WBC_ERR_NOT_IMPLEMENTED;
}
-/* Set the highwater mark for allocated uids. */
+/* Set the highwater mark for allocated uids - not implemented any more */
wbcErr wbcSetUidHwm(uid_t uid_hwm)
{
- struct winbindd_request request;
- struct winbindd_response response;
- wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
-
- /* Initialise request */
-
- ZERO_STRUCT(request);
- ZERO_STRUCT(response);
-
- /* Make request */
-
- request.data.dual_idmapset.id = uid_hwm;
- request.data.dual_idmapset.type = _ID_TYPE_UID;
-
- wbc_status = wbcRequestResponsePriv(WINBINDD_SET_HWM,
- &request, &response);
- BAIL_ON_WBC_ERROR(wbc_status);
-
- done:
- return wbc_status;
+ return WBC_ERR_NOT_IMPLEMENTED;
}
-/* Set the highwater mark for allocated gids. */
+/* Set the highwater mark for allocated gids - not implemented any more */
wbcErr wbcSetGidHwm(gid_t gid_hwm)
{
- struct winbindd_request request;
- struct winbindd_response response;
- wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
-
- /* Initialise request */
-
- ZERO_STRUCT(request);
- ZERO_STRUCT(response);
-
- /* Make request */
-
- request.data.dual_idmapset.id = gid_hwm;
- request.data.dual_idmapset.type = _ID_TYPE_GID;
-
- wbc_status = wbcRequestResponsePriv(WINBINDD_SET_HWM,
- &request, &response);
- BAIL_ON_WBC_ERROR(wbc_status);
-
- done:
- return wbc_status;
+ return WBC_ERR_NOT_IMPLEMENTED;
}
diff --git a/nsswitch/winbind_struct_protocol.h b/nsswitch/winbind_struct_protocol.h
index fb6d2dd..0fae4d4 100644
--- a/nsswitch/winbind_struct_protocol.h
+++ b/nsswitch/winbind_struct_protocol.h
@@ -106,9 +106,6 @@ enum winbindd_cmd {
WINBINDD_ALLOCATE_UID,
WINBINDD_ALLOCATE_GID,
- WINBINDD_SET_MAPPING,
- WINBINDD_REMOVE_MAPPING,
- WINBINDD_SET_HWM,
/* Miscellaneous other stuff */
@@ -157,9 +154,6 @@ enum winbindd_cmd {
WINBINDD_DUAL_SIDS2XIDS,
WINBINDD_DUAL_UID2SID,
WINBINDD_DUAL_GID2SID,
- WINBINDD_DUAL_SET_MAPPING,
- WINBINDD_DUAL_REMOVE_MAPPING,
- WINBINDD_DUAL_SET_HWM,
/* Wrapper around possibly blocking unix nss calls */
WINBINDD_DUAL_USERINFO,
diff --git a/source3/Makefile.in b/source3/Makefile.in
index e052667..4430f0e 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1063,7 +1063,9 @@ PAM_SMBPASS_OBJ = $(PAM_SMBPASS_OBJ_0) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(PASSDB_
$(SMBLDAP_OBJ) $(LIBSAMBA_OBJ) \
$(LDB_OBJ)
-IDMAP_OBJ = winbindd/idmap.o winbindd/idmap_util.o @IDMAP_STATIC@
+IDMAP_RW_OBJ = winbindd/idmap_rw.o
+
+IDMAP_OBJ = winbindd/idmap.o winbindd/idmap_util.o $(IDMAP_RW_OBJ) @IDMAP_STATIC@
NSS_INFO_OBJ = winbindd/nss_info.o @NSS_INFO_STATIC@
@@ -2481,13 +2483,13 @@ bin/adex. at SHLIBEXT@: $(BINARY_PREREQS) $(IDMAP_ADEX_OBJ)
@echo "Building plugin $@"
@$(SHLD_MODULE) $(IDMAP_ADEX_OBJ)
-bin/tdb2. at SHLIBEXT@: $(BINARY_PREREQS) winbindd/idmap_tdb2.o
+bin/tdb2. at SHLIBEXT@: $(BINARY_PREREQS) winbindd/idmap_tdb2.o $(IDMAP_RW_OBJ)
@echo "Building plugin $@"
- @$(SHLD_MODULE) winbindd/idmap_tdb2.o
+ @$(SHLD_MODULE) winbindd/idmap_tdb2.o $(IDMAP_RW_OBJ)
-bin/ldap. at SHLIBEXT@: $(BINARY_PREREQS) winbindd/idmap_ldap.o
+bin/ldap. at SHLIBEXT@: $(BINARY_PREREQS) winbindd/idmap_ldap.o $(IDMAP_RW_OBJ)
@echo "Building plugin $@"
- @$(SHLD_MODULE) winbindd/idmap_ldap.o
+ @$(SHLD_MODULE) winbindd/idmap_ldap.o $(IDMAP_RW_OBJ)
bin/weird. at SHLIBEXT@: $(BINARY_PREREQS) $(DEVEL_HELP_WEIRD_OBJ)
@echo "Building plugin $@"
diff --git a/source3/VERSION b/source3/VERSION
index fd9dff0..8807241 100644
--- a/source3/VERSION
+++ b/source3/VERSION
@@ -85,7 +85,7 @@ SAMBA_VERSION_IS_GIT_SNAPSHOT=
# #
########################################################
SAMBA_VERSION_VENDOR_SUFFIX="ctdb"
-SAMBA_VERSION_VENDOR_PATCH=5
+SAMBA_VERSION_VENDOR_PATCH=9
########################################################
# This can be set by vendors if they want.. #
diff --git a/source3/include/idmap.h b/source3/include/idmap.h
index 672e373..aab41cd 100644
--- a/source3/include/idmap.h
+++ b/source3/include/idmap.h
@@ -33,6 +33,9 @@
struct idmap_domain {
const char *name;
struct idmap_methods *methods;
+ uint32_t low_id;
+ uint32_t high_id;
+ bool read_only;
void *private_data;
};
@@ -50,28 +53,11 @@ struct idmap_methods {
and type and gets back a uid or gid. */
NTSTATUS (*sids_to_unixids)(struct idmap_domain *dom, struct id_map **ids);
- NTSTATUS (*set_mapping)(struct idmap_domain *dom, const struct id_map *map);
- NTSTATUS (*remove_mapping)(struct idmap_domain *dom, const struct id_map *map);
-
- /* Called to dump backends data */
- /* NOTE: caller must use talloc_free to free maps when done */
- NTSTATUS (*dump_data)(struct idmap_domain *dom, struct id_map **maps, int *num_maps);
+ /* Allocate a Unix-ID. */
+ NTSTATUS (*allocate_id)(struct idmap_domain *dom, struct unixid *id);
/* Called when backend is unloaded */
NTSTATUS (*close_fn)(struct idmap_domain *dom);
};
-struct idmap_alloc_methods {
-
- /* Called when backend is first loaded */
- NTSTATUS (*init)(const char *compat_params);
-
- NTSTATUS (*allocate_id)(struct unixid *id);
- NTSTATUS (*get_id_hwm)(struct unixid *id);
- NTSTATUS (*set_id_hwm)(struct unixid *id);
-
- /* Called when backend is unloaded */
- NTSTATUS (*close_fn)(void);
-};
-
#endif /* _IDMAP_H_ */
diff --git a/source3/include/proto.h b/source3/include/proto.h
index dab38a9..9726e83 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -3995,9 +3995,8 @@ bool lp_winbind_normalize_names(void);
bool lp_winbind_rpc_only(void);
bool lp_create_krb5_conf(void);
int lp_winbind_max_domain_connections(void);
-const char **lp_idmap_domains(void);
const char *lp_idmap_backend(void);
-char *lp_idmap_alloc_backend(void);
+bool lp_idmap_read_only(void);
int lp_idmap_cache_time(void);
int lp_idmap_negative_cache_time(void);
int lp_keepalive(void);
@@ -7201,22 +7200,16 @@ bool idmap_is_offline(void);
bool idmap_is_online(void);
NTSTATUS smb_register_idmap(int version, const char *name,
struct idmap_methods *methods);
-NTSTATUS smb_register_idmap_alloc(int version, const char *name,
- struct idmap_alloc_methods *methods);
void idmap_close(void);
NTSTATUS idmap_init_cache(void);
NTSTATUS idmap_allocate_uid(struct unixid *id);
NTSTATUS idmap_allocate_gid(struct unixid *id);
-NTSTATUS idmap_set_uid_hwm(struct unixid *id);
-NTSTATUS idmap_set_gid_hwm(struct unixid *id);
NTSTATUS idmap_backends_unixid_to_sid(const char *domname,
struct id_map *id);
NTSTATUS idmap_backends_sid_to_unixid(const char *domname,
struct id_map *id);
NTSTATUS idmap_new_mapping(const struct dom_sid *psid, enum id_type type,
struct unixid *pxid);
-NTSTATUS idmap_set_mapping(const struct id_map *map);
-NTSTATUS idmap_remove_mapping(const struct id_map *map);
/* The following definitions come from winbindd/idmap_cache.c */
@@ -7240,8 +7233,6 @@ NTSTATUS idmap_passdb_init(void);
/* The following definitions come from winbindd/idmap_tdb.c */
-bool idmap_tdb_tdb_close(TDB_CONTEXT *tdbctx);
-NTSTATUS idmap_alloc_tdb_init(void);
NTSTATUS idmap_tdb_init(void);
/* The following definitions come from winbindd/idmap_util.c */
@@ -7250,6 +7241,7 @@ NTSTATUS idmap_uid_to_sid(const char *domname, DOM_SID *sid, uid_t uid);
NTSTATUS idmap_gid_to_sid(const char *domname, DOM_SID *sid, gid_t gid);
NTSTATUS idmap_sid_to_uid(const char *dom_name, DOM_SID *sid, uid_t *uid);
NTSTATUS idmap_sid_to_gid(const char *domname, DOM_SID *sid, gid_t *gid);
+bool idmap_unix_id_is_in_range(uint32_t id, struct idmap_domain *dom);
/* The following definitions come from winbindd/nss_info.c */
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 5ee1058..b793f3d 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -203,7 +203,7 @@ struct global {
bool bCreateKrb5Conf;
int winbindMaxDomainConnections;
char *szIdmapBackend;
- char *szIdmapAllocBackend;
+ bool bIdmapReadOnly;
char *szAddShareCommand;
char *szChangeShareCommand;
char *szDeleteShareCommand;
@@ -4413,10 +4413,10 @@ static struct parm_struct parm_table[] = {
.flags = FLAG_ADVANCED,
},
{
- .label = "idmap alloc backend",
- .type = P_STRING,
+ .label = "idmap read only",
+ .type = P_BOOL,
.p_class = P_GLOBAL,
- .ptr = &Globals.szIdmapAllocBackend,
+ .ptr = &Globals.bIdmapReadOnly,
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
@@ -5135,6 +5135,7 @@ static void init_globals(bool first_time_only)
Globals.bAllowTrustedDomains = True;
string_set(&Globals.szIdmapBackend, "tdb");
+ Globals.bIdmapReadOnly = false;
string_set(&Globals.szTemplateShell, "/bin/false");
string_set(&Globals.szTemplateHomedir, "/home/%D/%U");
@@ -5432,7 +5433,7 @@ FN_GLOBAL_INTEGER(lp_winbind_max_domain_connections,
&Globals.winbindMaxDomainConnections)
FN_GLOBAL_CONST_STRING(lp_idmap_backend, &Globals.szIdmapBackend)
-FN_GLOBAL_STRING(lp_idmap_alloc_backend, &Globals.szIdmapAllocBackend)
+FN_GLOBAL_BOOL(lp_idmap_read_only, &Globals.bIdmapReadOnly)
FN_GLOBAL_INTEGER(lp_idmap_cache_time, &Globals.iIdmapCacheTime)
FN_GLOBAL_INTEGER(lp_idmap_negative_cache_time, &Globals.iIdmapNegativeCacheTime)
FN_GLOBAL_INTEGER(lp_keepalive, &Globals.iKeepalive)
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index e13d6fd..57d9149 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -879,6 +879,17 @@ static NTSTATUS smbd_server_connection_loop_once(struct smbd_server_connection *
errno = sav;
}
+ if ((conn->smb1.echo_handler.trusted_fd != -1)
+ && FD_ISSET(smbd_server_fd(), &r_fds)
+ && FD_ISSET(conn->smb1.echo_handler.trusted_fd, &r_fds)) {
+ /*
+ * Prefer to read pending requests from the echo handler. To
+ * quote Jeremy (da70f8ab1): This is a hack of monstrous
+ * proportions...
+ */
+ FD_CLR(smbd_server_fd(), &r_fds);
+ }
+
if (run_events(smbd_event_context(), selrtn, &r_fds, &w_fds)) {
return NT_STATUS_RETRY;
}
diff --git a/source3/utils/net_idmap.c b/source3/utils/net_idmap.c
index bd36392..1651907 100644
--- a/source3/utils/net_idmap.c
+++ b/source3/utils/net_idmap.c
@@ -30,25 +30,23 @@
/***********************************************************
Helper function for net_idmap_dump. Dump one entry.
**********************************************************/
-static int net_idmap_dump_one_entry(TDB_CONTEXT *tdb,
- TDB_DATA key,
- TDB_DATA data,
+static int net_idmap_dump_one_entry(struct db_record *rec,
void *unused)
{
- if (strcmp((char *)key.dptr, "USER HWM") == 0) {
- printf("USER HWM %d\n", IVAL(data.dptr,0));
+ if (strcmp((char *)rec->key.dptr, "USER HWM") == 0) {
+ printf("USER HWM %d\n", IVAL(rec->value.dptr,0));
return 0;
}
- if (strcmp((char *)key.dptr, "GROUP HWM") == 0) {
- printf("GROUP HWM %d\n", IVAL(data.dptr,0));
+ if (strcmp((char *)rec->key.dptr, "GROUP HWM") == 0) {
+ printf("GROUP HWM %d\n", IVAL(rec->value.dptr,0));
return 0;
}
- if (strncmp((char *)key.dptr, "S-", 2) != 0)
+ if (strncmp((char *)rec->key.dptr, "S-", 2) != 0)
return 0;
- printf("%s %s\n", data.dptr, key.dptr);
+ printf("%s %s\n", rec->value.dptr, rec->key.dptr);
--
SAMBA-CTDB repository
More information about the samba-cvs
mailing list