[SCM] SAMBA-CTDB repository - branch v3-2-ctdb updated -
build_3.2.3_ctdb.51-154-g623a4a8
Michael Adam
obnox at samba.org
Tue Dec 16 16:49:05 GMT 2008
The branch, v3-2-ctdb has been updated
via 623a4a8f1e5242fee8d78857afb881de4b2e4bdb (commit)
via cd6a7fabe82db4d90699b6827fed5bc00877e788 (commit)
via 36cedca0d301d75e3efc6788de2e8cd432ca9c78 (commit)
via 2ad7aa174d6585bac39122e3065cb5542483f12b (commit)
via 9f2ad0305abe02cf3aaf3e6f9e83b244571341de (commit)
via 080e410f1a300bc86df1b4d0af6561d50db87701 (commit)
via 49a46c9219cc38089e6f901f176a3c43e5294bb4 (commit)
via 7febe8632ca137a1e6183bf0015521977714b2fa (commit)
via 4c95ce1d4f8323f528be1b436f22c3544ed96163 (commit)
via d94ba07049f0a34e915f6c53c5e95a1bd2d254e5 (commit)
via 1f524c75d44abebcd8f3532d003f99007f9a1b8f (commit)
via 0f0c1fa9dabcaef742d91fc54e4f9cd9361124a6 (commit)
via 83126cc12a1ef2263ebdf804c5318e30955788e8 (commit)
via fd440795cadf41fc148efa2a71eaf22fca7156ad (commit)
via 68488c6656ce612d808b7fe8ed18885945f57d40 (commit)
via 5688fb042aed0cdf63fceb5b50d27d3a8a439947 (commit)
via 4dac0ab0ba47812ecce7f1c016b7291a3d906f42 (commit)
via 349707e529d5d695dbc1694ac4ce4c783567d9b2 (commit)
via 3937e7eb22d05488a8fb7aeb2ee0cab4cfcf6dba (commit)
via c8ed9c8a76c04fb76d6cdbd1d5fd963edf88868f (commit)
via ed92466b51ff942ee993cf5219816b447481bdf3 (commit)
via f558334d0568b4f117e3d99e2f33c1a23596e59c (commit)
via ef2d876bd4b1f1a7cdabd10ef4f2203ebcbefb63 (commit)
via 395d2dfc22cf4597cc856d377987320b5af0c0d0 (commit)
via 6aed5a39865cfe25a93fb26d2def1b05a03415ad (commit)
via c2711398c01fce3b1012e6354c5ca4490bced470 (commit)
via 3a54593dda3660c61ccc1339417524147b311a5b (commit)
via 014b7b76728abdcede38b4513af209e3293cc650 (commit)
via ba367296556b273e40eb52bae917be71e5c0c534 (commit)
via e0f7f2d413cd67fe599969a6eb62b5f975000f88 (commit)
via 4a0d682868a3715e3c52391d3e83d2a6551bb400 (commit)
via 56e5e0487573cbccd5fe43255939f4ae7ece27fa (commit)
via 2df31a8f9141a9f580f0804e3109f15b0c60c0b9 (commit)
via 504d3f24007da2923aa6ade0badfeed0e91e771e (commit)
via a1874e2cc77844b679a8246d6c15f12f47319fdb (commit)
via ef596ec3137358cd80624668fd34ab6ceaf5af07 (commit)
via cada9200c8e2a54edc5fc36b7d15fb01222e2328 (commit)
via 3aecac3692379c0c1241f9f2f5a80fde144a54c1 (commit)
via cebf39d4754831002c1d88f5723cc1ca8fd61429 (commit)
via 7cf4b954c856a2dcbe2929d2573b5fe4ce4fb252 (commit)
via eeb47588ff28ff7e1ca2b1f36a9700ed4485955b (commit)
via 42342d40dae578caafa936178d1516e7533c9741 (commit)
via 82af619d9f36ab930402a79683b76b4e729729c8 (commit)
via 4fa839f1ac93bdb2362b7fcd8f66b8e005747a86 (commit)
via de7fea4f5c4784969c1d27787af9c19ad546f7b7 (commit)
via f13542d0fa8af67547e0a285f60c5f29678d98a1 (commit)
via 647233f813ef46b319e5ab43aaac2ac69b3117a6 (commit)
via 2856d6fc872930c6e5129d05223af25df67f0088 (commit)
via 6241cb36a418f8f7aab3ae86e2e1bfc97b694689 (commit)
via 428a77fd2c621e6bd5db638305ce5f70a39e009d (commit)
via abc0762b47ac766a79f6d37e5a5f6dc7e1d27e1c (commit)
via e099dddb13b4d4cb8876d4e418ae86e70b1d3843 (commit)
via 3220628383a9126489fc8c30119cdd388f2a4b8f (commit)
via a738626624f13412b507e4884070732a464518a8 (commit)
via dfc8b845274cfe390952b9afff009164780d76b3 (commit)
via 1380286b5abfda56f40b31a82d7619ed36895fe8 (commit)
via 03d144616a7cd43f33919fddc664ad4a24c8ce99 (commit)
via a1a2a978fa669aa7dff71a3c0551a275de244e64 (commit)
via 44fce98b2c3e1900a2ca25b56c0fcbdf11715ba8 (commit)
via 11d8236dac6615f156f0df423a84e444674916c9 (commit)
via 35e31a6c45c69d61be2503581c90138ff88219af (commit)
via 3937ada09189bcace81de824fd65de479bfc5136 (commit)
via 7e33c26777cd86cf1257b9b461c0175c7d5d501f (commit)
via ec190c83c5da01c495f42637332c7456cc568aa4 (commit)
via 942ce2f3a14795cad2f57d07bf31cea57d3993dc (commit)
via c4351e6546f865862a5a6719d2d984192ee37d29 (commit)
via 66dc89d5d9d42e03b4ebfa7c2519d7531a70e715 (commit)
via 5c87700c05b2355954c2ee19f031826b8a93aeb3 (commit)
via 4ffda19fb21c44adb6e00c1376d1aa046df709cc (commit)
via a419c9d1ae9f77a88ac76433273171d86f0bb80d (commit)
via f8fc0dd92f240379ac3f131ddcc151a7808e750a (commit)
via 07cafba0d50b0e42404dc8525baf2b4f4b270d41 (commit)
via 2f8fef8378096e7091b1d49d9d76f94508ae714b (commit)
via fb93c55a5bc08f2b99052a0582a824944b39ce1c (commit)
via ea17d18ceb3aefefa77b46bf774d63070088b994 (commit)
via b9926005bf80af5326d09181d074d885e9182aac (commit)
via c447f09592d68c26c566d8f6a7729754fb8110dc (commit)
via f9b806f3cfe10f577bbe9efd00836b3ff89727a6 (commit)
via 8526f8c7cd6a5ae924f89fe38c977cca0b1c58f5 (commit)
via 32fe49c7d714597b668ffcae8d723f45a54c1fb7 (commit)
via 6a84b691bbbbd96637b7252d3c7f0680ec01f182 (commit)
via 5ba948ef97979e2d7fcbbbb5a8668bfff847afde (commit)
via 3d8b047c078b2e77913f35d678c62c52dcf2fac2 (commit)
via 2be5abc931e2df157c713db0f1034c2911a0c2ac (commit)
via 286bc9a5f22401cd1efd4c7c723e0fe6181a8bba (commit)
via 3473f5b5be9fafa39a01c65fa7714be4b5a06898 (commit)
via 4f4ff7f2b41b49f9c99b711a8810be1b4f5bfb62 (commit)
via 734157a81b3bbe56daf55a4f618c05f08013de42 (commit)
via 8f55fe6b3b1d4ac8453b628df53808f3f0ee25de (commit)
via 9b1c643c6274f0c6bc7ff85d155f11ca68151a61 (commit)
via beebf20aef1f1214eb04abb7179f9129833c7449 (commit)
via e325e09705693c276a4ff47a89c47d5825efc7d4 (commit)
via 97835b3a6e6b4a9660863b09270fe1482253ae5b (commit)
via 2fb234850debab8d3c503cafedcbaaf073047a0b (commit)
via f4562c5fd116088abc1c24317a88df81aa8b814b (commit)
via 8e7d76af82e9eb851691c4b75bf2d2ccf8c59141 (commit)
via 06c47580220f7a8a8b056c4de7180ac92423b099 (commit)
via 4dc8a05a755c6d5dcad8a98f9d4dec9501c2e059 (commit)
via de2872cff70cb609ba2461afc8d48d64b2321ffa (commit)
via 35ba453bbbe4cb8f9568801f48cc8ca1ba92f133 (commit)
via 0ef4fc86da0f8d21571b40cba9df057787d2b7ee (commit)
via 2b71cc546572527d457e8b2a173269991874b2cc (commit)
via 060d41a708eb3f0f586491fb48e92a3bdd63c885 (commit)
via 5bcd62d78283c1e47ab76562f433dd9c2e125c73 (commit)
via ff411ce81a743128474fb64b5521d92bf3231f50 (commit)
via 780a9f97ac62345ceb863746cdf4897bd42f15b1 (commit)
via 084c053d84a1152d22e3a8785dbca2546cc7bb70 (commit)
via 3480841d13ffdb94029c821004c7ca4274a021c9 (commit)
via fd5d2ca513ab1000f67405b2fa4fb5da05c76164 (commit)
via 4ecf7415d36195880fbe8c3912b3d2ff30910d58 (commit)
via 43f480d4336397c13bc64bad8ea5be062199222c (commit)
via a946a9f8491f0d89cf92914fbd0f034d1cb27a30 (commit)
via ca345a8435ae346fadccfebc37f1efe05ebcd9b9 (commit)
via 0c8d47a29bb4e69a002be4538f071e7efa4c1883 (commit)
via 1fdfa43871fc7e0a5fcfeae351c871d05bdb9790 (commit)
via da7fe0076bccc495c3e9091ce55e7854862f7b5a (commit)
via 969438a3cc622ded1045b69a69195dc33dc3c9cf (commit)
via 6ee5961368a34fd1772a65accc03bb7920834a45 (commit)
via 94d3b4e8b6c869ca77a4356af8dec1b2025830a3 (commit)
via 1373c593b21a5b0c40312610ba8dadfdafbfa479 (commit)
via 3975b5b007c17295a2247b7595e8aef5810bafd2 (commit)
via 2f9003f68460ffabcbebb3cadd8df7a58aa1b05b (commit)
via 2165fa2b8aeca11ed8369b7ab2daeef6038b2584 (commit)
via ae7f02de51be91bb0019e7021e5e8b8576ca6797 (commit)
via aaf654d87828cf1917463e0434b80d21e255413e (commit)
via 8eeed96539f52ef8be639c472fe660d38afa196f (commit)
via f16d39c6f689644712c41e5bb73b31a307bd32db (commit)
via 42b104cea13673c30a1dde676fc4a7ce1a81f44d (commit)
via 33b724007e5f0d55baced1469518d43414940bc7 (commit)
via 201ddf856380d9e40950c4aba1387d5377fb6eef (commit)
via 984cbab649209bb056bb400efbf0c32fd75d6263 (commit)
via 0a31181386a147118b843ee15fb48b7d7c872263 (commit)
via 9da090c51117ff83cdceb21b1765d7b4b46733d7 (commit)
via a5c00c541b6397a528363c11da5d11384a9715cc (commit)
via 50210aacec0b6e2f70153a38e48c418f7d81c66c (commit)
via 102269a986c12492d0606fc96c4f0ccd3cece47f (commit)
via 5224c79a02d218b1af4eb149205e1bbf472592b5 (commit)
via a26167e96c52017e772d674b0d307e49398112b8 (commit)
via 19d16c580dfb53107b8671da32ef0816fbe8179e (commit)
via 854a6ac1d27b560aa3ec515d3cd5e60a8bcfa46e (commit)
via 4ebae9dc4f9807cacb84c8ba005eec868b84cf17 (commit)
via 86bb35198c2676833468b7e0414e8a098cad9d75 (commit)
via d8423a3142277b65451f73da56373adb58f110a8 (commit)
from b727a58933d464faf6ea8dedf56e0074854e37f8 (commit)
http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-2-ctdb
- Log -----------------------------------------------------------------
commit 623a4a8f1e5242fee8d78857afb881de4b2e4bdb
Author: Michael Adam <obnox at samba.org>
Date: Tue Dec 16 17:06:31 2008 +0100
VERSION: set version to 3.2.6 - that's where we are
Michael
commit cd6a7fabe82db4d90699b6827fed5bc00877e788
Author: Michael Adam <obnox at samba.org>
Date: Tue Dec 16 17:05:55 2008 +0100
VERSION: add "ctdb" vendor suffix
Michael
commit 36cedca0d301d75e3efc6788de2e8cd432ca9c78
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue Dec 16 09:04:32 2008 +0100
docs: Fix typo in the idmap_ad manpage.
Karolin
(cherry picked from commit b876e1336bed52e0823e0e88381d223bd6aa95e4)
(cherry picked from commit 611ac35a694930693d2f773d15e59be138261a8e)
commit 2ad7aa174d6585bac39122e3065cb5542483f12b
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Dec 16 10:40:32 2008 +0100
s3:net_status: use dbwrap to open sessionid.tdb
metze
(cherry picked from commit 8891b2b0215a3609fcc8c5f9aa3e2fbcf05c6290)
(cherry picked from commit 598bf8fbe38d76adca2e067c90987d9cd31e8a3e)
commit 9f2ad0305abe02cf3aaf3e6f9e83b244571341de
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 15 12:46:04 2008 +0100
Fix bug 5969: Optimize smbclient put command
This used to be checkin 3f0406f6 to master
commit 080e410f1a300bc86df1b4d0af6561d50db87701
Author: Volker Lendecke <vl at sernet.de>
Date: Sat Dec 13 13:14:58 2008 -0800
Fix error code when smbclient puts a file over an existing directory
Windows returns NT_STATUS_FILE_IS_A_DIRECTORY, as does Samba 3.0. 3.2 and
following returned NT_STATUS_INVALID_PARAMETER which is wrong.
Before I converted reply_open_and_X to create_file() we called
open_file_ntcreate directly. Passing through open&X for a filename that exists
as a directory ends up in open_directory after having tried open_file_ntcreate.
Some check in there returns NT_STATUS_INVALID_PARAMETER. With this additional
FILE_NON_DIRECTORY_FILE flag we get the correct error message back from
create_file_unixpath before trying open_directory().
Survives make test, but as this also touches the other open variants I would
like others to review this.
Volker
commit 49a46c9219cc38089e6f901f176a3c43e5294bb4
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Nov 21 08:28:13 2008 +0100
s3:dsgetdcname: retry with the clients site
metze
(cherry picked from commit 1b7b0e924f3064a9774fd5d46bedc3d342b39ddb)
(cherry picked from commit f7a811f2ae3572791035014b6e20410b07ea011e)
commit 7febe8632ca137a1e6183bf0015521977714b2fa
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Nov 21 08:22:38 2008 +0100
s3:libnet_join: use DS_FORCE_REDISCOVERY
metze
(cherry picked from commit 2bb91392b46e347fe3b6803d10b10d8b40e4a4a6)
(cherry picked from commit 134893ef2b12b4b039c717588a8172613f6d1955)
commit 4c95ce1d4f8323f528be1b436f22c3544ed96163
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Oct 27 19:40:23 2008 +0100
s3:libnet_join: call saf_join_store() after a the join.
metze
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Signed-off-by: Günther Deschner <gd at samba.org>
(similar to commit feef594d275881466e2c3f59c0ff54609a9cc53b)
(cherry picked from commit 6a993cb333675f4079d439fa334edee2df604933)
(cherry picked from commit 8314ce63ff77f0472d4249adcea87123b3b3f5c2)
commit d94ba07049f0a34e915f6c53c5e95a1bd2d254e5
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Oct 27 19:39:30 2008 +0100
s3:libads/ldap.c: store the dc name in the saf cache as in all other places
metze
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Signed-off-by: Günther Deschner <gd at samba.org>
(cherry picked from commit 543fa85a711337e979c7b631bda5db95d109ef59)
(cherry picked from commit 17efebde11eafd065c2cac39cdbe55b8d40d40be)
(cherry picked from commit 9e78bfdbe107519f2ddfa4d532771945a7691b46)
commit 1f524c75d44abebcd8f3532d003f99007f9a1b8f
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Oct 27 19:38:15 2008 +0100
s3:libads/ldap.c: if the client belongs to no site at all any dc is the closest
metze
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Signed-off-by: Günther Deschner <gd at samba.org>
(cherry picked from commit f86ef9b53a903485deba94febf90dd4e657cc02b)
(cherry picked from commit a8040d59659e58c5cb92c1107a7ff012eff12729)
(cherry picked from commit 7baceea20252dec6b64e86ec8b5a73b62b373758)
commit 0f0c1fa9dabcaef742d91fc54e4f9cd9361124a6
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Oct 27 19:36:25 2008 +0100
s3:libads/ldap.c: pass the real workgroup name to get_dc_name()
metze
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Signed-off-by: Günther Deschner <gd at samba.org>
(cherry picked from commit c2d4a84abe1b6cbf68d6e9f1bb1f8974d0b628fc)
(cherry picked from commit 2f27ffc4a2ba745341a5961b8f04e62da3fb089a)
(cherry picked from commit 132911954715bfa6df8566c0fb382ef07a7da96e)
commit 83126cc12a1ef2263ebdf804c5318e30955788e8
Author: Stefan Metzmacher <metze at samba.org>
Date: Sat Dec 13 12:18:32 2008 +0100
s3:libsmb/namequery.c: add saf_join_store() function
saf_join_store() should be called after a successful
domain join, the affinity to the dc used at join time
has a larger ttl, to avoid problems with delayed replication.
metze
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Signed-off-by: Günther Deschner <gd at samba.org>
(cherry picked from commit 80e74a27c55c01221091e3eec930c2ac4433c22c)
(cherry picked from commit 895c40d03a07182c054a6fd857e7dd6838e698f4)
(cherry picked from commit 7b56268b3c9652e3089bd75e4e51dd626fa742a6)
commit fd440795cadf41fc148efa2a71eaf22fca7156ad
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Oct 27 09:40:25 2008 +0100
s3: libsmb/namequery: fallback to returning all dcs, when none is available in the requested site
It could happen that all dcs in a site are unavailable
(some sites have only one dc) and then we need to fallback
to get all dcs.
metze
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Signed-off-by: Günther Deschner <gd at samba.org>
(cherry picked from commit c127367b1dd622eeceb1f47de0a047c297dda222)
(cherry picked from commit 0c43f96330f2935805ba4f0f8f858a027a90bc4c)
(cherry picked from commit caaf59383ceabdc555f7db098dae0455dea65023)
commit 68488c6656ce612d808b7fe8ed18885945f57d40
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Oct 22 11:14:10 2008 +0200
s3: libads: use get_dc_name() instead of get_sorted_dc_list() in the LDAP case
We use get_dc_name() for LDAP because it generates the selfwritten
krb5.conf with the correct kdc addresses and sets KRB5_CONFIG.
For CLDAP we need to use get_sorted_dc_list() to avoid recursion.
metze
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Signed-off-by: Günther Deschner <gd at samba.org>
(cherry picked from commit d2f7f81f4d61bae9c4be65cbc1bf962b6c24a31f)
(cherry picked from commit 7f779450cb0b0d9f36665c56c4acd0950daaeab2)
(cherry picked from commit 95c9a0272a72c029d75c3ffd1b5fad360b30f139)
commit 5688fb042aed0cdf63fceb5b50d27d3a8a439947
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Oct 22 10:36:21 2008 +0200
s3: correctly detect if the current dc is the closest one
ads->config.tried_closest_dc was never set.
metze
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Signed-off-by: Günther Deschner <gd at samba.org>
(cherry picked from commit dfe5b00db35e1e7c7bb3ba36729fc3f97eb48db3)
(cherry picked from commit 588f5aae669910fee6da7f807f330163496b4170)
(cherry picked from commit b609f41baa035a15dafb18b2ec569a2b96968b17)
commit 4dac0ab0ba47812ecce7f1c016b7291a3d906f42
Author: Michael Adam <obnox at samba.org>
Date: Fri Aug 29 17:55:28 2008 +0200
libnet_join: streamline logic of libnet_join_post_processing()
Michael
(cherry picked from commit 81cc1af1e699e454fbb1d12636d002f845231006)
(cherry picked from commit 3ea63ec10c37460253fbe68d63576e0cd8783c11)
commit 349707e529d5d695dbc1694ac4ce4c783567d9b2
Author: Michael Adam <obnox at samba.org>
Date: Fri Aug 29 17:43:12 2008 +0200
libnet: fix join by creating keytab after changing the config.
Michael
(cherry picked from commit 96d1c780bf9524b929e6026776602a5288aea73d)
(cherry picked from commit 298e5b663b1d6b469d130041dbed151801a45d1e)
commit 3937e7eb22d05488a8fb7aeb2ee0cab4cfcf6dba
Author: Herb Lewis <hlewis at chomps.localdomain>
Date: Fri Dec 12 13:47:10 2008 -0800
don't return 0 on error - bad for scripts
commit c8ed9c8a76c04fb76d6cdbd1d5fd963edf88868f
Author: SATOH Fumiyasu <fumiyas at osstech.co.jp>
Date: Fri Dec 12 17:43:51 2008 +0100
winbindd: vars for signals must be volatile sig_atomic_t
commit ed92466b51ff942ee993cf5219816b447481bdf3
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Dec 12 14:30:01 2008 +0100
docs: Add hint that "socket address" usually don't need to be set.
This fixes bug #5950.
Thanks to the Debian Samba package maintainers for reporting!
Karolin
(cherry picked from commit 19beef0dd9354296ae79d32077c58fbacf570c85)
(cherry picked from commit 0d035d36bd3707ccb9f77f0b2730869dc78719d4)
(cherry picked from commit 6be19f94802d545cc43286aa242b0ca2e5b79721)
commit f558334d0568b4f117e3d99e2f33c1a23596e59c
Author: Jeff Layton <jlayton at redhat.com>
Date: Fri Dec 12 07:08:30 2008 -0500
mount.cifs: allow mounts to ipv6 capable servers
The current name resolution scheme in mount.cifs is IPv4 only. Expand
it to be protocol-independent. Also take advantage of the fact that
getaddrinfo() returns a list of addresses and have mount.cifs try each
in turn until it hits one that's reachable and allows the socket to
connect.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
commit ef2d876bd4b1f1a7cdabd10ef4f2203ebcbefb63
Author: Karolin Seeger <kseeger at samba.org>
Date: Thu Dec 11 18:08:29 2008 +0100
Samba3-HOWTO: Fix usage of 'net idmap restore'.
This fixes bug #5883.
Karolin
(cherry picked from commit b4a4e635246b88277b235fa343eda48bd4bb4ce3)
(cherry picked from commit 5744177740120524740db884564142df19358ae7)
(cherry picked from commit 7584fe4e8bcbaf73f509d6981a70ff9dde92db1c)
commit 395d2dfc22cf4597cc856d377987320b5af0c0d0
Author: Jeremy Allison <jra at samba.org>
Date: Wed Dec 10 17:04:45 2008 -0800
Make the LookupRid access check match LookupName until
we know the correct bits to use here.
Jeremy.
commit 6aed5a39865cfe25a93fb26d2def1b05a03415ad
Author: Jeremy Allison <jra at samba.org>
Date: Wed Dec 10 15:22:02 2008 -0800
Fix usrmgr opening a user object as non-root.
Jeremy.
commit c2711398c01fce3b1012e6354c5ca4490bced470
Author: Günther Deschner <gd at samba.org>
Date: Sat Nov 29 00:12:26 2008 +0100
s3-libnetjoin: Fix bug #5749. Re-set acctflags while joining. fix from metze.
Guenther
(cherry picked from commit bc3a277455dd4557e796ddc0bef0f52a11f889e7)
commit 3a54593dda3660c61ccc1339417524147b311a5b
Author: Günther Deschner <gd at samba.org>
Date: Sat Nov 29 00:10:18 2008 +0100
s3-libnetjoin: remove unused md4_trust_password, found by metze.
Guenther
(cherry picked from commit f479fdc29813c3452fd22c4a2780f0bc5066e664)
commit 014b7b76728abdcede38b4513af209e3293cc650
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 28 11:15:29 2008 +0100
s3-samr: add init_samr_user_info25 and init_samr_user_info26.
Guenther
commit ba367296556b273e40eb52bae917be71e5c0c534
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 24 18:49:37 2008 +0100
s3-samr: fix init_samr_user_info{23,24} callers.
Guenther
commit e0f7f2d413cd67fe599969a6eb62b5f975000f88
Author: Günther Deschner <gd at samba.org>
Date: Wed Jul 30 19:52:56 2008 +0200
rpc_client: use init_samr_CryptPassword(Ex) in client tools.
Guenther
(cherry picked from commit 97f7f9f21f17e8414de15953cf4eaa9959dc6f75)
commit 4a0d682868a3715e3c52391d3e83d2a6551bb400
Author: Günther Deschner <gd at samba.org>
Date: Fri Jul 18 20:42:55 2008 +0200
rpc_client: add init_samr_CryptPasswordEx and init_samr_CryptPassword.
Guenther
commit 56e5e0487573cbccd5fe43255939f4ae7ece27fa
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 18 17:06:53 2008 +0100
s3: merge german pam_winbind message translations from master.
Guenther
(cherry picked from commit aa0ef2f97d98e7ca80636a4dc8093d2034d0dbf1)
commit 2df31a8f9141a9f580f0804e3109f15b0c60c0b9
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 24 16:32:18 2008 +0100
s3-build: re-run make samba3-idl.
Guenther
(cherry picked from commit c28e83417dc67083b06fb060f5382ceb082bbdcd)
commit 504d3f24007da2923aa6ade0badfeed0e91e771e
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 24 16:31:49 2008 +0100
samr: fix samr_UserInfo24 and samr_UserInfo26.
Guenther
(cherry picked from commit 0315308cbc724bbf54b7767b4af307217833f541)
commit a1874e2cc77844b679a8246d6c15f12f47319fdb
Author: SATOH Fumiyasu <fumiyas at osstech.co.jp>
Date: Tue Dec 9 14:26:39 2008 -0800
Fix bug #5688 LPQ process is orphaned if socket address parameter is invalid
Karolin please pull for 3-2-stable.
Jeremy
commit ef596ec3137358cd80624668fd34ab6ceaf5af07
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue Dec 9 22:08:13 2008 +0100
build-docs: Change to the right directory before calling 'make clean'.
This fixes build-docs if it's called from the create-tarball script.
Karolin
commit cada9200c8e2a54edc5fc36b7d15fb01222e2328
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed Nov 19 13:16:38 2008 +0100
build-docs: Use 'git clean' instead of 'git-clean'.
Karolin
(cherry picked from commit 12e72140b944f844e7f44f21a087ab4a4ecc51a7)
commit 3aecac3692379c0c1241f9f2f5a80fde144a54c1
Author: Günther Deschner <gd at samba.org>
Date: Tue Dec 9 17:28:15 2008 +0100
s3-ldapsam: Fix Bug 5957: do not abort rename process on valid rename script.
Guenther
commit cebf39d4754831002c1d88f5723cc1ca8fd61429
Author: Jeremy Allison <jra at samba.org>
Date: Mon Dec 8 14:02:59 2008 -0800
Fix bug #5953 - smbclient crashes: cli_list_new segmentation fault.
Karolin: must be in 3.2-stable. Thanks,
Jeremy.
commit 7cf4b954c856a2dcbe2929d2573b5fe4ce4fb252
Author: Dan Sledz <dsledz at isilon.com>
Date: Fri Dec 5 17:29:38 2008 -0800
Fix logging to syslog
commit eeb47588ff28ff7e1ca2b1f36a9700ed4485955b
Author: Tomasz Krasuski <kr0tki at poczta.onet.pl>
Date: Fri Dec 5 16:30:55 2008 -0800
Fix bug #5928 - Option --version in testparm does not work.
commit 42342d40dae578caafa936178d1516e7533c9741
Author: Yasuma Takeda <yasuma at osstech.co.jp>
Date: Fri Dec 5 13:38:06 2008 -0800
Fix bug #5944 - nmbd does not boot if socket adress = "" is defined in smb.conf
commit 82af619d9f36ab930402a79683b76b4e729729c8
Author: Volker Lendecke <Volker.Lendecke at SerNet.DE>
Date: Fri Dec 5 13:21:19 2008 -0800
Fix for crash bug freeing a non-malloc'ed buffer if the client sends a non-encrypted packet with the crypto state set.
commit 4fa839f1ac93bdb2362b7fcd8f66b8e005747a86
Author: Jeremy Allison <jra at samba.org>
Date: Thu Dec 4 15:33:27 2008 -0800
Fix bug #5937 - filenames with "*" char hide other files
Jeremy.
commit de7fea4f5c4784969c1d27787af9c19ad546f7b7
Author: Jeremy Allison <jra at samba.org>
Date: Thu Dec 4 10:23:06 2008 -0800
Fix bug #1254 - write list not working under share-level security
Jeremy.
commit f13542d0fa8af67547e0a285f60c5f29678d98a1
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Dec 4 12:26:03 2008 +0100
s3:net: fix password set of 'net rpc trustdom add'
metze
(cherry-picked from commit 2b8f3e253d3a56aac996287f5ce265d0c915b3c8)
(cherry picked from commit e1e76f19cf9c72abe4086965846b2d438cfbdd00)
commit 647233f813ef46b319e5ab43aaac2ac69b3117a6
Author: Tim Prouty <tprouty at samba.org>
Date: Wed Dec 3 10:37:03 2008 -0800
Change sockaddr util function names for consistency and to eliminate name conflicts
commit 2856d6fc872930c6e5129d05223af25df67f0088
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Dec 3 09:07:00 2008 +0100
libwbclient: avoid usage talloc_init() in library code
talloc_init() is a compat function for the old samba3
non-hierachical talloc implementation. It enables
the talloc null tracking which should never be done
by library code.
metze
(cherry picked from commit afa0d6b0b14e0ef2293bd8468ffc1d6330abdb5b)
(cherry picked from commit 37a92ed0eb2c8cf7f3eac1d90ba5300cbce45186)
commit 6241cb36a418f8f7aab3ae86e2e1bfc97b694689
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue Dec 2 20:50:02 2008 +0100
docs: Add default value for "writeable" to man smb.conf.
Karolin
(cherry picked from commit c09e04ac83365333605b7b1db3d07ccfd451a667)
(cherry picked from commit 70c581586ea02fbff4c5dde0ec002b22d472dfc5)
commit 428a77fd2c621e6bd5db638305ce5f70a39e009d
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 1 14:36:57 2008 -0800
s3:selftest: test the streams_depot module as it passes make test
The streams_xattr module only passes sometimes on my laptop.
metze
commit abc0762b47ac766a79f6d37e5a5f6dc7e1d27e1c
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 1 14:28:13 2008 -0800
s3:smbd: close the low level fd of the base_fsp, if the file was created
metze
commit e099dddb13b4d4cb8876d4e418ae86e70b1d3843
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 1 14:26:36 2008 -0800
s3:streams_xattr: fstat should do a stat on the base file
The behavior of stat and fstat should be the same.
metze
commit 3220628383a9126489fc8c30119cdd388f2a4b8f
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 1 14:25:04 2008 -0800
s3:streams_xattr: recheck fsp->fsp_name after a rename
metze
commit a738626624f13412b507e4884070732a464518a8
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 1 14:23:16 2008 -0800
s3:smbd: give the correct error when trying to replace a stream
metze
commit dfc8b845274cfe390952b9afff009164780d76b3
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 1 14:21:43 2008 -0800
s3:vfs: fix FCHMOD_ACL macros
metze
commit 1380286b5abfda56f40b31a82d7619ed36895fe8
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 1 14:19:55 2008 -0800
s3:streams_depot: add an option to disable the xattr checks
streams_depot:check_valid=no is useful when the filesystem
has no xattr support and files are only published via samba.
metze
commit 03d144616a7cd43f33919fddc664ad4a24c8ce99
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 1 14:11:17 2008 -0800
s3:streams_depot: fix valgrind bug lp_parm_const_string() doesn't talloc the default value
metze
commit a1a2a978fa669aa7dff71a3c0551a275de244e64
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 1 14:09:45 2008 -0800
s3:streams_depot: add support for stream renames
metze
commit 44fce98b2c3e1900a2ca25b56c0fcbdf11715ba8
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 1 13:58:14 2008 -0800
s3:streams_depot: map 'file::$DATA' to just 'file'
metze
commit 11d8236dac6615f156f0df423a84e444674916c9
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 1 13:54:19 2008 -0800
s3:streams_xattr: add support for renaming streams
metze
commit 35e31a6c45c69d61be2503581c90138ff88219af
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 1 13:51:59 2008 -0800
s3:smbd: only try and fallback to open a directory if it's not a stream open
metze
commit 3937ada09189bcace81de824fd65de479bfc5136
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 1 13:44:43 2008 -0800
s3:smbd: write times should be set on the base file instead of the stream name
metze
commit 7e33c26777cd86cf1257b9b461c0175c7d5d501f
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 1 13:34:38 2008 -0800
s3:smbd: return DELETE_PENDING on path based operations on streams, when the main file was deleted.
metze
commit ec190c83c5da01c495f42637332c7456cc568aa4
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 1 13:31:06 2008 -0800
s3:smbd: construct the correct newname for stream renames
The Windows Explorer creates temporary streams and renames
them later via SFILEINFO_RENAME_INFO. The newname comes
in as ":Stream:$DATA".
metze
commit 942ce2f3a14795cad2f57d07bf31cea57d3993dc
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 1 13:27:30 2008 -0800
s3:smbd: wildcard characters are allowed in stream names
We only check the filename of the basefile now.
metze
commit c4351e6546f865862a5a6719d2d984192ee37d29
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 1 13:20:56 2008 -0800
s3:smbd: correctly verify stream names to pass RAW-STREAMS
metze
commit 66dc89d5d9d42e03b4ebfa7c2519d7531a70e715
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 1 12:59:25 2008 -0800
s3:smbd: '|' isn't allowed in windows filenames
metze
commit 5c87700c05b2355954c2ee19f031826b8a93aeb3
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 1 17:35:19 2008 +0100
Fix a debug message, append the correct \n
(cherry picked from commit 263c1ca96bd68dced4577a2504073e1140fa26a1)
commit 4ffda19fb21c44adb6e00c1376d1aa046df709cc
Author: Volker Lendecke <vl at samba.org>
Date: Sat Nov 8 17:14:06 2008 +0100
Fix the offset checks in the trans routines
This fixes a potential crash bug, a client can make us read memory we
should not read. Luckily I got the disp checks right...
Volker
(cherry picked from commit 64a1d80851da5b05e70ec6c96f6e9bd473748369)
commit a419c9d1ae9f77a88ac76433273171d86f0bb80d
Author: Andreas Schneider <anschneider at suse.de>
Date: Wed Nov 26 13:19:03 2008 -0800
Fix circular dependency error with autoconf 2.6.3.
Signed-off-by: Andreas Schneider <anschneider at suse.de>
commit f8fc0dd92f240379ac3f131ddcc151a7808e750a
Author: Jeremy Allison <jra at samba.org>
Date: Tue Nov 25 15:55:46 2008 -0800
Fix bug #5914 - Build failure: redefinition of struct name_list
Jeremy.
commit 07cafba0d50b0e42404dc8525baf2b4f4b270d41
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 25 12:19:35 2008 +0100
s3-samr: fix _samr_LookupNames return code.
Guenther
(cherry picked from commit dc7c2d63b3ce142959aa863f000fa9140de99eb0)
commit 2f8fef8378096e7091b1d49d9d76f94508ae714b
Author: Michael Adam <obnox at samba.org>
Date: Tue Nov 25 15:23:31 2008 +0100
zfsacl: return is not a function.
Michael
commit fb93c55a5bc08f2b99052a0582a824944b39ce1c
Author: Nils Goroll <nils.goroll at hamburg.de>
Date: Mon Nov 17 01:06:28 2008 +0100
zfsacl: Prevent calling POSIX ACL vfs methods on zfs share.
This is a proposed fix for Bugs #5135 and #5446.
Signed-off-by: Michael Adam <obnox at samba.org>
commit ea17d18ceb3aefefa77b46bf774d63070088b994
Author: Dan Sledz <dsledz at isilon.com>
Date: Sun Nov 16 17:40:03 2008 -0800
[PATCH] Allow SYSLOG_FACILITY to be modified with a new configure option called --with-syslog-facility
commit b9926005bf80af5326d09181d074d885e9182aac
Author: Jeremy Allison <jra at samba.org>
Date: Mon Nov 24 15:29:17 2008 -0800
Fix bug #5873 - ACL inheritance cannot be broken. This regresses #4308, but that will have to
be fixed another way.
Jeremy.
commit c447f09592d68c26c566d8f6a7729754fb8110dc
Author: Jeremy Allison <jra at samba.org>
Date: Fri Nov 21 22:44:23 2008 -0800
Revert c76e4791d3ae4f180fba209c29bd3774c00858cf - "Fix the logic bug that caused us to run into kernel oplocks on an open for a stream inside a file with stream_xattr module. On opening the base_fsp we must break existing oplocks." as it broke make test.
Jeremy.
commit f9b806f3cfe10f577bbe9efd00836b3ff89727a6
Author: Jeremy Allison <jra at samba.org>
Date: Fri Nov 21 18:19:13 2008 -0800
Fix the logic bug that caused us to run into kernel oplocks on an open for a stream inside a file with stream_xattr module. On opening the base_fsp we must break existing oplocks.
Jeremy.
commit 8526f8c7cd6a5ae924f89fe38c977cca0b1c58f5
Author: Dan Sledz <dsledz at isilon.com>
Date: Fri Nov 14 18:41:17 2008 -0800
[PATCH] FreeBSD configure check for backtrace_symbols
On FreeBSD backtrace_symbols is defined in libexecinfo.so.1. Look for it
there as well.
commit 32fe49c7d714597b668ffcae8d723f45a54c1fb7
Author: Jeremy Allison <jra at samba.org>
Date: Fri Nov 21 16:04:31 2008 -0800
Use fxattr calls whenever possible (trying to work around the strange Linux kernel oplock bug).
Jeremy.
commit 6a84b691bbbbd96637b7252d3c7f0680ec01f182
Author: Michael Adam <obnox at samba.org>
Date: Fri Nov 21 23:28:08 2008 +0100
winbindd: make all winbind rpc-methods static.
Now that the methods are no longer needed in winbindd_ads,
we can make them static again.
Michael
commit 5ba948ef97979e2d7fcbbbb5a8668bfff847afde
Author: Michael Adam <obnox at samba.org>
Date: Fri Nov 21 02:24:06 2008 +0100
winbindd_ads: use the reconnect methods instead of the rpc methods directly
Some of the ads methods just point to the rpc methods.
This makes winbindd_ads use the reconnect methods instead of
calling the rpc methods directly in order to prevent
negative cache entries for e.g. name_to_sid, when the dc
has closed the connection without sending a reset.
Michael
commit 3d8b047c078b2e77913f35d678c62c52dcf2fac2
Author: Michael Adam <obnox at samba.org>
Date: Thu Nov 20 23:26:35 2008 +0100
winbindd_ads: prevent negative GM/ cache entries due to broken connections
The ads lookup_groupmem() function calls lda_lookupsids to resolve sids
to names. This is tried only once. So in case the connection was broken,
e.g. closed by the server (without a reset packet), there will be an empty
GM/ cache entry for the requested group which will prevent proper working
of access checks among other checks for the expiry period.
This patch works around this problem by retrying once if the lsa_lookupsids
call fails, re-establishing the dc-connection, as we already do in many other
places (e.g. the winbindd retry methods for the rpc layer).
Michael
commit 2be5abc931e2df157c713db0f1034c2911a0c2ac
Author: Jeremy Allison <jra at samba.org>
Date: Fri Nov 21 12:32:11 2008 -0800
Second part of the fix for bug #5903 - vfs_streams_xattr breaks contents of the file
Jeremy.
commit 286bc9a5f22401cd1efd4c7c723e0fe6181a8bba
Author: Jeremy Allison <jra at samba.org>
Date: Fri Nov 21 11:06:33 2008 -0800
Ensure we always reply in reply_printopen().
Jeremy.
commit 3473f5b5be9fafa39a01c65fa7714be4b5a06898
Author: Jeremy Allison <jra at samba.org>
Date: Fri Nov 21 10:46:31 2008 -0800
First part of fix for bug #5903 - vfs_streams_xattr breaks contents of the file.
Restructures parts of open code so that fsp must be allocated before calling
open_file_ntcreate(_internal). Also fix up file ref-counting inside files.c.
Jeremy.
commit 4f4ff7f2b41b49f9c99b711a8810be1b4f5bfb62
Author: Yasuma Takeda <yasuma at osstech.co.jp>
Date: Thu Nov 20 11:36:51 2008 -0800
Fix bug #5909 - MS-DFS does not work on Vista, if link name includes multibyte character.
commit 734157a81b3bbe56daf55a4f618c05f08013de42
Author: Jeremy Allison <jra at samba.org>
Date: Thu Nov 20 10:55:23 2008 -0800
Second part of fix for bug #5891 - smbd crashed when viewing the eventlog exported by "eventlog list". Don't leak memory on error paths.
Jeremy.
commit 8f55fe6b3b1d4ac8453b628df53808f3f0ee25de
Author: Michael Adam <obnox at samba.org>
Date: Thu Nov 20 16:31:44 2008 +0100
eventlog: don't crash in sync_eventlog_params().
When freeing the talloc ctx at the end of the routine,
it must be a talloc ctx created inside. talloc_tos() needs
to be valid after the function finishes, since callers
(may) have data attached to it.
Michael
Signed-off-by: Günther Deschner <gd at samba.org>
(cherry picked from commit 113c5d28edabdd17a2507e68aad612aa21c758f3)
commit 9b1c643c6274f0c6bc7ff85d155f11ca68151a61
Author: Jeremy Allison <jra at samba.org>
Date: Wed Nov 19 16:48:53 2008 -0800
This code mixes up int and uint32 when pulling out of a TDB. This is very bad. Fixing... May fix bug #5891, not sure.
Jeremy.
commit beebf20aef1f1214eb04abb7179f9129833c7449
Author: Jeremy Allison <jra at samba.org>
Date: Wed Nov 19 11:31:05 2008 -0800
Fix error in commit for bugfix "Fix bug #5904 - libnss_wins causes SIGABRT while servicing getaddrinfo() request."
Jeremy.
commit e325e09705693c276a4ff47a89c47d5825efc7d4
Author: Jeremy Allison <jra at samba.org>
Date: Wed Nov 19 11:23:11 2008 -0800
Fix bug #5904 - libnss_wins causes SIGABRT while servicing getaddrinfo() request.
Jeremy.
commit 97835b3a6e6b4a9660863b09270fe1482253ae5b
Author: Steven Danneman <steven.danneman at isilon.com>
Date: Sat Nov 15 13:07:15 2008 -0800
Fix extended DN parse error when AD object does not have a SID.
Some AD objects, like Exchange Public Folders, can be members of Security
Groups but do not have a SID attribute. This patch adds more granular return
errors to ads_get_sid_from_extended_dn(). Callers can now determine if a parse
error occured because of bad input, or the DN was valid but contained no SID.
I updated all callers to ignore SIDless objects when appropriate.
Also did some cleanup to the out paths of lookup_usergroups_memberof()
commit 2fb234850debab8d3c503cafedcbaaf073047a0b
Author: Steven Danneman <steven.danneman at isilon.com>
Date: Fri Nov 14 19:16:12 2008 -0800
Whitespace and >80 column cleanups.
Signed-off-by: Michael Adam <obnox at samba.org>
commit f4562c5fd116088abc1c24317a88df81aa8b814b
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 18 23:10:22 2008 +0100
Fix Bug #5898. ("net rpc shutdown" fails).
Guenther
commit 8e7d76af82e9eb851691c4b75bf2d2ccf8c59141
Author: Dina Fine <dina at exanet.com>
Date: Tue Nov 18 12:44:19 2008 -0800
Fix bug #5908 - Samba 3.0.32 - internal change notify on share directory fails"
commit 06c47580220f7a8a8b056c4de7180ac92423b099
Author: Kai Blin <kai at samba.org>
Date: Tue Nov 18 16:31:34 2008 +0100
libsmb: Fix up pointer passed to cli_send_trans in cli_link_internal
Seems like this one fell victim to the pstring removal. The other callers seem
to be fine, even though removing the casts would make the code less confusing.
commit 4dc8a05a755c6d5dcad8a98f9d4dec9501c2e059
Author: Davide Sfriso <sfriso at virgilio.it>
Date: Mon Nov 17 15:40:43 2008 -0800
Fix bug #5906 when running winbindd on a Samba PDC. Winbindd crash on 'getent group'.
commit de2872cff70cb609ba2461afc8d48d64b2321ffa
Author: Jeremy Allison <jra at samba.org>
Date: Mon Nov 17 14:05:55 2008 -0800
When clearing out vuid cache remember to set entries = 0.
Jeremy.
commit 35ba453bbbe4cb8f9568801f48cc8ca1ba92f133
Author: Jeremy Allison <jra at samba.org>
Date: Mon Nov 17 13:46:35 2008 -0800
Fix bug #5900 reported by monyo at samba.gr.jp - vfs_readonly.so does not work.
Jeremy.
commit 0ef4fc86da0f8d21571b40cba9df057787d2b7ee
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 15:23:34 2008 +0100
s3 create-tarball.sh: Remove dashes in git commands.
Newer git versions (e.g. 1.6.0.2) do not provide the 'git-' commands
any longer.
Karolin
(cherry picked from commit 0cba859f12177aaf3ef2d96663f0a51f61c24d56)
(cherry picked from commit 3d64e67de2b50f7b781aa3f5ad13ec8e866d4333)
(cherry picked from commit aa41a80969bd413d5922c602c7309bd8c05f3181)
commit 2b71cc546572527d457e8b2a173269991874b2cc
Author: Carsten Dumke <carsten at cdumke.de>
Date: Thu Nov 13 12:05:00 2008 -0600
net: Fix documentation of net rap printq info
The man-page (see net(8)) and the usage-info (call "net help rap printq") of
'net rap printq' do contain an option "list" but in net_rap.c
the option is named "info".
Rename the option "list" in the documentation (man-pages + usage) to "info" to
match the code.
Signed-off-by: Kai Blin <kai at samba.org>
commit 060d41a708eb3f0f586491fb48e92a3bdd63c885
Author: TAKAHASHI Motonobu <monyo at samba.gr.jp>
Date: Sun Nov 16 13:17:16 2008 +0100
Fix bug 5901: Default for streams_depot location
commit 5bcd62d78283c1e47ab76562f433dd9c2e125c73
Author: Günther Deschner <gd at samba.org>
Date: Tue Jul 15 23:05:13 2008 +0200
fix build warning.
Guenther
(This used to be commit 507660706901a79544d436046127947e4baa7e52)
(cherry picked from commit 1939177582867fb54a416f3ea979ebd8d4335885)
commit ff411ce81a743128474fb64b5521d92bf3231f50
Author: Volker Lendecke <vl at samba.org>
Date: Fri Nov 14 13:42:54 2008 +0100
Make memcache_add_talloc NULL out the source pointer
This is an orthogonality measure to make clear this pointer now belongs to the
cache.
commit 780a9f97ac62345ceb863746cdf4897bd42f15b1
Author: Volker Lendecke <vl at samba.org>
Date: Thu Nov 13 23:50:19 2008 +0100
Actually finish memcache_add_talloc
This fixes a memleak found by Martin Zielinski <mz at seh.de>. Thanks for
looking closely!
Volker
commit 084c053d84a1152d22e3a8785dbca2546cc7bb70
Author: Volker Lendecke <vl at samba.org>
Date: Sat Jun 14 10:59:11 2008 +0200
Use the correct cups-devel test for HAVE_IPRINT also
(cherry picked from commit a42d7e1146e7469062ead2c8f22f549a48154e03)
commit 3480841d13ffdb94029c821004c7ca4274a021c9
Author: Volker Lendecke <vl at samba.org>
Date: Sat Jun 14 10:31:11 2008 +0200
Correctly check for presence of cups-devel
On SuSE at least cups-config belongs to cups-libs which does not contain the
headers which are in cups-devel.
(cherry picked from commit 2408d2493f7c6e0beee58febd547516bbeb0929d)
commit fd5d2ca513ab1000f67405b2fa4fb5da05c76164
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 14 17:53:29 2008 +0100
make some more parts of security.idl public and re-run make idl.
Guenther
commit 4ecf7415d36195880fbe8c3912b3d2ff30910d58
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 14 16:12:34 2008 +0100
re-run make idl.
Guenther
(cherry picked from commit 19568f4e4e94266a7792e6dce8eaa5086f435fc3)
commit 43f480d4336397c13bc64bad8ea5be062199222c
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Nov 7 10:49:59 2008 +0100
security.idl: sometimes ACEs have some padding at the end
metze
(cherry picked from commit 2dc120377baec2c8b7c9b6fe40d15218588c97fd)
commit a946a9f8491f0d89cf92914fbd0f034d1cb27a30
Author: Volker Lendecke <vl at samba.org>
Date: Fri Nov 14 13:13:40 2008 +0100
Rename some variables in getpwnam_alloc() for clarity
commit ca345a8435ae346fadccfebc37f1efe05ebcd9b9
Author: Volker Lendecke <vl at samba.org>
Date: Fri Nov 14 12:49:18 2008 +0100
sys_pwnam doesn't return talloced memory, so don't mix up the returned struct.
commit 0c8d47a29bb4e69a002be4538f071e7efa4c1883
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 13 21:11:12 2008 +0100
re-run make idl.
Guenther
(cherry picked from commit 86deff8d6e6b8e094b15a4e5392098d9b23e5ff5)
commit 1fdfa43871fc7e0a5fcfeae351c871d05bdb9790
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 13 21:11:31 2008 +0100
Fix PNP_GetHwProfInfo() (fixes Bug: #5888).
Guenther
(cherry picked from commit 111ec984729fe2c47e173dab82f438bcacf42d1c)
commit da7fe0076bccc495c3e9091ce55e7854862f7b5a
Author: Jeremy Allison <jra at samba.org>
Date: Wed Nov 12 19:26:58 2008 -0800
Pretty print out SD's on get/set.
Jeremy.
commit 969438a3cc622ded1045b69a69195dc33dc3c9cf
Author: Jeremy Allison <jra at samba.org>
Date: Wed Nov 12 14:03:54 2008 -0800
Fix memory leak in error path, spotted by Martin Zielinski <mz at seh.de>.
Jeremy.
commit 6ee5961368a34fd1772a65accc03bb7920834a45
Author: Jeremy Allison <jra at samba.org>
Date: Tue Nov 11 14:38:36 2008 -0800
Fix bug 5891] : smbd crashed when viewing the eventlog exported by "eventlog list"
Don't mix TALLOC and SAFE_FREE().
Jeremy.
commit 94d3b4e8b6c869ca77a4356af8dec1b2025830a3
Author: Jeremy Allison <jra at samba.org>
Date: Tue Nov 11 14:20:53 2008 -0800
Fix bug 5889. "delete veto files = no" seems to break.
Jeremy.
commit 1373c593b21a5b0c40312610ba8dadfdafbfa479
Author: Kai Blin <kai at samba.org>
Date: Fri Nov 7 09:50:33 2008 +0100
ntlm_auth: Put huge NTLMv2 blobs into extra_data on CRAP auth
This fixes bug #5865
commit 3975b5b007c17295a2247b7595e8aef5810bafd2
Author: Jeff Layton <jlayton at redhat.com>
Date: Thu Nov 6 15:15:57 2008 -0500
mount.cifs: use lock/unlock_mtab scheme from util-linux-ng mount prog
The util-linux-ng sources have a good, but rather complex scheme for
locking the mtab before updating it. Mount helpers need to follow the
same scheme. Advisory locking only works if everyone is using the same
locking scheme.
Copy the routines we need from util-linux-ng into a separate source file
and then have mount.cifs and umount.cifs link in this object.
The long term goal is to have these routines in a separate helper
library (libmount). Mount helpers can then dynamically link in that lib.
Until that happens, this should serve as a suitable stopgap solution.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
commit 2f9003f68460ffabcbebb3cadd8df7a58aa1b05b
Author: Jeremy Allison <jra at samba.org>
Date: Thu Nov 6 06:40:35 2008 -0800
Fix bug #5825 - Account locking out doesnt work with an LDAP backend.Based on a problem found by Boyang. Only the pdb_nds backend implements login attempts so this was broken for tdbsam and ldap.
Jeremy.
commit 2165fa2b8aeca11ed8369b7ab2daeef6038b2584
Author: Jeremy Allison <jra at samba.org>
Date: Wed Nov 5 19:11:53 2008 -0800
Add reference to bug #4308 to remind me to add regression test to smbtorture.
Jeremy.
commit ae7f02de51be91bb0019e7021e5e8b8576ca6797
Author: Joe Smith <yasumoto7 at gmail.com>
Date: Tue Nov 4 20:31:04 2008 +0100
Fixed typo in source/utils/net_rap.c
commit aaf654d87828cf1917463e0434b80d21e255413e
Author: Volker Lendecke <vl at samba.org>
Date: Tue Nov 4 04:33:36 2008 -0800
Ignore 3.0 style invalid group mappings during upgrade to ldb
commit 8eeed96539f52ef8be639c472fe660d38afa196f
Author: Volker Lendecke <vl at samba.org>
Date: Mon Nov 3 17:09:40 2008 +0100
Fix bug triggered by the RAW-SAMBA3OPLOCKLOGOFF test
commit f16d39c6f689644712c41e5bb73b31a307bd32db
Author: Volker Lendecke <vl at samba.org>
Date: Sun Nov 2 10:28:00 2008 +0100
Fix bug 5860: safe_strcpy gives a nasty error message for overlong strings
Thanks to Robert Dahlem <Robert.Dahlem at gmx.net> for reporting this!
commit 42b104cea13673c30a1dde676fc4a7ce1a81f44d
Author: Andrew Tridgell <tridge at samba.org>
Date: Thu Oct 30 12:32:06 2008 -0700
use glibc sys/inotify.h header
when we first added the inotify code glibc didn't have the inotify
functions yet. Now that it does we can use the official header and
avoid the asm/unistd.h syscall workaround
commit 33b724007e5f0d55baced1469518d43414940bc7
Author: Günther Deschner <gd at samba.org>
Date: Mon Aug 25 11:36:56 2008 +0200
auth: Fix build warning.
Guenther
(cherry picked from commit 4661ef625a6522d6f859b83e3e3702f01d0b952f)
(cherry picked from commit 60649a74cdf2594bc89c301025f86d23caba91c2)
commit 201ddf856380d9e40950c4aba1387d5377fb6eef
Author: Jeremy Allison <jra at samba.org>
Date: Wed Oct 29 17:07:54 2008 -0700
Fix CID: 456 - resource leak on function exit.
Jeremy.
commit 984cbab649209bb056bb400efbf0c32fd75d6263
Author: Jeremy Allison <jra at samba.org>
Date: Wed Oct 29 16:43:29 2008 -0700
Fix CID 606 - failed to return -1 after socket() fail.
Jeremy.
commit 0a31181386a147118b843ee15fb48b7d7c872263
Author: Jeremy Allison <jra at samba.org>
Date: Wed Oct 29 16:28:04 2008 -0700
Fix CID 574 - tidies up the code expression.
Jeremy.
commit 9da090c51117ff83cdceb21b1765d7b4b46733d7
Author: Jeremy Allison <jra at samba.org>
Date: Wed Oct 29 16:02:16 2008 -0700
Coverity fix CID: 592 - null deref (can't happen but doesn't hurt to be sure).
Jeremy.
commit a5c00c541b6397a528363c11da5d11384a9715cc
Author: Jeremy Allison <jra at samba.org>
Date: Wed Oct 29 15:54:57 2008 -0700
Coverity fix #CID: 607 - resource leak on error path.
Jeremy.
commit 50210aacec0b6e2f70153a38e48c418f7d81c66c
Author: Michael Adam <obnox at samba.org>
Date: Mon Oct 27 14:28:44 2008 +0100
winbind: fix smbd hanging on Solaris when winbindd closes socket.
On some versions of Solaris, we observed a strange effect of close(2)
on a socket: After the server (here winbindd) called close, the client fd
was not marked as readable for select. And a write call to the fd did
not produce an error EPIPE but just returned as if successful.
So while winbindd had called remove_client(), the corresponding smbd
still thought that it was connected, but failed to retrieve answers
for its queries.
This patch works around the problem by forcing the client fd to
the readable state: Just write one byte into the socket before
closing.
Michael
commit 102269a986c12492d0606fc96c4f0ccd3cece47f
Author: Michael Adam <obnox at samba.org>
Date: Mon Oct 27 13:50:27 2008 +0100
build: fix bug #5765 - fix installlibs on solaris by using portable "test -r"
instead of test -e, which /bin/sh on solaris does not know.
Michael
commit 5224c79a02d218b1af4eb149205e1bbf472592b5
Author: Michael Adam <obnox at samba.org>
Date: Mon Oct 27 12:59:11 2008 +0100
build: fix bug #5677 - fix test_{shlibs,nss_modules,pam_modules} on Solaris
and other systems where sh does not support "export FOO=bar"
by separating setting and exporting the variable.
Thanks to Yasuma Takeda <yasuma at osstech.co.jp> for the patch.
Michael
commit a26167e96c52017e772d674b0d307e49398112b8
Author: Derrell Lipman <derrell.lipman at unwireduniverse.com>
Date: Fri Oct 24 11:35:10 2008 -0400
Error return is boolean false, not -1
- There were a few places in SMBC_getatr() that returned -1 instead of a
boolean. -1 was intended to mean error, but that's what False/false is for,
and the usages of this function assume that it returns a boolean false as
the error condition.
- per Jelmer's request, use false vs. False in new code, even if not making
changes globally.
Derrell
commit 19d16c580dfb53107b8671da32ef0816fbe8179e
Author: Günther Deschner <gd at samba.org>
Date: Thu Oct 23 03:31:32 2008 +0200
s3-samr-server: unify callback convention: _samr_UserSetInfo.
Guenther
(cherry picked from commit aa301e82d0c44c6a733e8be2546d661ea56512ef)
commit 854a6ac1d27b560aa3ec515d3cd5e60a8bcfa46e
Author: Günther Deschner <gd at samba.org>
Date: Thu Oct 23 03:30:58 2008 +0200
s3-samr-server: unify callback convention: _samr_QueryDomainInfo.
Guenther
(cherry picked from commit ac2c35bc379de83091644455dbeba0bea3e5ceb6)
commit 4ebae9dc4f9807cacb84c8ba005eec868b84cf17
Author: Günther Deschner <gd at samba.org>
Date: Thu Oct 23 03:30:14 2008 +0200
s3-samr-server: fix return code in _samr_QueryDisplayInformation.
Guenther
(cherry picked from commit 30fa6c3ba19a8f816043405ba5d9eec84dd1c97b)
commit 86bb35198c2676833468b7e0414e8a098cad9d75
Author: Jeremy Allison <jra at samba.org>
Date: Thu Aug 14 12:33:17 2008 -0700
Revert the 4d83924470b267f2267abd62a3be2ac3ae373d7b change. The server_info struct *must* own the ptok pointer inside it.
Jeremy.
commit d8423a3142277b65451f73da56373adb58f110a8
Author: Herb Lewis <herb at samba.org>
Date: Thu Aug 14 12:19:36 2008 -0700
use correct argument
-----------------------------------------------------------------------
Summary of changes:
docs-xml/Samba3-HOWTO/TOSHARG-TheNetCommand.xml | 2 +-
docs-xml/manpages-3/idmap_ad.8.xml | 8 +-
docs-xml/manpages-3/net.8.xml | 2 +-
docs-xml/smbdotconf/misc/socketaddress.xml | 12 +-
docs-xml/smbdotconf/security/writeable.xml | 2 +
release-scripts/build-docs | 4 +-
release-scripts/create-tarball | 8 +-
source/Makefile.in | 27 +-
source/VERSION | 4 +-
source/auth/pampass.c | 5 +-
source/auth/token_util.c | 6 +-
source/client/client.c | 2 +-
source/client/mount.cifs.c | 235 +++++++++-------
source/client/mount.h | 38 +++
source/client/mtab.c | 219 +++++++++++++++
source/client/umount.cifs.c | 22 +--
source/configure.in | 41 +++-
source/groupdb/mapping_ldb.c | 7 +
source/include/ads.h | 1 -
source/include/vfs_macros.h | 6 +-
source/lib/debug.c | 2 +-
source/lib/interface.c | 10 +-
source/lib/memcache.c | 31 ++-
source/lib/popt_common.c | 2 +-
source/lib/readline.c | 1 +
source/lib/replace/autoconf-2.60.m4 | 2 +
source/lib/util_pw.c | 26 +-
source/lib/util_sock.c | 14 +-
source/lib/xfile.c | 25 ++-
source/libads/kerberos.c | 6 +-
source/libads/ldap.c | 123 ++++++---
source/libads/ndr.c | 1 -
source/libnet/libnet_join.c | 107 ++++----
source/librpc/gen_ndr/cli_ntsvcs.c | 8 +-
source/librpc/gen_ndr/cli_ntsvcs.h | 4 +-
source/librpc/gen_ndr/ndr_ntsvcs.c | 46 ++--
source/librpc/gen_ndr/ndr_samr.c | 12 +-
source/librpc/gen_ndr/ndr_security.c | 31 +--
source/librpc/gen_ndr/ndr_security.h | 6 +
source/librpc/gen_ndr/ntsvcs.h | 10 +-
source/librpc/gen_ndr/samr.h | 4 +-
source/librpc/gen_ndr/security.h | 4 +-
source/librpc/idl/ntsvcs.idl | 10 +-
source/librpc/idl/samr.idl | 4 +-
source/librpc/idl/security.idl | 8 +-
source/librpc/ndr/ndr_sec_helper.c | 31 ++
source/libsmb/cliconnect.c | 2 +-
source/libsmb/clidfs.c | 4 +-
source/libsmb/clifile.c | 2 +-
source/libsmb/clilist.c | 2 +-
source/libsmb/clirap2.c | 7 +-
source/libsmb/dsgetdcname.c | 49 +++-
source/libsmb/libsmb_file.c | 6 +-
source/libsmb/libsmb_server.c | 6 +-
source/libsmb/namequery.c | 87 ++++++-
source/libsmb/namequery_dc.c | 4 +-
source/libsmb/smb_seal.c | 7 +
source/locale/pam_winbind/de.po | 181 ++++++++++++
source/modules/vfs_readonly.c | 9 +
source/modules/vfs_smb_traffic_analyzer.c | 1 +
source/modules/vfs_streams_depot.c | 121 ++++++++-
source/modules/vfs_streams_xattr.c | 339 +++++++++++++++++++++--
source/modules/vfs_zfsacl.c | 83 ++++++
source/nsswitch/libwbclient/wbc_sid.c | 12 +-
source/nsswitch/winbind_struct_protocol.h | 4 +-
source/nsswitch/wins.c | 63 ++++-
source/param/loadparm.c | 16 +-
source/passdb/pdb_interface.c | 18 +-
source/passdb/pdb_ldap.c | 2 +-
source/printing/printfsp.c | 15 +-
source/printing/printing.c | 39 +++-
source/rpc_client/init_samr.c | 144 +++++++++-
source/rpc_server/srv_eventlog_lib.c | 42 ++--
source/rpc_server/srv_eventlog_nt.c | 20 +-
source/rpc_server/srv_samr_nt.c | 120 ++++-----
source/rpcclient/rpcclient.c | 2 +-
source/script/tests/selftest.sh | 2 +-
source/smbd/close.c | 8 +-
source/smbd/fake_file.c | 1 -
source/smbd/files.c | 82 +++---
source/smbd/ipc.c | 6 +-
source/smbd/mangle.c | 2 +-
source/smbd/msdfs.c | 12 +-
source/smbd/notify.c | 3 +
source/smbd/notify_inotify.c | 10 +-
source/smbd/nttrans.c | 16 +-
source/smbd/open.c | 206 +++++++++-----
source/smbd/posix_acls.c | 10 +-
source/smbd/process.c | 1 +
source/smbd/reply.c | 73 +++++-
source/smbd/server.c | 5 +-
source/smbd/share_access.c | 8 +-
source/smbd/trans2.c | 116 ++++++--
source/smbd/uid.c | 54 ++++-
source/smbd/vfs.c | 8 +-
source/torture/locktest.c | 4 +-
source/torture/masktest.c | 4 +-
source/torture/torture.c | 35 +++-
source/utils/net.c | 2 +-
source/utils/net_ads.c | 2 +-
source/utils/net_rap.c | 4 +-
source/utils/net_rpc.c | 32 +-
source/utils/net_rpc_join.c | 12 +-
source/utils/net_status.c | 44 ++--
source/utils/ntlm_auth.c | 18 +-
source/utils/smbcacls.c | 4 +-
source/utils/smbcquotas.c | 2 +-
source/utils/smbfilter.c | 2 +-
source/utils/smbtree.c | 16 +-
source/winbindd/winbindd.c | 31 ++-
source/winbindd/winbindd_ads.c | 229 ++++++++++++----
source/winbindd/winbindd_cm.c | 2 +-
source/winbindd/winbindd_dual.c | 2 +-
source/winbindd/winbindd_pam.c | 25 ++-
source/winbindd/winbindd_passdb.c | 5 +-
source/winbindd/winbindd_rpc.c | 63 +++--
116 files changed, 2794 insertions(+), 953 deletions(-)
create mode 100644 source/client/mount.h
create mode 100644 source/client/mtab.c
create mode 100644 source/locale/pam_winbind/de.po
Changeset truncated at 500 lines:
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-TheNetCommand.xml b/docs-xml/Samba3-HOWTO/TOSHARG-TheNetCommand.xml
index b2b3ebd..d189582 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-TheNetCommand.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-TheNetCommand.xml
@@ -1850,7 +1850,7 @@ net idmap dump /var/lib/samba/winbindd_idmap.tdb > idmap_dump.txt
<para>
The IDMAP dump file can be restored using the following command:
<screen>
-net idmap restore <full_path_and_tdb_filename> < dumpfile.txt
+net idmap restore idmap_dump.txt
</screen>
Where the Samba run-time tdb files are stored in the <filename>/var/lib/samba</filename> directory
the following command can be used to restore the data to the tdb file:
diff --git a/docs-xml/manpages-3/idmap_ad.8.xml b/docs-xml/manpages-3/idmap_ad.8.xml
index fb0792e..2622b7b 100644
--- a/docs-xml/manpages-3/idmap_ad.8.xml
+++ b/docs-xml/manpages-3/idmap_ad.8.xml
@@ -23,8 +23,8 @@
extensions. This module implements only the "idmap"
API, and is READONLY. Mappings must be provided in advance
by the administrator by adding the posixAccount/posixGroup
- classess and relative attribute/value pairs to the users and
- groups objects in AD</para>
+ classes and relative attribute/value pairs to the user and
+ group objects in the AD.</para>
</refsynopsisdiv>
<refsect1>
@@ -34,7 +34,7 @@
<varlistentry>
<term>range = low - high</term>
<listitem><para>
- Defines the available matching uid and gid range for which the
+ Defines the available matching UID and GID range for which the
backend is authoritative. Note that the range acts as a filter.
If specified any UID or GID stored in AD that fall outside the
range is ignored and the corresponding map is discarded.
@@ -47,7 +47,7 @@
<listitem><para>
Defines the schema that idmap_ad should use when querying
Active Directory regarding user and group information.
- This can either the RFC2307 schema support included
+ This can be either the RFC2307 schema support included
in Windows 2003 R2 or the Service for Unix (SFU) schema.
</para></listitem>
</varlistentry>
diff --git a/docs-xml/manpages-3/net.8.xml b/docs-xml/manpages-3/net.8.xml
index cdf0fbb..876992d 100644
--- a/docs-xml/manpages-3/net.8.xml
+++ b/docs-xml/manpages-3/net.8.xml
@@ -395,7 +395,7 @@ current network.</para>
<title>RAP PRINTQ</title>
<refsect3>
-<title>RAP PRINTQ LIST <replaceable>QUEUE_NAME</replaceable></title>
+<title>RAP PRINTQ INFO <replaceable>QUEUE_NAME</replaceable></title>
<para>Lists the specified print queue and print jobs on the server.
If the <replaceable>QUEUE_NAME</replaceable> is omitted, all
diff --git a/docs-xml/smbdotconf/misc/socketaddress.xml b/docs-xml/smbdotconf/misc/socketaddress.xml
index 7566380..17018ef 100644
--- a/docs-xml/smbdotconf/misc/socketaddress.xml
+++ b/docs-xml/smbdotconf/misc/socketaddress.xml
@@ -4,12 +4,14 @@
developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
- <para>This option allows you to control what
- address Samba will listen for connections on. This is used to
- support multiple virtual interfaces on the one server, each
+ <para>This option allows you to control what
+ address Samba will listen for connections on. This is used to
+ support multiple virtual interfaces on the one server, each
with a different configuration.</para>
-
- <para>By default Samba will accept connections on any
+ <para>Setting this option should never be necessary on usual Samba
+ servers running only one nmbd.</para>
+
+ <para>By default Samba will accept connections on any
address.</para>
</description>
diff --git a/docs-xml/smbdotconf/security/writeable.xml b/docs-xml/smbdotconf/security/writeable.xml
index f811c47..99678a9 100644
--- a/docs-xml/smbdotconf/security/writeable.xml
+++ b/docs-xml/smbdotconf/security/writeable.xml
@@ -6,4 +6,6 @@
<description>
<para>Inverted synonym for <smbconfoption name="read only"/>.</para>
</description>
+
+<value type="default">no</value>
</samba:parameter>
diff --git a/release-scripts/build-docs b/release-scripts/build-docs
index 53500d7..b80a7fb 100755
--- a/release-scripts/build-docs
+++ b/release-scripts/build-docs
@@ -4,7 +4,7 @@ DOCSRCDIR=`dirname $0`/../docs-xml
cd $DOCSRCDIR || exit 1
-git-clean -d -x -f
+git clean -d -x -f
autoconf && \
./configure --with-papersize=letter && \
make smbdotconf/parameters.all.xml && \
@@ -25,7 +25,7 @@ cd ../docs || exit 1
mv manpages-3 manpages
mv htmldocs/manpages-3 htmldocs/manpages
-cd $DOCSRCDIR || exit 1
+cd ../docs-xml || exit 1
make clean
exit
diff --git a/release-scripts/create-tarball b/release-scripts/create-tarball
index 3463f01..da39d89 100755
--- a/release-scripts/create-tarball
+++ b/release-scripts/create-tarball
@@ -137,7 +137,7 @@ function createReleaseTag
return 0
fi
- if [ "x`git-tag -l ${OPT_TAG}`" != "x" ]; then
+ if [ "x`git tag -l ${OPT_TAG}`" != "x" ]; then
echo -n "Tag exists. Do you wish to overwrite? (y/N): "
read answer
@@ -155,7 +155,7 @@ function createReleaseTag
fi
fi
- git-tag -u ${OPT_KEYID} ${OPT_TAG}
+ git tag -u ${OPT_KEYID} ${OPT_TAG}
exitOnError $? "Failed to create tag"
return 0
@@ -170,7 +170,7 @@ function main
cd $TOPDIR
- git-checkout ${OPT_BRANCH}
+ git checkout ${OPT_BRANCH}
exitOnError $? "Invalid branch name \"${OPT_BRANCH}\""
(cd source && ./script/mkversion.sh)
@@ -188,7 +188,7 @@ function main
echo "Creating release tarball for Samba $version"
/bin/rm -rf ../samba-${version}
- git-archive --format=tar --prefix=samba-${version}/ HEAD | (cd .. && tar xf -)
+ git archive --format=tar --prefix=samba-${version}/ HEAD | (cd .. && tar xf -)
exitOnError $? "Failed to create release directory tree"
pushd ../samba-${version}
diff --git a/source/Makefile.in b/source/Makefile.in
index 0c98a2b..3c1adaa 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -854,9 +854,9 @@ CUPS_OBJ = client/smbspool.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
$(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) \
$(LIBNDR_GEN_OBJ0)
-CIFS_MOUNT_OBJ = client/mount.cifs.o
+CIFS_MOUNT_OBJ = client/mount.cifs.o client/mtab.o
-CIFS_UMOUNT_OBJ = client/umount.cifs.o
+CIFS_UMOUNT_OBJ = client/umount.cifs.o client/mtab.o
CIFS_UPCALL_OBJ = client/cifs.upcall.o
@@ -1580,7 +1580,7 @@ installlibtalloc:: installdirs libtalloc
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
-$(INSTALLLIBCMD_SH) $(LIBTALLOC_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
@rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)`
- -if test -e $(LIBTALLOC_SHARED_TARGET_SONAME) ; then \
+ -if test -r $(LIBTALLOC_SHARED_TARGET_SONAME) ; then \
ln -s -f `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` \
$(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)` ; \
fi
@@ -1647,7 +1647,7 @@ installlibtdb:: installdirs libtdb
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
-$(INSTALLLIBCMD_SH) $(LIBTDB_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
@rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET)`
- -if test -e $(LIBTDB_SHARED_TARGET_SONAME) ; then \
+ -if test -r $(LIBTDB_SHARED_TARGET_SONAME) ; then \
ln -s -f `basename $(LIBTDB_SHARED_TARGET_SONAME)` \
$(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET)` ; \
fi
@@ -1720,7 +1720,7 @@ installlibwbclient:: installdirs libwbclient
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
-$(INSTALLLIBCMD_SH) $(LIBWBCLIENT_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
@rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBWBCLIENT_SHARED_TARGET)`
- -if test -e $(LIBWBCLIENT_SHARED_TARGET_SONAME) ; then \
+ -if test -r $(LIBWBCLIENT_SHARED_TARGET_SONAME) ; then \
ln -s -f `basename $(LIBWBCLIENT_SHARED_TARGET_SONAME)` \
$(DESTDIR)$(LIBDIR)/`basename $(LIBWBCLIENT_SHARED_TARGET)` ; \
fi
@@ -1780,7 +1780,7 @@ installlibaddns:: installdirs libaddns
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
-$(INSTALLLIBCMD_SH) $(LIBADDNS_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
@rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBADDNS_SHARED_TARGET)`
- -if test -e $(LIBADDNS_SHARED_TARGET_SONAME) ; then \
+ -if test -r $(LIBADDNS_SHARED_TARGET_SONAME) ; then \
ln -s -f `basename $(LIBADDNS_SHARED_TARGET_SONAME)` \
$(DESTDIR)$(LIBDIR)/`basename $(LIBADDNS_SHARED_TARGET)` ; \
fi
@@ -1860,7 +1860,7 @@ installlibnetapi:: installdirs libnetapi
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
-$(INSTALLLIBCMD_SH) $(LIBNETAPI_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
@rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBNETAPI_SHARED_TARGET)`
- -if test -e $(LIBNETAPI_SHARED_TARGET_SONAME) ; then \
+ -if test -r $(LIBNETAPI_SHARED_TARGET_SONAME) ; then \
ln -s -f `basename $(LIBNETAPI_SHARED_TARGET_SONAME)` \
$(DESTDIR)$(LIBDIR)/`basename $(LIBNETAPI_SHARED_TARGET)` ; \
fi
@@ -1921,7 +1921,7 @@ installlibsmbclient:: installdirs libsmbclient
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
-$(INSTALLLIBCMD_SH) $(LIBSMBCLIENT_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
@rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBCLIENT_SHARED_TARGET)`
- -if test -e $(LIBSMBCLIENT_SHARED_TARGET_SONAME) ; then \
+ -if test -r $(LIBSMBCLIENT_SHARED_TARGET_SONAME) ; then \
ln -s -f `basename $(LIBSMBCLIENT_SHARED_TARGET_SONAME)` \
$(DESTDIR)$(LIBDIR)/`basename $(LIBSMBCLIENT_SHARED_TARGET)` ; \
fi
@@ -1992,7 +1992,7 @@ installlibsmbsharemodes:: installdirs libsmbsharemodes
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
-$(INSTALLLIBCMD_SH) $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
@rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBSHAREMODES_SHARED_TARGET)`
- -if test -e $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME) ; then \
+ -if test -r $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME) ; then \
ln -s -f `basename $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME)` \
$(DESTDIR)$(LIBDIR)/`basename $(LIBSMBSHAREMODES_SHARED_TARGET)` ; \
fi
@@ -2709,7 +2709,8 @@ Makefile: $(srcdir)/Makefile.in config.status
# Check shared libs for unresolved symbols
test_shlibs:
@echo "Testing $? "
- @export $(LIB_PATH_VAR)=./bin && \
+ @$(LIB_PATH_VAR)=./bin && \
+ export $(LIB_PATH_VAR) && \
for module in $?; do \
./script/tests/dlopen.sh $${module} \
|| exit 1; \
@@ -2718,7 +2719,8 @@ test_shlibs:
# Check for NSS module problems.
test_nss_modules:: nss_modules
@echo "Testing $(NSS_MODULES) "
- @export $(LIB_PATH_VAR)=./bin && \
+ @$(LIB_PATH_VAR)=./bin && \
+ export $(LIB_PATH_VAR) && \
for module in $(NSS_MODULES); do \
./script/tests/dlopen.sh $${module} \
|| exit 1; \
@@ -2728,7 +2730,8 @@ test_nss_modules:: nss_modules
# built can actually be loaded by a minimal PAM-aware application.
test_pam_modules:: pam_modules
@echo "Testing $(PAM_MODULES) "
- @export $(LIB_PATH_VAR)=./bin && \
+ @$(LIB_PATH_VAR)=./bin && \
+ export $(LIB_PATH_VAR) && \
for module in $(PAM_MODULES); do \
./script/tests/dlopen.sh -lpam -ldl bin/$${module}. at SHLIBEXT@ \
|| exit 1; \
diff --git a/source/VERSION b/source/VERSION
index 97c5d51..d9ebec7 100644
--- a/source/VERSION
+++ b/source/VERSION
@@ -25,7 +25,7 @@
########################################################
SAMBA_VERSION_MAJOR=3
SAMBA_VERSION_MINOR=2
-SAMBA_VERSION_RELEASE=3
+SAMBA_VERSION_RELEASE=6
########################################################
# Bug fix releases use a letter for the patch revision #
@@ -95,5 +95,5 @@ SAMBA_VERSION_IS_GIT_SNAPSHOT=
# e.g. SAMBA_VERSION_VENDOR_SUFFIX=vendor_version() #
# -> "CVS 3.0.0rc2-VendorVersion" #
########################################################
-SAMBA_VERSION_VENDOR_SUFFIX=
+SAMBA_VERSION_VENDOR_SUFFIX="ctdb"
SAMBA_VERSION_VENDOR_PATCH=
diff --git a/source/auth/pampass.c b/source/auth/pampass.c
index 58921bd..9345eed 100644
--- a/source/auth/pampass.c
+++ b/source/auth/pampass.c
@@ -63,6 +63,7 @@ typedef int (*smb_pam_conv_fn)(int, const struct pam_message **, struct pam_resp
* Macros to help make life easy
*/
#define COPY_STRING(s) (s) ? SMB_STRDUP(s) : NULL
+#define COPY_FSTRING(s) (s[0]) ? SMB_STRDUP(s) : NULL
/*******************************************************************
PAM error handler.
@@ -327,7 +328,7 @@ static int smb_pam_passchange_conv(int num_msg,
DEBUG(100,("smb_pam_passchange_conv: PAM_PROMPT_ECHO_ON: We actualy sent: %s\n", current_reply));
#endif
reply[replies].resp_retcode = PAM_SUCCESS;
- reply[replies].resp = COPY_STRING(current_reply);
+ reply[replies].resp = COPY_FSTRING(current_reply);
found = True;
break;
}
@@ -355,7 +356,7 @@ static int smb_pam_passchange_conv(int num_msg,
DEBUG(10,("smb_pam_passchange_conv: PAM_PROMPT_ECHO_OFF: We sent: %s\n", current_reply));
pwd_sub(current_reply, udp->PAM_username, udp->PAM_password, udp->PAM_newpassword);
reply[replies].resp_retcode = PAM_SUCCESS;
- reply[replies].resp = COPY_STRING(current_reply);
+ reply[replies].resp = COPY_FSTRING(current_reply);
#ifdef DEBUG_PASSWORD
DEBUG(100,("smb_pam_passchange_conv: PAM_PROMPT_ECHO_OFF: We actualy sent: %s\n", current_reply));
#endif
diff --git a/source/auth/token_util.c b/source/auth/token_util.c
index cd67c2a..bdf6124 100644
--- a/source/auth/token_util.c
+++ b/source/auth/token_util.c
@@ -77,7 +77,7 @@ bool nt_token_check_domain_rid( NT_USER_TOKEN *token, uint32 rid )
NT_USER_TOKEN *get_root_nt_token( void )
{
- struct nt_user_token *token = NULL;
+ struct nt_user_token *token, *for_cache;
DOM_SID u_sid, g_sid;
struct passwd *pw;
void *cache_data;
@@ -107,9 +107,11 @@ NT_USER_TOKEN *get_root_nt_token( void )
token->privileges = se_disk_operators;
+ for_cache = token;
+
memcache_add_talloc(
NULL, SINGLETON_CACHE_TALLOC,
- data_blob_string_const("root_nt_token"), token);
+ data_blob_string_const("root_nt_token"), &for_cache);
return token;
}
diff --git a/source/client/client.c b/source/client/client.c
index dc5e0f5..1954bef 100644
--- a/source/client/client.c
+++ b/source/client/client.c
@@ -4614,7 +4614,7 @@ static int do_message_op(void)
snprintf(name_type_hex, sizeof(name_type_hex), "#%X", name_type);
fstrcat(server_name, name_type_hex);
- zero_addr(&ss);
+ zero_sockaddr(&ss);
if (have_ip)
ss = dest_ss;
diff --git a/source/client/mount.cifs.c b/source/client/mount.cifs.c
index 9278295..79a84e6 100644
--- a/source/client/mount.cifs.c
+++ b/source/client/mount.cifs.c
@@ -39,9 +39,10 @@
#include <mntent.h>
#include <fcntl.h>
#include <limits.h>
+#include "mount.h"
#define MOUNT_CIFS_VERSION_MAJOR "1"
-#define MOUNT_CIFS_VERSION_MINOR "11"
+#define MOUNT_CIFS_VERSION_MINOR "12"
#ifndef MOUNT_CIFS_VENDOR_SUFFIX
#ifdef _SAMBA_BUILD_
@@ -79,14 +80,8 @@
#define MOUNT_PASSWD_SIZE 64
#define DOMAIN_SIZE 64
-/* exit status - bits below are ORed */
-#define EX_USAGE 1 /* incorrect invocation or permission */
-#define EX_SYSERR 2 /* out of memory, cannot fork, ... */
-#define EX_SOFTWARE 4 /* internal mount bug or wrong version */
-#define EX_USER 8 /* user interrupt */
-#define EX_FILEIO 16 /* problems writing, locking, ... mtab/fstab */
-#define EX_FAIL 32 /* mount failure */
-#define EX_SOMEOK 64 /* some mount succeeded */
+/* currently maximum length of IPv6 address string */
+#define MAX_ADDRESS_LEN INET6_ADDRSTRLEN
const char *thisprogram;
int verboseflag = 0;
@@ -197,12 +192,6 @@ static char * getusername(void) {
return username;
}
-static char * parse_cifs_url(char * unc_name)
-{
- printf("\nMounting cifs URL not implemented yet. Attempt to mount %s\n",unc_name);
- return NULL;
-}
-
static int open_cred_file(char * file_name)
{
char * line_buf;
@@ -441,6 +430,7 @@ static int parse_options(char ** optionsp, int * filesys_flags)
goto nocopy;
} else {
printf("username specified with no parameter\n");
+ SAFE_FREE(out);
return 1; /* needs_arg; */
}
} else {
@@ -473,6 +463,7 @@ static int parse_options(char ** optionsp, int * filesys_flags)
domain_name = check_for_domain(&value);
} else {
printf("username too long\n");
+ SAFE_FREE(out);
return 1;
}
}
@@ -488,6 +479,7 @@ static int parse_options(char ** optionsp, int * filesys_flags)
got_password = 1;
} else {
printf("password too long\n");
+ SAFE_FREE(out);
return 1;
}
} else if (strncmp(data, "sec", 3) == 0) {
@@ -498,12 +490,13 @@ static int parse_options(char ** optionsp, int * filesys_flags)
} else if (strncmp(data, "ip", 2) == 0) {
if (!value || !*value) {
printf("target ip address argument missing");
- } else if (strnlen(value, 35) < 35) {
+ } else if (strnlen(value, MAX_ADDRESS_LEN) <= MAX_ADDRESS_LEN) {
if(verboseflag)
printf("ip address %s override specified\n",value);
got_ip = 1;
} else {
printf("ip address too long\n");
+ SAFE_FREE(out);
return 1;
}
} else if ((strncmp(data, "unc", 3) == 0)
@@ -511,6 +504,7 @@ static int parse_options(char ** optionsp, int * filesys_flags)
|| (strncmp(data, "path", 4) == 0)) {
if (!value || !*value) {
printf("invalid path to network resource\n");
+ SAFE_FREE(out);
return 1; /* needs_arg; */
} else if(strnlen(value,5) < 5) {
printf("UNC name too short");
@@ -525,6 +519,7 @@ static int parse_options(char ** optionsp, int * filesys_flags)
got_unc = 1;
} else if (strncmp(value, "\\\\", 2) != 0) {
printf("UNC Path does not begin with // or \\\\ \n");
+ SAFE_FREE(out);
return 1;
} else {
if(got_unc)
@@ -534,18 +529,21 @@ static int parse_options(char ** optionsp, int * filesys_flags)
}
} else {
printf("CIFS: UNC name too long\n");
+ SAFE_FREE(out);
return 1;
}
} else if ((strncmp(data, "domain", 3) == 0)
|| (strncmp(data, "workgroup", 5) == 0)) {
if (!value || !*value) {
printf("CIFS: invalid domain name\n");
+ SAFE_FREE(out);
return 1; /* needs_arg; */
}
if (strnlen(value, DOMAIN_SIZE+1) < DOMAIN_SIZE+1) {
got_domain = 1;
} else {
printf("domain name too long\n");
+ SAFE_FREE(out);
return 1;
}
} else if (strncmp(data, "cred", 4) == 0) {
@@ -554,10 +552,12 @@ static int parse_options(char ** optionsp, int * filesys_flags)
if(rc) {
printf("error %d (%s) opening credential file %s\n",
rc, strerror(rc), value);
+ SAFE_FREE(out);
return 1;
}
} else {
printf("invalid credential file name specified\n");
+ SAFE_FREE(out);
return 1;
}
} else if (strncmp(data, "uid", 3) == 0) {
@@ -596,6 +596,7 @@ static int parse_options(char ** optionsp, int * filesys_flags)
} else if (strcmp(data, "file_mode") == 0 || strcmp(data, "fmask")==0) {
if (!value || !*value) {
printf ("Option '%s' requires a numerical argument\n", data);
+ SAFE_FREE(out);
return 1;
}
@@ -610,6 +611,7 @@ static int parse_options(char ** optionsp, int * filesys_flags)
} else if (strcmp(data, "dir_mode") == 0 || strcmp(data, "dmask")==0) {
--
SAMBA-CTDB repository
More information about the samba-cvs
mailing list