[SCM] Samba Shared Repository - branch v3-3-test updated -
release-3-2-0pre2-3705-g3102582
Michael Adam
obnox at samba.org
Wed Aug 13 09:55:20 GMT 2008
The branch, v3-3-test has been updated
via 3102582f0232359069577174b2faea37e5489014 (commit)
via 061a46a35d019e2cd4100a8d63ce9c25753e4c38 (commit)
via e70529e477125a04d4368885f80be3c828ce2205 (commit)
via ba17854342cfe8a0ad63b0f4800d16152291b50f (commit)
via 815613c65597bbcde9aa1a133b86fce6a9ec554b (commit)
via fe7847f3e539ed737d7b1cd5b874e2d3add78129 (commit)
via 7eb4ebd364bfcfcdebb0b1a68531e440f4221574 (commit)
via a687949d19ba9690f96e7869aa22e4d87840640e (commit)
via 4c2ec600731117316a6bec763e9cde2845e2356c (commit)
via 7f0e1732a06709131475d0174103467aa795ec19 (commit)
via 30a5f682b5fe6edcdb119af6dc736f4beb40bc26 (commit)
via 5d482fe9873a20d3fd97f54f1e1216c1f13f46a1 (commit)
via f2ab2cebb9b81453dc0b6370288b85909182ae49 (commit)
via a958c6bf1e0394e98df286974d78d3b07498e0b4 (commit)
via bbd49f9e1c4b50c4a596fb991f3306e1e90c0177 (commit)
via 6fe27d296c389473c24e8c627a61bd56b364ad9f (commit)
via 30b83245a22ebd5e4fa4739dd2aa1805373a7eb2 (commit)
via 9d3217bb28765e107c230fb90b578dcc6f5d4375 (commit)
via ec8f3d75a22e7d2d7617ed33836836cd73610095 (commit)
via 1d8024d261264a709b9df22fa35cdad03ab4af19 (commit)
via 4b04ec29c76df837a7909725bbbf4c79d5abdb4d (commit)
via 89556d28974dc2390dd88a8edd5e32912c45d27c (commit)
via 9442c78b7e91051803df61f2e36e06e248e7798e (commit)
via a2f70fc175b748ef160a998d0563c28381ea3466 (commit)
via 571ec7893c8b40959c005d510c039e3f231ffc67 (commit)
via a9f277da8b018af89ab7b9509460a158380e09d6 (commit)
via 22dbe158ed62ae47bbcb41bba3db345294f75437 (commit)
via ddf3022595fe8ca378c5f52107f42e296f852685 (commit)
via fe6a03e7b11cd859fddae5ba924ea5e071b8ccea (commit)
via 226b7d3bdf63970fc75ef08423ee984e3b7e94a5 (commit)
via 2481bfce4307274806584b0d8e295cc7f638e184 (commit)
via 9b1fa59d83890534264bec8f1190831eea37d9c3 (commit)
via a633390d3a7cb04a7c4e14cba9c533621793287e (commit)
via ba64a757f86fb60994e12e81416083ac0fa11c21 (commit)
via 30a697c82db53f9d801e220a7c6277f873ebce67 (commit)
via 76fbe56e827193d939676da23a580aa0f9394dd1 (commit)
via 32b8db27652a66a2ade547a6d27f34d0816f7296 (commit)
via 037516f1362c8d64da1d47a0cdaf83198d3eaeaf (commit)
via 21729256a550509c3c038efa5acdd6ac39027dce (commit)
via 2e85cbe88b3d1674b915f62e02be7d005fddaa39 (commit)
via f91a3e0f7b7737c1d0667cd961ea950e2b93e592 (commit)
via 126f4ac8e85458ee4693b89a184b99420f1b6bee (commit)
via 87e0688a261590d45d42f17e4cdce329ebe4cd8f (commit)
via cb4c74c9c206e5a445ca636fa6562ce721ea5839 (commit)
via d776d8df262e1753fb428450140df94e63035af5 (commit)
via 147573d7f6faab0ad90258b6a28c4b9575ccb6ea (commit)
via be8c6b4f2f40014313899b5cbc1da9d390d94fee (commit)
via ff413a4614c8b272a34b2a9e56a329a8e8749a34 (commit)
via eaf76c751f9bde2843174b400c109304831df83e (commit)
via 5258907818f8c1e338ab2c8fb4e8d83c6142a24e (commit)
via f4aab595a0219305fbedf8890e787b690660a55a (commit)
via 09a197e756459877cab7b4d09f534c6a41cfdd71 (commit)
via 2bcc9e6ecef876030e552a607d92597f60203db2 (commit)
via d004c9a7281d2577c3ba2012c8f790cc198ea700 (commit)
via c939c55e5182258092faceefa58a7f328f18619e (commit)
via b822bba9b9ae327bc6cee3f412f7e22ce28c1388 (commit)
via 7e73792c738447049b8662617da340a73fae9bf0 (commit)
via 09329f1f9114af44fc4e5e4f29a7315912313125 (commit)
via bd2158fb5f5d5c0c410fe2853f61776787e1461f (commit)
via e63a1a396c5cee837aed8a54b5c5ea3b2116d755 (commit)
via d795c2d5dc860fbfa668160054be084fe23aa44a (commit)
via 3323456e208742e160b9cabb79dc68bfbe8b1970 (commit)
via fc9b30bed2d774dca6660b497cb50f982b23b885 (commit)
via 7f3787a79a9949e7e80c9c5e16ec504ad1c4bdb7 (commit)
via f7706c6437d6500a477cb704cb916f16fdfa1395 (commit)
via 1fee80b8a643c22d356d0ca8860d5fc9580c8918 (commit)
via 7c3e4a324248d61504c4c77a63d4d31e587802af (commit)
via 19becb776148b7930a0abaec8038fee1158a66c4 (commit)
via 549db133df6782bcca7d033e8573e47716877cbd (commit)
via 5fd51833a31b326d83ac2f76d06560920547f657 (commit)
via e52e2f7f1a09fff8ec37174a9dc98dc9b440ef87 (commit)
via 3d24c5b4602140470c40f002d206212e388ae59b (commit)
via ace315c2ffc4e81c87ba1d30c28578719cb1692b (commit)
via ae2a353286a1a02936fb80edd6f899b1941403af (commit)
via f978df86f9af480de26a6cf67c4f8e60d1e27139 (commit)
via d18287b6284597878bc3683f16f001b949857e54 (commit)
via 0d64606da69edba20f545789e526a71d01ca40b0 (commit)
via c0ecb63d9e7b11bb5c31bdf95605d68c02206220 (commit)
via 58085063c46f3c55c8aebc83bb79a2dd19f73622 (commit)
via 1cd7201e5387ca11e9b735d37b806cb14d4a8dd3 (commit)
via b3e552d795caf6e4ab811368fda4a8a2f2d493a0 (commit)
via 2ccd9ef741c88772e4b7409506258e85b252c74f (commit)
via 98116075589abb7e0c9dc391f6d1bf3452025a1d (commit)
via 758f1de7750471815a284e9fad927112b59dc085 (commit)
via 7ebc1ea13fd975126bfc43af48a4384fc9c620e2 (commit)
via 185e24249d3dea1755558a154aa819db3bb1a605 (commit)
via 285d55d2a273f18ec9b84011c74a8099cba193c2 (commit)
via 2856d2e4a43fbcc6c8f8ac7b1613828170362861 (commit)
via 87c9f7717fc8171644c244fe697cace2968b8f8a (commit)
from 9920473cc165e75ee9aa5cbb9e568eb5fb67e9e6 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit 3102582f0232359069577174b2faea37e5489014
Author: Michael Adam <obnox at samba.org>
Date: Tue Aug 12 23:46:50 2008 +0200
packaging(RHEL-CTDB): check for success of x86_64 build before building i386
Michael
commit 061a46a35d019e2cd4100a8d63ce9c25753e4c38
Author: Michael Adam <obnox at samba.org>
Date: Tue Aug 12 23:17:18 2008 +0200
packaging(RHEL-CTDB): fix installation of libsmbsharemodes for the 3.3.0 build.
Michael
commit e70529e477125a04d4368885f80be3c828ce2205
Author: Michael Adam <obnox at samba.org>
Date: Tue Aug 12 23:14:42 2008 +0200
packaging(RHEL-CTDB): fix installation of libsmclient for 3.3.0 build.
Michael
commit ba17854342cfe8a0ad63b0f4800d16152291b50f
Author: Michael Adam <obnox at samba.org>
Date: Tue Aug 12 21:48:00 2008 +0200
packaging(RHEL-CTDB): install the right libraries for 3.3.0.
The library creation and installation has been fixed in that
now the libfoo.so.VERSION is created and libfoo.so is correclty
installed as a link.
Since we do not have a separation of lib dir and modules dir,
we do still install to /usr/lib/samba/, though. Therefore we
still need the workaround in the spec file to install the
libs to /usr/lib/ manually.
Michael
commit 815613c65597bbcde9aa1a133b86fce6a9ec554b
Author: Michael Adam <obnox at samba.org>
Date: Tue Aug 12 21:46:19 2008 +0200
packaging(RHEL-CTDB): don't call make proto for the 3.3.0 build.
Michael
commit fe7847f3e539ed737d7b1cd5b874e2d3add78129
Author: Michael Adam <obnox at samba.org>
Date: Tue Aug 12 21:28:10 2008 +0200
packaging(RHEL-CTDB): move to version 3.3.0 for the rpm build.
Michael
commit 7eb4ebd364bfcfcdebb0b1a68531e440f4221574
Author: Michael Adam <obnox at samba.org>
Date: Mon Aug 11 22:56:55 2008 +0200
packaging(RHEL-CTDB): Bump release number to ctdb.47 for the next RPM.
Michael
commit a687949d19ba9690f96e7869aa22e4d87840640e
Author: Michael Adam <obnox at samba.org>
Date: Mon Aug 11 16:30:36 2008 +0200
smbd: prevent smbd from panicing with "clustering = no" but --with-cluster-support
Michael
commit 4c2ec600731117316a6bec763e9cde2845e2356c
Author: Andrew Tridgell <tridge at samba.org>
Date: Sun Aug 10 10:46:09 2008 +1000
up release to 46
commit 7f0e1732a06709131475d0174103467aa795ec19
Author: Andrew Tridgell <tridge at samba.org>
Date: Sat Aug 9 13:27:36 2008 +1000
up to release 45 now
commit 30a5f682b5fe6edcdb119af6dc736f4beb40bc26
Author: Andrew Tridgell <tridge at samba.org>
Date: Sat Aug 9 13:26:49 2008 +1000
disable the DNS update code, as it breaks clustering
commit 5d482fe9873a20d3fd97f54f1e1216c1f13f46a1
Author: Andrew Tridgell <tridge at samba.org>
Date: Fri Aug 8 22:47:23 2008 +1000
up to release 44
commit f2ab2cebb9b81453dc0b6370288b85909182ae49
Author: Andrew Tridgell <tridge at samba.org>
Date: Fri Aug 8 22:47:04 2008 +1000
added a explanatory comment on tcon check
commit a958c6bf1e0394e98df286974d78d3b07498e0b4
Author: Michael Adam <obnox at samba.org>
Date: Tue Aug 12 12:16:19 2008 +0200
smbd/conn: fix prototype change of conn_close_all() in proto.h.
(Cleaning "ensure we exit with non-zero status on EOF on socket"
after rebasing to v3-3-test which has no "make proto" anymore.)
Michael
commit bbd49f9e1c4b50c4a596fb991f3306e1e90c0177
Author: Andrew Tridgell <tridge at samba.org>
Date: Fri Aug 8 22:34:59 2008 +1000
ensure we exit with non-zero status on EOF on socket, so the parent
can trigger a brlock db cleanup
commit 6fe27d296c389473c24e8c627a61bd56b364ad9f
Author: Andrew Tridgell <tridge at samba.org>
Date: Fri Aug 8 21:11:56 2008 +1000
fixed child exit handling and IP release handling
commit 30b83245a22ebd5e4fa4739dd2aa1805373a7eb2
Author: Andrew Tridgell <tridge at samba.org>
Date: Fri Aug 8 21:00:42 2008 +1000
log unclean shutdowns
commit 9d3217bb28765e107c230fb90b578dcc6f5d4375
Author: Andrew Tridgell <tridge at samba.org>
Date: Fri Aug 8 20:31:03 2008 +1000
register the ctdbd reconfigure message
commit ec8f3d75a22e7d2d7617ed33836836cd73610095
Author: Andrew Tridgell <tridge at samba.org>
Date: Fri Aug 8 19:57:57 2008 +1000
update configure.rpm
commit 1d8024d261264a709b9df22fa35cdad03ab4af19
Author: Andrew Tridgell <tridge at samba.org>
Date: Fri Aug 8 16:44:52 2008 +1000
increase version to 43
commit 4b04ec29c76df837a7909725bbbf4c79d5abdb4d
Author: Andrew Tridgell <tridge at samba.org>
Date: Fri Aug 8 16:44:24 2008 +1000
allow nested ctdb transactions in the same manner that they are
allowed for tdb. This is needed for the registry db backend.
commit 89556d28974dc2390dd88a8edd5e32912c45d27c
Author: Andrew Tridgell <tridge at samba.org>
Date: Fri Aug 8 13:45:12 2008 +1000
update to ctdb.42 release
Michael, if you do a new release, make it 43 or later please
commit 9442c78b7e91051803df61f2e36e06e248e7798e
Author: Andrew Tridgell <tridge at samba.org>
Date: Fri Aug 8 13:14:09 2008 +1000
update to transactions4 release
commit a2f70fc175b748ef160a998d0563c28381ea3466
Author: Andrew Tridgell <tridge at samba.org>
Date: Fri Aug 8 13:13:42 2008 +1000
drop retries to 5
commit 571ec7893c8b40959c005d510c039e3f231ffc67
Author: Andrew Tridgell <tridge at samba.org>
Date: Fri Aug 8 13:12:16 2008 +1000
use CTDB_CONTROL_TRANS2_COMMIT_RETRY to prevent the counter getting
out of sync
commit a9f277da8b018af89ab7b9509460a158380e09d6
Author: Andrew Tridgell <tridge at samba.org>
Date: Fri Aug 8 11:47:23 2008 +1000
up release to transactions3
commit 22dbe158ed62ae47bbcb41bba3db345294f75437
Author: Andrew Tridgell <tridge at samba.org>
Date: Fri Aug 8 11:42:06 2008 +1000
fixed lots of places that paniced on a failed transaction_commit,
thinking it was a failure of a transaction cancel
commit ddf3022595fe8ca378c5f52107f42e296f852685
Author: Andrew Tridgell <tridge at samba.org>
Date: Fri Aug 8 11:41:21 2008 +1000
don't leave a dangling transaction on retry error
commit fe6a03e7b11cd859fddae5ba924ea5e071b8ccea
Author: Andrew Tridgell <tridge at samba.org>
Date: Fri Aug 8 10:55:11 2008 +1000
cope with the control failing completely without returning a status
commit 226b7d3bdf63970fc75ef08423ee984e3b7e94a5
Author: Andrew Tridgell <tridge at samba.org>
Date: Fri Aug 8 10:01:13 2008 +1000
up release number
commit 2481bfce4307274806584b0d8e295cc7f638e184
Author: Andrew Tridgell <tridge at samba.org>
Date: Fri Aug 8 09:58:15 2008 +1000
handle two special cases
1) when all nodes write the same value to the record, or when writing
a value that is already there, we can skip the write and save
ourselves a network transactions
2) when all remote nodes fail an update, and we then fail a replay, we
don't need to trigger a recovery. This solves a corner case where
we could get into a recovery loop
commit 9b1fa59d83890534264bec8f1190831eea37d9c3
Author: Andrew Tridgell <tridge at samba.org>
Date: Thu Aug 7 22:02:59 2008 +0200
mark this release as a transactions test release
commit a633390d3a7cb04a7c4e14cba9c533621793287e
Author: Andrew Tridgell <tridge at samba.org>
Date: Thu Aug 7 23:26:22 2008 +1000
put a limit on the number of retries. I found a case where a recovery
could lead to it blocking forever
commit ba64a757f86fb60994e12e81416083ac0fa11c21
Author: Andrew Tridgell <tridge at samba.org>
Date: Thu Aug 7 21:33:00 2008 +1000
we need to commit, not cancel, on record destruction
commit 30a697c82db53f9d801e220a7c6277f873ebce67
Author: Andrew Tridgell <tridge at samba.org>
Date: Thu Aug 7 19:21:49 2008 +1000
removed more unused code
commit 76fbe56e827193d939676da23a580aa0f9394dd1
Author: Andrew Tridgell <tridge at samba.org>
Date: Thu Aug 7 19:14:16 2008 +1000
all persistent databases now do all stores via automatic transactions
commit 32b8db27652a66a2ade547a6d27f34d0816f7296
Author: Andrew Tridgell <tridge at samba.org>
Date: Thu Aug 7 18:35:19 2008 +1000
use transactions in idmap_tdb2
commit 037516f1362c8d64da1d47a0cdaf83198d3eaeaf
Author: Andrew Tridgell <tridge at samba.org>
Date: Thu Aug 7 18:34:54 2008 +1000
fixed fetch of empty records
commit 21729256a550509c3c038efa5acdd6ac39027dce
Author: Andrew Tridgell <tridge at samba.org>
Date: Thu Aug 7 18:33:37 2008 +1000
samba3 can't handle NOREPLY yet
commit 2e85cbe88b3d1674b915f62e02be7d005fddaa39
Author: Andrew Tridgell <tridge at samba.org>
Date: Thu Aug 7 16:56:47 2008 +1000
cleanup debugging and fix handling of empty transaction
commit f91a3e0f7b7737c1d0667cd961ea950e2b93e592
Author: Andrew Tridgell <tridge at samba.org>
Date: Thu Aug 7 16:20:05 2008 +1000
first cut at adding full transactions for ctdb to samba3
commit 126f4ac8e85458ee4693b89a184b99420f1b6bee
Author: Andrew Tridgell <tridge at samba.org>
Date: Thu Aug 7 11:59:39 2008 +1000
got rid of the redundent cache database
commit 87e0688a261590d45d42f17e4cdce329ebe4cd8f
Author: Michael Adam <obnox at samba.org>
Date: Thu Aug 7 02:46:13 2008 +0200
packaging(RHEL-CTDB): we are now based on 3.2.1
Michael
commit cb4c74c9c206e5a445ca636fa6562ce721ea5839
Author: Michael Adam <obnox at samba.org>
Date: Thu Aug 7 02:03:22 2008 +0200
idmap tdb2: fix inconsistent mappings by checking for race and retrying to fetch mapping.
Michael
commit d776d8df262e1753fb428450140df94e63035af5
Author: Michael Adam <obnox at samba.org>
Date: Thu Aug 7 00:12:57 2008 +0200
dbwrap ctdb: fix a DEBUG message.
Michael
commit 147573d7f6faab0ad90258b6a28c4b9575ccb6ea
Author: Michael Adam <obnox at samba.org>
Date: Wed Aug 6 22:43:27 2008 +0200
idmap tdb2: fix broken logic in tdb2_delete_bystring().
1. use the return value that idmap_tdb2_open_perm_db() gives us
2. don't delete frep the local db if deleting from the perm db failed.
3. fix wrong interpretation of return value of the local delete
Michael
commit be8c6b4f2f40014313899b5cbc1da9d390d94fee
Author: Michael Adam <obnox at samba.org>
Date: Wed Aug 6 22:33:58 2008 +0200
idmap tdb2: fix broken logic in tdb2_store_bystring().
1. use the return value that idmap_tdb2_open_perm_db() gives us
2. don't write to the local db if writing to the perm db failed.
3. fix wrong interpretation of return value of the local store
Michael
commit ff413a4614c8b272a34b2a9e56a329a8e8749a34
Author: Michael Adam <obnox at samba.org>
Date: Wed Aug 6 22:30:27 2008 +0200
dbwrap ctdb: don't retry when tdb_store failed in db_ctdb_persistent_store().
Only retry when ctdbd_persisten_update() failed.
Michael
commit eaf76c751f9bde2843174b400c109304831df83e
Author: Michael Adam <obnox at samba.org>
Date: Wed Aug 6 22:22:23 2008 +0200
dbwrap ctdb: add a partial mapping from tdb_error to NTSTATUS and use it for store.
Michael
commit 5258907818f8c1e338ab2c8fb4e8d83c6142a24e
Author: Michael Adam <obnox at samba.org>
Date: Wed Aug 6 02:19:53 2008 +0200
packaging(RHEL-CTDB): Bump release number to ctdb.41 for the next RPM.
Michael
commit f4aab595a0219305fbedf8890e787b690660a55a
Author: Michael Adam <obnox at samba.org>
Date: Tue Aug 5 18:47:40 2008 +0200
dbwrap ctdb: add db_ctdb_delete_persistent() and use it for persistent DBs
as delete_rec operation from fetch_locked()
Michael
commit 09a197e756459877cab7b4d09f534c6a41cfdd71
Author: Michael Adam <obnox at samba.org>
Date: Tue Aug 5 18:46:02 2008 +0200
dbwrap ctdb: call db_ctdb_store() in db_ctdb_delete().
to reduce code duplication.
Michael
commit 2bcc9e6ecef876030e552a607d92597f60203db2
Author: Michael Adam <obnox at samba.org>
Date: Tue Aug 5 11:32:20 2008 +0200
dbwrap ctdb: add a retry loop to the persistent store operation.
This is because ctdbd can fail in performing the persistent_store
due to race conditions, and this does not mean it can't succeed
the next time.
To not loop infinitely, this makes use of a new parametric option:
"dbwrap ctdb:max store retries" (integer) which defaults to 5
and sets the upper limit for the number or repeats of the
fetch/store cycle.
Michael
commit d004c9a7281d2577c3ba2012c8f790cc198ea700
Author: Michael Adam <obnox at samba.org>
Date: Tue Aug 5 18:42:07 2008 +0200
dbwrap ctdb: release the lock before calling ctdbd_persistent_store()
in the persistent db_ctdb_store operation.
This is to prevent deadlocks in db_ctdb_persistent_store().
There is a tradeoff: Usually, the record is still locked
after db->store operation. This lock is usually released
via the talloc destructor with the TALLOC_FREE to
the record. So we have two choices:
- Either re-lock the record after the call to persistent_store
or cancel_persistent update and this way not changing any
assumptions callers may have about the state, but possibly
introducing new race conditions.
- Or don't lock the record again but just remove the
talloc_destructor. This is less racy but assumes that
the lock is always released via TALLOC_FREE of the record.
I choose the first variant for now since it seems less racy.
We can't guarantee that we succeed in getting the lock
anyways. The only real danger here is that a caller
performs multiple store operations after a fetch_locked()
which is currently not the case.
Michael
commit c939c55e5182258092faceefa58a7f328f18619e
Author: Michael Adam <obnox at samba.org>
Date: Mon Aug 4 17:07:20 2008 +0200
dbwrap ctdb: remove erroneously duplicated comment.
Michael
commit b822bba9b9ae327bc6cee3f412f7e22ce28c1388
Author: Michael Adam <obnox at samba.org>
Date: Wed Jul 30 15:46:44 2008 +0200
packaging(RHEL-CTDB): Bump release number to ctdb.40 for the next RPM.
Michael
commit 7e73792c738447049b8662617da340a73fae9bf0
Author: Michael Adam <obnox at samba.org>
Date: Wed Jul 23 02:01:51 2008 +0200
packaging(RHEL-CTDB): Bump release number to ctdb.39 for the next RPM.
Michael
commit 09329f1f9114af44fc4e5e4f29a7315912313125
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date: Fri Jul 18 18:50:16 2008 +1000
Use transaction start/cancel for persistent writes to avoid leaving the database in an inconsistent state if we crash during the operation
Signed-off-by: Ronnie Sahlberg <ronniesahlberg at gmail.com>
commit bd2158fb5f5d5c0c410fe2853f61776787e1461f
Author: Michael Adam <obnox at samba.org>
Date: Fri Jul 18 11:20:38 2008 +0200
packaging(RHEL-CTDB): bump Release number to ctdb.37 for next rpm.
Michael
commit e63a1a396c5cee837aed8a54b5c5ea3b2116d755
Author: Michael Adam <obnox at samba.org>
Date: Thu Jul 10 23:28:07 2008 +0200
packaging(RHEL-CTDB): Bump release number to ctdb.37 for the next RPM.
Michael
commit d795c2d5dc860fbfa668160054be084fe23aa44a
Author: Michael Adam <obnox at samba.org>
Date: Fri Jul 4 15:22:16 2008 +0200
packaging(RHEL-CTDB): bump Release number to ctdb.36 for next rpm.
Michael
commit 3323456e208742e160b9cabb79dc68bfbe8b1970
Author: Michael Adam <obnox at samba.org>
Date: Fri Jun 27 16:54:57 2008 +0200
packaging(RHEL-CTDB): Bump release number to ctdb.35 for the next RPM.
Michael
commit fc9b30bed2d774dca6660b497cb50f982b23b885
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 28 11:44:26 2008 +0200
Add a gpfs_prefetch module
This can not go upstream yet because it uses the non-GPL libgpfs. So it will
not be compiled by default and will not be included in the SOFS RPMs. But upon
Sven's request, we include it in the git tree and the source RPMs, so that it
can be built for in-house tests.
commit 7f3787a79a9949e7e80c9c5e16ec504ad1c4bdb7
Author: Michael Adam <obnox at samba.org>
Date: Wed Jun 18 18:45:01 2008 +0200
packaging(RHEL-CTDB): bump Release number to ctdb.34 for the next RPM.
Michael
commit f7706c6437d6500a477cb704cb916f16fdfa1395
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 17 12:44:07 2008 +0200
packaging(RHEL-CTDB): update the build instructions in the README.
Michael
commit 1fee80b8a643c22d356d0ca8860d5fc9580c8918
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 17 11:36:21 2008 +0200
packaging(RHEL-CTDB): bump Release to ctdb.33 for the next build
Michael
commit 7c3e4a324248d61504c4c77a63d4d31e587802af
Author: Michael Adam <obnox at samba.org>
Date: Wed May 28 13:25:31 2008 +0200
packaging(RHEL-CTDB): remove the libnss_wins modules to reduce deps.
Michael
commit 19becb776148b7930a0abaec8038fee1158a66c4
Author: Volker Lendecke <vl at samba.org>
Date: Fri Jun 13 14:24:05 2008 +0200
bump version number to 32
commit 549db133df6782bcca7d033e8573e47716877cbd
Author: Volker Lendecke <vl at samba.org>
Date: Fri Jun 13 12:01:31 2008 +0200
Correctly return NULL from messaging_ctdbd_connection if messaging_init failed
commit 5fd51833a31b326d83ac2f76d06560920547f657
Author: Volker Lendecke <vl at samba.org>
Date: Fri Jun 13 12:00:24 2008 +0200
Exit smbstatus cleanly if messaging_init fails
commit e52e2f7f1a09fff8ec37174a9dc98dc9b440ef87
Author: Volker Lendecke <vl at samba.org>
Date: Fri Jun 6 19:45:26 2008 +0200
Package 32-bit versions of libtalloc into the winbind rpm
commit 3d24c5b4602140470c40f002d206212e388ae59b
Author: Volker Lendecke <vl at samba.org>
Date: Fri Jun 6 13:50:06 2008 +0200
Fix README: DOCS_DIR is replaced by DOCS_TARBALL
commit ace315c2ffc4e81c87ba1d30c28578719cb1692b
Author: Volker Lendecke <vl at samba.org>
Date: Fri Jun 6 13:49:00 2008 +0200
Bump up version number
commit ae2a353286a1a02936fb80edd6f899b1941403af
Author: Michael Adam <obnox at samba.org>
Date: Fri May 23 18:13:53 2008 +0200
packaging(RHEL-CTDB): use /usr/%{_libarch} instead of %{_libdir}
To fix creation of 32bit packges on x86_64
Michael
commit f978df86f9af480de26a6cf67c4f8e60d1e27139
Author: Michael Adam <obnox at samba.org>
Date: Fri May 23 18:06:53 2008 +0200
packaging(RHEL-CTDB): remove duplicate block from spec file.
Michael
commit d18287b6284597878bc3683f16f001b949857e54
Author: Michael Adam <obnox at samba.org>
Date: Fri May 23 15:12:01 2008 +0200
packaging(RHEL-CTDB): fix placement and link direction of new shared libs
libwbclient, libtalloc, libtdb, and libnetapi are now installed
into /usr/lib{,64} by their SONAME. The symlink is made from
the .so files to point to the SONAME files (e.g., libtdb.so.1).
Michael
commit 0d64606da69edba20f545789e526a71d01ca40b0
Author: Michael Adam <obnox at samba.org>
Date: Fri May 23 14:03:11 2008 +0200
packaging(RHEL-CTDB): bump rpm release to the next version ctdb.29
Michael
commit c0ecb63d9e7b11bb5c31bdf95605d68c02206220
Author: Michael Adam <obnox at samba.org>
Date: Fri May 23 13:44:13 2008 +0200
packaging(RHEL-CTDB): add "service winbind condrestart" to "%post common"
Michael
commit 58085063c46f3c55c8aebc83bb79a2dd19f73622
Author: Michael Adam <obnox at samba.org>
Date: Fri May 23 12:52:21 2008 +0200
packaging(RHEL-CTDB): use "/sbin/service smb" instead of "%{initdir}/smb"
Michael
commit 1cd7201e5387ca11e9b735d37b806cb14d4a8dd3
Author: Michael Adam <obnox at samba.org>
Date: Fri May 23 12:51:32 2008 +0200
packaging(RHEL-CTDB): ignore errors from init scripts in pre/post scripts.
Michael
commit b3e552d795caf6e4ab811368fda4a8a2f2d493a0
Author: Michael Adam <obnox at samba.org>
Date: Fri May 23 12:50:14 2008 +0200
packaging(RHEL-CTDB): in %preun, first stop the service then deactivate
Michael
commit 2ccd9ef741c88772e4b7409506258e85b252c74f
Author: Michael Adam <obnox at samba.org>
Date: Fri May 23 12:48:55 2008 +0200
packaging(RHEL-CTDB): use condrestart instead of restart in %post script
Michael
commit 98116075589abb7e0c9dc391f6d1bf3452025a1d
Author: Michael Adam <obnox at samba.org>
Date: Fri May 23 12:47:42 2008 +0200
packaging(RHEL-CTDB): move service smb restart from %postun to %post
What would be the use of restarting a service that has just
been uninstalled...
Michael
commit 758f1de7750471815a284e9fad927112b59dc085
Author: Michael Adam <obnox at samba.org>
Date: Fri May 23 12:26:28 2008 +0200
packaging(RHEL-CTDB): move "chkconfig --del winbind" to "%preun common"
remains of winbind are being removed from the main package.
also stop the winbind service in the "%preun common" script.
Michael
commit 7ebc1ea13fd975126bfc43af48a4384fc9c620e2
Author: Michael Adam <obnox at samba.org>
Date: Fri May 23 11:58:01 2008 +0200
packaging(RHEL-CTDB): remove winbind init script and its linke from main pkg
Winbind along with its libraries and init script is packaged in the
samba-common rpm.
Michael
commit 185e24249d3dea1755558a154aa819db3bb1a605
Author: Michael Adam <obnox at samba.org>
Date: Wed May 21 11:41:51 2008 +0200
packaging: bump the rhel-ctdb rpm releas number to ctbd.28
Michael
commit 285d55d2a273f18ec9b84011c74a8099cba193c2
Author: Volker Lendecke <vl at samba.org>
Date: Mon May 19 16:08:04 2008 +0200
Do not call testparm in /etc/init.d/smb
For SOFS, we do know that we have netbios disabled, and testparm in the ctdb
shutdown event locks up due to a locked registry.tdb
commit 2856d2e4a43fbcc6c8f8ac7b1613828170362861
Author: Andrew Tridgell <tridge at samba.org>
Date: Mon Apr 21 18:40:45 2008 +0200
keep compatibility with v3-0-ctdb name for fileid:mapping option
commit 87c9f7717fc8171644c244fe697cace2968b8f8a
Author: Andrew Tridgell <tridge at samba.org>
Date: Mon Apr 21 18:39:56 2008 +0200
update configure.rpm for clustered Samba usage
-----------------------------------------------------------------------
Summary of changes:
packaging/RHEL-CTDB/README | 24 +-
packaging/RHEL-CTDB/configure.rpm | 46 +-
packaging/RHEL-CTDB/makerpms.sh | 6 +-
packaging/RHEL-CTDB/samba.spec | 151 +++--
packaging/RHEL-CTDB/setup/smb.init | 9 +-
source/Makefile.in | 7 +-
source/configure.in | 3 +-
source/groupdb/mapping_tdb.c | 6 +-
source/include/ctdbd_conn.h | 7 +
source/include/dbwrap.h | 6 -
source/include/proto.h | 2 +-
source/lib/account_pol.c | 7 +-
source/lib/ctdbd_conn.c | 76 +--
source/lib/dbwrap.c | 76 +---
source/lib/dbwrap_ctdb.c | 810 +++++++++++++++++++++--
source/lib/dbwrap_tdb2.c | 1265 ------------------------------------
source/lib/dbwrap_util.c | 6 +-
source/lib/messages_ctdbd.c | 3 +-
source/lib/sharesec.c | 4 +-
source/modules/vfs_fileid.c | 2 +-
source/modules/vfs_gpfs_prefetch.c | 308 +++++++++
source/nmbd/nmbd.c | 4 -
source/passdb/pdb_tdb.c | 11 +-
source/passdb/secrets.c | 4 +-
source/registry/reg_backend_db.c | 6 +-
source/smbd/conn.c | 7 +-
source/smbd/server.c | 31 +-
source/utils/status.c | 6 +-
source/winbindd/idmap.c | 9 +
source/winbindd/idmap_tdb2.c | 270 +++------
source/winbindd/winbindd.c | 4 -
31 files changed, 1398 insertions(+), 1778 deletions(-)
mode change 100644 => 100755 packaging/RHEL-CTDB/configure.rpm
delete mode 100644 source/lib/dbwrap_tdb2.c
create mode 100644 source/modules/vfs_gpfs_prefetch.c
Changeset truncated at 500 lines:
diff --git a/packaging/RHEL-CTDB/README b/packaging/RHEL-CTDB/README
index 1316820..f7ce381 100644
--- a/packaging/RHEL-CTDB/README
+++ b/packaging/RHEL-CTDB/README
@@ -1,3 +1,21 @@
-In order to keep the docs out of the bzr tree, first get a release
-tarball of samba, then invoke makerpms.sh with the DOCS_DIR variable
-pointing to the docs dir of that samba tarball.
+The rpms should be built not directly from the spec file (although
+it is possible) but more conveniently using the makerpms.sh script:
+It takes care of making a source tarball and building the rpms for
+x86_64 and i386, the latter also producing the winbind-32bit
+compatibility packages for x86_64.
+
+The makerpms.sh script must be invoked from out of a git checkout
+(since git archive is used to produce the tarball for rpmbuild).
+
+To eliminate the need of building the docs from the sources
+(which is time consuming and has vast build dependencies),
+you need a samba release docs tarball called docs.tar.bz2 and point
+the DOCS_TARBALL environment variable to it before calling makerpms.sh.
+Alternatively, if the DOCS_TARBALL variable is not set, but if a
+docs.tar.bz2 exists inside the rpm SOURCES directory
+(/usr/src/redhat/SORUCES/ by default), that will be used.
+
+To produce an appropriate docs tarball, you can for instance pack the
+docs dir from a samba release tarball using the command
+"tar cjf docs.tar.bz2 docs".
+Note: The docs tarball needs the docs/ prefix.
diff --git a/packaging/RHEL-CTDB/configure.rpm b/packaging/RHEL-CTDB/configure.rpm
old mode 100644
new mode 100755
index e1a58dd..7596040
--- a/packaging/RHEL-CTDB/configure.rpm
+++ b/packaging/RHEL-CTDB/configure.rpm
@@ -1,34 +1,42 @@
+case `uname -m` in
+ x86_64)
+ libdir=/usr/lib64/samba
+ ;;
+ *)
+ libdir=/usr/lib/samba
+ ;;
+esac
+
CFLAGS="-Wall -g -D_GNU_SOURCE" ./configure \
- --prefix=/usr \
- --localstatedir=/var \
- --with-configdir=/etc/samba \
- --with-libdir=/usr/lib/samba \
- --with-lockdir=/var/lib/samba \
- --with-logfilebase=/var/log/samba \
- --with-mandir=/usr/man \
- --with-piddir=/var/run \
- --with-privatedir=/etc/samba \
- --with-sambabook=/usr/share/swat/using_samba \
- --with-swatdir=/usr/share/swat \
- --enable-cups \
- --with-acl-support \
+ --prefix=/usr \
+ --localstatedir=/var \
+ --with-configdir=/etc/samba \
+ --with-libdir=$libdir \
+ --with-lockdir=/var/lib/samba \
+ --with-logfilebase=/var/log/samba \
+ --with-mandir=/usr/man \
+ --with-piddir=/var/run \
+ --with-privatedir=/etc/samba \
+ --with-sambabook=/usr/share/swat/using_samba \
+ --with-swatdir=/usr/share/swat \
+ --disable-cups \
+ --with-acl-support \
--with-ads \
- --with-automount \
- --with-fhs \
+ --with-automount \
+ --with-fhs \
--with-pam_smbpass \
--with-libsmbclient \
--with-libsmbsharemodes \
- --without-smbwrapper \
+ --without-smbwrapper \
--with-pam \
--with-quotas \
- --with-shared-modules=idmap_rid,idmap_ad \
- --with-smbmount \
+ --with-shared-modules=idmap_rid,idmap_ad,idmap_tdb2 \
--with-syslog \
--with-utmp \
--with-cluster-support \
--with-ctdb=/usr/include \
--without-ldb \
- --with-dnsupdate \
+ --without-dnsupdate \
--with-aio-support \
$*
diff --git a/packaging/RHEL-CTDB/makerpms.sh b/packaging/RHEL-CTDB/makerpms.sh
index a9d49bc..8a0345b 100755
--- a/packaging/RHEL-CTDB/makerpms.sh
+++ b/packaging/RHEL-CTDB/makerpms.sh
@@ -21,7 +21,7 @@ SRCDIR=`rpm --eval %_sourcedir`
# At this point the SPECDIR and SRCDIR variables must have a value!
-VERSION='3.2.0'
+VERSION='3.3.0'
REVISION='ctdb'
SPECFILE="samba.spec"
DOCS="docs.tar.bz2"
@@ -77,13 +77,13 @@ popd
echo "$(basename $0): Getting Ready to build release package"
pushd ${SPECDIR}
${RPM} -ba $EXTRA_OPTIONS $SPECFILE
-[ `arch` = "x86_64" ] && {
+if [ "x$?" = "x0" ] && [ `arch` = "x86_64" ]; then
echo "Building 32 bit winbind libs"
# hi ho, a hacking we will go ...
ln -sf /lib/libcom_err.so.2 /lib/libcom_err.so
ln -sf /lib/libuuid.so.1 /lib/libuuid.so
${RPM} -ba --rebuild --target=i386 $SPECFILE
-}
+fi
popd
diff --git a/packaging/RHEL-CTDB/samba.spec b/packaging/RHEL-CTDB/samba.spec
index bae4112..16340c6 100644
--- a/packaging/RHEL-CTDB/samba.spec
+++ b/packaging/RHEL-CTDB/samba.spec
@@ -5,8 +5,8 @@ Summary: Samba SMB client and server
Vendor: Samba Team
Packager: Samba Team <samba at samba.org>
Name: samba
-Version: 3.2.0
-Release: ctdb.27
+Version: 3.3.0
+Release: ctdb.1
Epoch: 0
License: GNU GPL version 3
Group: System Environment/Daemons
@@ -41,12 +41,7 @@ BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel, openldap-deve
%define _libarch %_lib
%endif
-# rpm screws up the arch lib dir when using --target on RHEL5
-%ifarch i386 i486 i586 i686 ppc s390
-%define _libarch lib
-%else
-%define _libarch %_lib
-%endif
+%define _libarchdir /usr/%{_libarch}
%description
@@ -152,7 +147,7 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \
--prefix=%{_prefix} \
--localstatedir=/var \
--with-configdir=%{_sysconfdir}/samba \
- --with-libdir=%{_libdir}/samba \
+ --with-libdir=%{_libarchdir}/samba \
--with-lockdir=/var/lib/samba \
--with-logfilebase=/var/log/samba \
--with-mandir=%{_mandir} \
@@ -177,13 +172,11 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \
--with-cluster-support \
--with-ctdb=/usr/include \
--without-ldb \
- --with-dnsupdate \
+ --without-dnsupdate \
--with-aio-support
make showlayout
-make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" proto
-
## check for gcc 3.4 or later
CC_VERSION=`${CC} --version | head -1 | awk '{print $3}'`
CC_MAJOR=`echo ${CC_VERSION} | cut -d. -f 1`
@@ -216,8 +209,8 @@ rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/swat/{help,include,using_samba/{figs,gifsa}}
mkdir -p $RPM_BUILD_ROOT%{_includedir}
mkdir -p $RPM_BUILD_ROOT%{_initrddir}
-mkdir -p $RPM_BUILD_ROOT{%{_libdir},%{_includedir}}
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/samba/{auth,charset,idmap,vfs,pdb}
+mkdir -p $RPM_BUILD_ROOT{%{_libarchdir},%{_includedir}}
+mkdir -p $RPM_BUILD_ROOT%{_libarchdir}/samba/{auth,charset,idmap,vfs,pdb}
mkdir -p $RPM_BUILD_ROOT/%{_libarch}/security
mkdir -p $RPM_BUILD_ROOT%{_mandir}
mkdir -p $RPM_BUILD_ROOT%{_prefix}/{bin,sbin}
@@ -242,42 +235,60 @@ cp source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_libarch}/security/pam_smbpass.so
# NSS & PAM winbind support
install -m 755 source/bin/pam_winbind.so $RPM_BUILD_ROOT/%{_libarch}/security/pam_winbind.so
install -m 755 source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_libarch}/libnss_winbind.so
-install -m 755 source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_libarch}/libnss_wins.so
+#install -m 755 source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_libarch}/libnss_wins.so
( cd $RPM_BUILD_ROOT/%{_libarch};
- ln -sf libnss_winbind.so libnss_winbind.so.2;
- ln -sf libnss_wins.so libnss_wins.so.2 )
+ ln -sf libnss_winbind.so libnss_winbind.so.2 )
+# ( cd $RPM_BUILD_ROOT/%{_libarch}; ln -sf libnss_wins.so libnss_wins.so.2 )
# make install puts libsmbclient.so in the wrong place on x86_64
-rm -f $RPM_BUILD_ROOT/usr/lib*/samba/libsmbclient.so $RPM_BUILD_ROOT/usr/lib*/samba/libsmbclient.a || true
-install -m 755 source/bin/libsmbclient.so $RPM_BUILD_ROOT%{_libdir}/libsmbclient.so
-install -m 755 source/bin/libsmbclient.a $RPM_BUILD_ROOT%{_libdir}/libsmbclient.a
+rm -f $RPM_BUILD_ROOT/usr/lib*/samba/libsmbclient.so* $RPM_BUILD_ROOT/usr/lib*/samba/libsmbclient.a || true
+install -m 755 source/bin/libsmbclient.so.0 $RPM_BUILD_ROOT%{_libarchdir}/libsmbclient.so.0
+install -m 755 source/bin/libsmbclient.a $RPM_BUILD_ROOT%{_libarchdir}/libsmbclient.a
install -m 644 source/include/libsmbclient.h $RPM_BUILD_ROOT%{_includedir}
-ln -s %{_libdir}/libsmbclient.so $RPM_BUILD_ROOT%{_libdir}/libsmbclient.so.0
+ln -s libsmbclient.so.0 $RPM_BUILD_ROOT%{_libarchdir}/libsmbclient.so
# make install puts libmsrpc.so in the wrong place on x86_64
#rm -f $RPM_BUILD_ROOT/usr/lib*/samba/libmsrpc.so $RPM_BUILD_ROOT/usr/lib*/samba/libmsrpc.a || true
-#install -m 755 source/bin/libmsrpc.so $RPM_BUILD_ROOT%{_libdir}/libmsrpc.so
-#install -m 755 source/bin/libmsrpc.a $RPM_BUILD_ROOT%{_libdir}/libmsrpc.a
+#install -m 755 source/bin/libmsrpc.so $RPM_BUILD_ROOT%{_libarchdir}/libmsrpc.so
+#install -m 755 source/bin/libmsrpc.a $RPM_BUILD_ROOT%{_libarchdir}/libmsrpc.a
#install -m 644 source/include/libmsrpc.h $RPM_BUILD_ROOT%{_includedir}
-#rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libmsrpc.*
-#ln -s /%{_libdir}/libmsrpc.so $RPM_BUILD_ROOT%{_libdir}/libmsrpc.so.0
+#rm -f $RPM_BUILD_ROOT%{_libarchdir}/samba/libmsrpc.*
+#ln -s /%{_libarchdir}/libmsrpc.so $RPM_BUILD_ROOT%{_libarchdir}/libmsrpc.so.0
# make install puts libsmbsharemodes.so in the wrong place on x86_64
-rm -f $RPM_BUILD_ROOT/usr/lib*/samba/libsmbsharemodes.so $RPM_BUILD_ROOT/usr/lib*/samba/libsmbsharemodes.a || true
-install -m 755 source/bin/libsmbsharemodes.so $RPM_BUILD_ROOT%{_libdir}/libsmbsharemodes.so
-install -m 755 source/bin/libsmbsharemodes.a $RPM_BUILD_ROOT%{_libdir}/libsmbsharemodes.a
+rm -f $RPM_BUILD_ROOT/usr/lib*/samba/libsmbsharemodes.so* $RPM_BUILD_ROOT/usr/lib*/samba/libsmbsharemodes.a || true
+install -m 755 source/bin/libsmbsharemodes.so.0 $RPM_BUILD_ROOT%{_libarchdir}/libsmbsharemodes.so.0
+install -m 755 source/bin/libsmbsharemodes.a $RPM_BUILD_ROOT%{_libarchdir}/libsmbsharemodes.a
install -m 644 source/include/smb_share_modes.h $RPM_BUILD_ROOT%{_includedir}
-rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libsmbsharemodes.*
-ln -s /%{_libdir}/libsmbsharemodes.so $RPM_BUILD_ROOT%{_libdir}/libsmbsharemodes.so.0
+rm -f $RPM_BUILD_ROOT%{_libarchdir}/samba/libsmbsharemodes.*
+ln -s libsmbsharemodes.so.0 $RPM_BUILD_ROOT%{_libarchdir}/libsmbsharemodes.so
# Install pam_smbpass.so
install -m755 source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_libarch}/security/pam_smbpass.so
+# Put the shared libraries to their SONAME under /usr/lib{,64}
+# and create the proper .so symlinks
#
-ln -s %{_libdir}/samba/libwbclient.so $RPM_BUILD_ROOT/%{_libdir}/libwbclient.so.0
-ln -s %{_libdir}/samba/libtalloc.so $RPM_BUILD_ROOT/%{_libdir}/libtalloc.so.1
-ln -s %{_libdir}/samba/libtdb.so $RPM_BUILD_ROOT/%{_libdir}/libtdb.so.0
-ln -s %{_libdir}/samba/libnetapi.so $RPM_BUILD_ROOT/%{_libdir}/libnetapi.so.0
+# libwbclient
+rm -f $RPM_BUILD_ROOT%{_libarchdir}/samba/libwbclient.so*
+install -m 755 source/bin/libwbclient.so.0 \
+ $RPM_BUILD_ROOT%{_libarchdir}/libwbclient.so.0
+ln -s libwbclient.so.0 $RPM_BUILD_ROOT%{_libarchdir}/libwbclient.so
+# libtalloc
+rm -f $RPM_BUILD_ROOT%{_libarchdir}/samba/libtalloc.so*
+install -m 755 source/bin/libtalloc.so.1 \
+ $RPM_BUILD_ROOT%{_libarchdir}/libtalloc.so.1
+ln -s libtalloc.so.1 $RPM_BUILD_ROOT%{_libarchdir}/libtalloc.so
+# libtdb
+rm -f $RPM_BUILD_ROOT%{_libarchdir}/samba/libtdb.so*
+install -m 755 source/bin/libtdb.so.1 \
+ $RPM_BUILD_ROOT%{_libarchdir}/libtdb.so.1
+ln -s libtdb.so.1 $RPM_BUILD_ROOT%{_libarchdir}/libtdb.so
+# libnetapi
+rm -f $RPM_BUILD_ROOT%{_libarchdir}/samba/libnetapi.so*
+install -m 755 source/bin/libnetapi.so.0 \
+ $RPM_BUILD_ROOT%{_libarchdir}/libnetapi.so.0
+ln -s libnetapi.so.0 $RPM_BUILD_ROOT%{_libarchdir}/libnetapi.so
## cleanup
/bin/rm -rf $RPM_BUILD_ROOT/usr/lib*/samba/security
@@ -337,20 +348,19 @@ if [ "$1" -eq "2" ]; then
fi
fi
+if [ "$1" -ge "1" ]; then
+ /sbin/service smb condrestart >/dev/null 2>&1 || :
+fi
+
%preun
if [ $1 = 0 ] ; then
+ /sbin/service smb stop >/dev/null 2>&1 || :
/sbin/chkconfig --del smb
- /sbin/chkconfig --del winbind
# rm -rf /var/log/samba/* /var/lib/samba/*
- /sbin/service smb stop >/dev/null 2>&1
fi
exit 0
-%postun
-if [ "$1" -ge "1" ]; then
- %{initdir}/smb restart >/dev/null 2>&1
-fi
-
+#%postun
%post swat
# Add swat entry to /etc/services if not already there.
@@ -361,6 +371,17 @@ fi
%post common
/sbin/ldconfig
+if [ "$1" -ge "1" ]; then
+ /sbin/service winbind condrestart >/dev/null 2>&1 || :
+fi
+
+%preun common
+if [ $1 = 0 ] ; then
+ /sbin/service winbind stop >/dev/null 2>&1 || :
+ /sbin/chkconfig --del winbind
+fi
+exit 0
+
%postun common
/sbin/ldconfig
@@ -374,7 +395,6 @@ fi
%config(noreplace) %{_sysconfdir}/sysconfig/samba
%config(noreplace) %{_sysconfdir}/samba/smbusers
%attr(755,root,root) %config %{initdir}/smb
-%attr(755,root,root) %config %{initdir}/winbind
%config(noreplace) %{_sysconfdir}/logrotate.d/samba
%config(noreplace) %{_sysconfdir}/pam.d/samba
@@ -383,7 +403,6 @@ fi
%attr(1777,root,root) %dir /var/spool/samba
%{_sbindir}/samba
-%{_sbindir}/winbind
%{_sbindir}/smbd
%{_sbindir}/nmbd
@@ -396,10 +415,10 @@ fi
%{_bindir}/tdbdump
%{_bindir}/eventlogadm
-%{_libdir}/samba/idmap/*.so
-%{_libdir}/samba/nss_info/*.so
-%{_libdir}/samba/vfs/*.so
-%{_libdir}/samba/auth/*.so
+%{_libarchdir}/samba/idmap/*.so
+%{_libarchdir}/samba/nss_info/*.so
+%{_libarchdir}/samba/vfs/*.so
+%{_libarchdir}/samba/auth/*.so
%{_mandir}/man1/smbcontrol.1*
%{_mandir}/man1/smbstatus.1*
@@ -436,7 +455,7 @@ fi
%{_datadir}/swat/*
%{_sbindir}/swat
%{_mandir}/man8/swat.8*
-%attr(755,root,root) %{_libdir}/samba/*.msg
+%attr(755,root,root) %{_libarchdir}/samba/*.msg
##########
@@ -474,39 +493,37 @@ fi
%files common
%defattr(-,root,root)
%dir %{_sysconfdir}/samba
-%dir %{_libdir}/samba
-%dir %{_libdir}/samba/charset
+%dir %{_libarchdir}/samba
+%dir %{_libarchdir}/samba/charset
%config(noreplace) %{_sysconfdir}/samba/smb.conf
%config(noreplace) %{_sysconfdir}/samba/lmhosts
-%{_initrddir}/winbind
+%attr(755,root,root) %config %{initdir}/winbind
-%attr(755,root,root) /%{_libarch}/libnss_wins.so*
+#%attr(755,root,root) /%{_libarch}/libnss_wins.so*
%attr(755,root,root) /%{_libarch}/libnss_winbind.so*
%attr(755,root,root) /%{_libarch}/security/pam_winbind.so
%attr(755,root,root) /%{_libarch}/security/pam_smbpass.so
%{_includedir}/libsmbclient.h
-%{_libdir}/libsmbclient.*
+%{_libarchdir}/libsmbclient.*
#%{_includedir}/libmsrpc.h
-#%{_libdir}/libmsrpc.*
+#%{_libarchdir}/libmsrpc.*
%{_includedir}/smb_share_modes.h
-%{_libdir}/libsmbsharemodes.*
+%{_libarchdir}/libsmbsharemodes.*
-%{_libdir}/samba/*.dat
-%{_libdir}/samba/charset/*.so
+%{_libarchdir}/samba/*.dat
+%{_libarchdir}/samba/charset/*.so
%{_includedir}/netapi.h
%{_includedir}/wbclient.h
%{_includedir}/talloc.h
%{_includedir}/tdb.h
-%{_libdir}/samba/libnetapi.so*
-%{_libdir}/libnetapi.so*
-%{_libdir}/samba/libtalloc.so*
-%{_libdir}/libtalloc.so*
-%{_libdir}/samba/libtdb.so*
-%{_libdir}/libtdb.so*
-%{_libdir}/samba/libwbclient.so*
-%{_libdir}/libwbclient.so*
+%{_libarchdir}/libnetapi.so*
+%{_libarchdir}/libtalloc.so*
+%{_libarchdir}/libtdb.so*
+%{_libarchdir}/libwbclient.so*
+
+%{_sbindir}/winbind
%{_sbindir}/winbindd
%{_bindir}/testparm
@@ -539,7 +556,9 @@ fi
%ifarch i386 i486 i586 i686 ppc s390
%files winbind-32bit
%attr(755,root,root) /%{_libarch}/libnss_winbind.so*
-%attr(755,root,root) /%{_libarch}/libnss_wins.so*
+#%attr(755,root,root) /%{_libarch}/libnss_wins.so*
+%attr(755,root,root) /%{_libarchdir}/libtalloc.so*
+%attr(755,root,root) /%{_libarchdir}/libtdb.so*
%attr(755,root,root) /%{_libarch}/security/pam_winbind.so
%endif
diff --git a/packaging/RHEL-CTDB/setup/smb.init b/packaging/RHEL-CTDB/setup/smb.init
index af85b2c..4dd5b23 100644
--- a/packaging/RHEL-CTDB/setup/smb.init
+++ b/packaging/RHEL-CTDB/setup/smb.init
@@ -38,11 +38,12 @@ fi
[ -w /etc/samba/smb.conf ] || exit 0
# Check whether "netbios disabled" is true
-ISNETBIOSDISABLED=$(testparm -s 2>/dev/null | \
- sed -n '/\[global\]/,/^$/p' | \
- grep "disable netbios = Yes" | \
- awk 'BEGIN{FS=" = "}{print $2}')
+#ISNETBIOSDISABLED=$(testparm -s 2>/dev/null | \
+# sed -n '/\[global\]/,/^$/p' | \
+# grep "disable netbios = Yes" | \
+# awk 'BEGIN{FS=" = "}{print $2}')
+ISNETBIOSDISABLED=Yes
RETVAL=0
diff --git a/source/Makefile.in b/source/Makefile.in
index c4354b4..aac58d3 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -230,7 +230,7 @@ MODULES = $(VFS_MODULES) $(PDB_MODULES) $(RPC_MODULES) $(IDMAP_MODULES) \
TDB_OBJ = lib/util_tdb.o \
lib/dbwrap.o lib/dbwrap_tdb.o \
- lib/dbwrap_tdb2.o lib/dbwrap_ctdb.o \
+ lib/dbwrap_ctdb.o \
lib/dbwrap_rbt.o @LIBTDB_STATIC@
SMBLDAP_OBJ = @SMBLDAP@ @SMBLDAPUTIL@
@@ -615,6 +615,7 @@ VFS_CACHEPRIME_OBJ = modules/vfs_cacheprime.o
VFS_PREALLOC_OBJ = modules/vfs_prealloc.o
VFS_COMMIT_OBJ = modules/vfs_commit.o
VFS_GPFS_OBJ = modules/vfs_gpfs.o modules/gpfs.o modules/nfs4_acls.o
+VFS_GPFS_PREFETCH_OBJ = modules/vfs_gpfs_prefetch.o modules/gpfs.o
VFS_NOTIFY_FAM_OBJ = modules/vfs_notify_fam.o
VFS_READAHEAD_OBJ = modules/vfs_readahead.o
VFS_TSMSM_OBJ = modules/vfs_tsmsm.o
@@ -2354,6 +2355,10 @@ bin/gpfs. at SHLIBEXT@: $(BINARY_PREREQS) $(VFS_GPFS_OBJ)
@echo "Building plugin $@"
@$(SHLD_MODULE) $(VFS_GPFS_OBJ)
+bin/gpfs_prefetch. at SHLIBEXT@: $(BINARY_PREREQS) $(VFS_GPFS_PREFETCH_OBJ)
+ @echo "Building plugin $@"
+ @$(SHLD_MODULE) $(VFS_GPFS_PREFETCH_OBJ)
+
bin/notify_fam. at SHLIBEXT@: $(BINARY_PREREQS) $(VFS_NOTIFY_FAM_OBJ)
@echo "Building plugin $@"
@$(SHLD_MODULE) $(VFS_NOTIFY_FAM_OBJ) @SMB_FAM_LIBS@
diff --git a/source/configure.in b/source/configure.in
index c769859..a53db4e 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -1056,7 +1056,7 @@ AC_TRY_LINK([#include <gpfs_gpl.h>],
echo $samba_cv_HAVE_GPFS
if test x"$samba_cv_HAVE_GPFS" = x"yes"; then
AC_DEFINE(HAVE_GPFS,1,[Whether GPFS GPL libs are available])
- default_shared_modules="$default_shared_modules vfs_gpfs"
+ default_shared_modules="$default_shared_modules vfs_gpfs vfs_gpfs_prefetch"
fi
LIBS="$save_LIBS"
@@ -5986,6 +5986,7 @@ SMB_MODULE(vfs_cacheprime, \$(VFS_CACHEPRIME_OBJ), "bin/cacheprime.$SHLIBEXT", V
SMB_MODULE(vfs_prealloc, \$(VFS_PREALLOC_OBJ), "bin/prealloc.$SHLIBEXT", VFS)
SMB_MODULE(vfs_commit, \$(VFS_COMMIT_OBJ), "bin/commit.$SHLIBEXT", VFS)
SMB_MODULE(vfs_gpfs, \$(VFS_GPFS_OBJ), "bin/gpfs.$SHLIBEXT", VFS)
+SMB_MODULE(vfs_gpfs_prefetch, \$(VFS_GPFS_PREFETCH_OBJ), "bin/gpfs_prefetch.$SHLIBEXT", VFS)
SMB_MODULE(vfs_readahead, \$(VFS_READAHEAD_OBJ), "bin/readahead.$SHLIBEXT", VFS)
SMB_MODULE(vfs_tsmsm, \$(VFS_TSMSM_OBJ), "bin/tsmsm.$SHLIBEXT", VFS)
SMB_MODULE(vfs_fileid, \$(VFS_FILEID_OBJ), "bin/fileid.$SHLIBEXT", VFS)
diff --git a/source/groupdb/mapping_tdb.c b/source/groupdb/mapping_tdb.c
index f116888..7cee53a 100644
--- a/source/groupdb/mapping_tdb.c
+++ b/source/groupdb/mapping_tdb.c
--
Samba Shared Repository
More information about the samba-cvs
mailing list