[SCM] Samba Shared Repository - branch v3-0-stable updated -
release-3-0-33-100-gf3adbbe
Karolin Seeger
kseeger at samba.org
Mon Jan 12 09:32:55 GMT 2009
The branch, v3-0-stable has been updated
via f3adbbea849dc300913527d642ef249b9b852b86 (commit)
via a909a43586fff63f50e04a0a384c844ef7e28794 (commit)
via 7004045d0a002f01049b9f0325e53aacc68816c4 (commit)
via f9ad3a4c879eb4438cb0f7ec61391a78abb2ee67 (commit)
via 757f76c9af8ab726858603182df709d9924a69e1 (commit)
via feaadaeed516a4957499f9d1b88c5e9536c5bafd (commit)
via 81d7dd3e1a1767d0a1e2804d9c10e06159249366 (commit)
via c44392257e5033aa74a4ecb453654dee2d0ebc28 (commit)
via 69501f4c7d90113cf98e862acdd1830d0def88d6 (commit)
via 123bfd08048d06ef0aa71fbef24696650f6f632f (commit)
via 65ea9e8cabafa5e61a93922fe6f7c1d9a56b6d5e (commit)
via cf6c6d3560d1188bace4531f8cdbd34f486e4948 (commit)
via 650c648410d3678adf4999f03524416746664199 (commit)
via 901ac11aa85d56f7636ed1d30a0ccffe6101f273 (commit)
via 88c325d993cb80e69e7ae482f0243899700ab6fb (commit)
via 1ab8a195b74cd5ef4efb6412a5a2ccc5821ec066 (commit)
via 573f4f87897d60aaa48abcdf002de96cdee9cb04 (commit)
via e3ae2913fb22a05820c558f2d6c32d72e3d2e304 (commit)
via 3e46c10e7b1dca04301e3fe1e42680e62aeacbab (commit)
via 4faf351364ab82ef61b43d417c970678cd9ec6e3 (commit)
via a4d5329212a9cbb39d3baaaeeda451dcd410af3c (commit)
via 206808c2e88b832b1434a63a54581bbca2fa0434 (commit)
via a436d9ea19d13a2dc4d870b62d0c4af4020dc7b2 (commit)
via cb84e07512bc001b0c741572092a8012f9f899db (commit)
via 1a50f7d9be88e0bb073d44827a009b8871d769d6 (commit)
via 4ba5b2509bb0fcfebfe12cf9ff513d0f853db9b5 (commit)
via 540e0da4e5256cf0a0fc93f3e4276c8b8dabf6e9 (commit)
via f59c4f1f0e348d1321e8c2a93050d8dcc8d6055e (commit)
via 70bc6712e1848581257b20566366ae0be6bf87ad (commit)
via 796c7c9279edae25ddda611ca82bb559478c5082 (commit)
via 408341905e604d464759126f8cc4e856753a0762 (commit)
via 47408aa39ea4325cd64b2cb9de577b740fa61851 (commit)
via 73283c531777b67092fb6533a1e658463b5ad974 (commit)
via 495bf7a217a96bdfa1282f066ab67791379a6fd4 (commit)
via 0369f0c991194eda3a5ec3f0b56fe48c4c330d4b (commit)
via 47d6c3b9a96a6d249779aab29de064b1df6f9c06 (commit)
via d6819bad39b2c8ea425777480506ba3d2a7f161d (commit)
via e691ce689f5de4b50691d4aa1315b05dd7a5b4e1 (commit)
via e934fa83f83275086a1de172b23e5b1a81453acf (commit)
via e1cce62024545be0b8439eb617a564bec72d9a8c (commit)
via 980e56109ba42703a658f6f983021843ddd06d16 (commit)
via e38a8e536d9bd10e015f172c0ebf9d6ba5e8e0e5 (commit)
via 334879cd61ac78f9cdec9dc15e1d43862a3d5e30 (commit)
via dbf438d23903b498ee617526944684fffda8c897 (commit)
via d28d6d679bf64613c25bf04075ba75208961c46e (commit)
via 117eeb34f1c828ee493d30bffa1b8b192316b3b6 (commit)
via 7fe3265853fe61bbbd691c11f8a33ace23ad0b18 (commit)
via 1acfb4223fa815e6e48c2469730d8ca46367f59f (commit)
via 6324ed75c09a7857d9c5dff1814ef97442cc88a7 (commit)
via 948cae7a2b2c3078673160a8304b8302dd49566c (commit)
via bd7b1af4347bc2fbd2d25a2d932d08885fff200c (commit)
via e5a0e7963c7526ba76f83f07f9bb9652e707e4bf (commit)
via a02caa4274454759c553642c301c23495e0f53f9 (commit)
via 89a41d923f338afb4386daff21ab0c5da1436f0f (commit)
via 6eb75bb5839a2ffae19d062f0c1bec3efbe5c5d8 (commit)
via 125580546418ce7f38d9c9afdcc734cd2183185e (commit)
via 09f332882baf4bde40c083e7b15739a670775d6e (commit)
via 6c08a3c5389a0c39c9f7316510441d5d1ab0e821 (commit)
via 34968305c72fb9148b355cfdcac74c11c9b16d76 (commit)
via f3e34d052d82936bfa08f05cbf375625e3675aa8 (commit)
via bc0a1ec9d51c877a75d06af77f4087c241febc25 (commit)
via 4ff9dd0dce9d1d273df33aa0901bb4b866236317 (commit)
via b91022198f7d798e197bf1407cd97f3db8eb9788 (commit)
via 4d6504da3a5e6bd026e7211198d729a141cc39bf (commit)
via 2569ba68468577b8a2a9765d7a88b07d288abfd0 (commit)
via eebbae5c99546ca59cba9ffa1600ba2fdba9bfa1 (commit)
via bb67c2ba925c9776cb9d4c46fae8cdd16d3f6bbf (commit)
via 11ead90a52b770ab151f8ff07452cf005731994e (commit)
via 21e12dd7143146fa31e97a262c7213bfc2bee512 (commit)
via 8ac48a7c19f549f357ae2ec17f8a7d319d0ea253 (commit)
via b5f84358fe563aebe96871342a4207f9e8b44398 (commit)
via 1f89942757ae15201cb3f561320d3c8ca573c576 (commit)
via 04393d0251ab2988e5e2cd1cfd42fe10955336af (commit)
via 8c30e5af70c1e8376fdb16e39eb687728ba38abd (commit)
via 223f07887f99c6951ac12402179bb770556c60c6 (commit)
via f5621d6bf312e8489ab484813b8ebdfffa557de5 (commit)
via 7b1528b04bc7b8551e248cb875c6301042b1a9f0 (commit)
via f48ec1e53e2cf86722a740283d3b7695c8d99ec9 (commit)
via a432a6e989b93e6c10073c3270ff30f4d4368b33 (commit)
via 444ad80cb202c9384b5aaa8bd5aeac244ac12eaf (commit)
via 5e1cb15200cdf4ffacb348d4327fef59e44cf00d (commit)
via 440395a71d5bd4c0f187990c469abf3b6bd82d29 (commit)
via c50f29c99846345ede42be938b91e6b5be1f1ec5 (commit)
via 1e0d637aec8dae1fa6acd09c030760e9624b5149 (commit)
via c3cfbf78925fc8591cc6b8d0faea8063d45262d6 (commit)
via 74d99ff9dc2a7e5a2b9388e15f0b4dc2b9e64738 (commit)
via d2b4cb374239018a41eda697875f690635e3a8e7 (commit)
via 4a74c133a896443dd0b4479d24939a2a2e44734c (commit)
via b45b965484b39566df91354898b192838c0972a2 (commit)
via 1502b4a63bbbbba0712ae2300969845c1a3d08a3 (commit)
via 04e5401313c2bca6cb60656f975cac9eae03fc3c (commit)
via cc3e075db52624d5343bba9d1c12669e4ce8902e (commit)
via 49288787da55298dbd0746f3f1ae551b4ed376eb (commit)
via 56abb3ee7e0d215c24cec97eff522de7d431cd89 (commit)
via 6915e4bd474c41e2da112313263c5cb66e6e7c26 (commit)
via c60631879dbe6e87bc03c0412a4c8857b2f4339b (commit)
via 6b4a425a072d471a28578744f934f92d38d44d1a (commit)
via c1ef3b8e28777f70086c8d2ee851e3a0b5b4ca4c (commit)
via b12957121da913f9c0bfb9bf376fca87c2090485 (commit)
via ecaaefa2731c534a91e3c1176b5235d29e7a8937 (commit)
from 17111c4885f9c382510c6cbd8650f0bd5406fcb6 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-stable
- Log -----------------------------------------------------------------
commit f3adbbea849dc300913527d642ef249b9b852b86
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Jan 12 10:15:36 2009 +0100
VERSION: Remove git snapshot flag.
Karolin
commit a909a43586fff63f50e04a0a384c844ef7e28794
Author: Bo Yang <boyang at novell.com>
Date: Mon Jan 12 14:15:00 2009 +0800
Fix null pointer refrence in event context in backport from v3-3-test
Signed-off-by: Bo Yang <boyang at novell.com>
(cherry picked from commit 514dfc632ed35a80a175a4afbe9607aa4d913da3)
commit 7004045d0a002f01049b9f0325e53aacc68816c4
Author: Jeremy Allison <jra at samba.org>
Date: Sat Jan 10 20:04:27 2009 -0800
Fix logic bug introduce in backport of ccache_regain_all_now, sync with
3.3 implementation.
Jeremy.
(cherry picked from commit ab29d6c6d349352db017d3046aeaee59e33745f4)
commit f9ad3a4c879eb4438cb0f7ec61391a78abb2ee67
Author: Bo Yang <boyang at novell.com>
Date: Sat Jan 10 14:32:43 2009 -0800
Backport of the clean event context after fork and
krb5 refresh chain fixes.
(cherry picked from commit 194425f8074e2cfd5893499099614666f8d8ecd9)
commit 757f76c9af8ab726858603182df709d9924a69e1
Author: Bo Yang <boyang at novell.com>
Date: Sat Jan 10 14:13:32 2009 -0800
Don't set child->requests to NULL in parent after fork
(cherry picked from commit a4438df44621ae37c13e5c5064cc3dc5e1371457)
commit feaadaeed516a4957499f9d1b88c5e9536c5bafd
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Jan 9 11:22:00 2009 +0100
docs: Improve man mount.cifs.
Add hint about specifying the workgroup in the credentials file.
Whitespace cleanup.
This fixes bug #4541.
Patch based on proposed patch from Christian Perrier <bubulle at debian.org>.
Thanks for reporting and providing a patch!
Karolin
(cherry picked from commit 1f7e09ea542df3a2f5f553c0cb11a39c74712950)
(cherry picked from commit b99d98ff2ef5491979301656e7f516d3c8829f6e)
(cherry picked from commit 1900233ede3083410eb3dc691d2d486c5340ccc4)
(cherry picked from commit 47f4662b6d727f2901d630d74792a6a971b54662)
commit 81d7dd3e1a1767d0a1e2804d9c10e06159249366
Author: Jeremy Allison <jra at samba.org>
Date: Thu Jan 8 10:56:36 2009 -0800
Fix race condition in alarm lock processing noticed by Richard Sharpe <realrichardsharpe at gmail.com>.
"It seems to me that if the lock is already held by another process when we
enter this code, there is a race between the timeout and the granting. If
the lock is subsequently granted, the process releasing the lock will signal
the wait variable (or whatever) and our process will be scheduled. However,
if the timeout occurs before we are scheduled, the timeout will be delivered
first.
We will have the lock but will forget we have the lock, and never release
it."
Jeremy.
(cherry picked from commit 8904b83ce6c69db31dc2ce4c05e8e8ee3db5ec3b)
commit c44392257e5033aa74a4ecb453654dee2d0ebc28
Author: Volker Lendecke <vl at samba.org>
Date: Tue Jan 6 15:13:43 2009 +0100
s3/swat: Fix creation of the first share using SWAT.
This fixes bug #5965.
(cherry picked from commit f76614169f1e0a932cf2895702cfa9e8a5735875)
(cherry picked from commit 148437fcd0896591ebbf6c2808723575d025123f)
(cherry picked from commit 3ee41667d7bb8358c80af24f78dbdd071fa9c765)
commit 69501f4c7d90113cf98e862acdd1830d0def88d6
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue Jan 6 12:26:23 2009 +0100
docs: Improve description of the share commands in man smb.conf.
-Correct the parameter names.
-Fix typos.
-Fix related parameters.
This fixes bug #6008.
Thanks to TAKAHASHI Motonobu <monyo at samba.gr.jp> for reporting!
Karolin
(cherry picked from commit 8b7f66c548ed170d2dab0c91ccff4aca00f4b52d)
(cherry picked from commit 6f38786aa878bd1a7fc10069773c19b28437fbbb)
(cherry picked from commit f420b5c2af7d46e88269d9ec89c5dcd37f1f8f46)
(cherry picked from commit 98e2d6614f00f207de42a79d329b63e7966ab8ea)
commit 123bfd08048d06ef0aa71fbef24696650f6f632f
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue Jan 6 10:26:37 2009 +0100
docs: Fix example in man vfs_recycle.
This fixes bug #6001.
Thanks to TAKAHASHI Motonobu <monyo at samba.gr.jp> for reporting!
Karolin
(cherry picked from commit 9f44a17c3bf36067d04cec036c3e529798932cd7)
(cherry picked from commit 5e073807f7c4679dd299a2b8f3e2643dc1c82405)
(cherry picked from commit c0877d14cb04956b29ca329897a7b4bface7f363)
(cherry picked from commit 232503ba417f51d93e22a2411b2d446596284e59)
commit 65ea9e8cabafa5e61a93922fe6f7c1d9a56b6d5e
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Jan 5 16:33:00 2009 +0100
examples: Avoid bashism in perfcount.init.
This fixes bug #6000.
Thanks to the Debian Samba package maintainers for providing the patch!
Remove trailing whitespaces.
Karolin
(cherry picked from commit 2e09746a4db4186c9d648370b9004971bc18e5c9)
(cherry picked from commit 9b17f7907bca32282d6e56fa28ca62ef84bf7afc)
(cherry picked from commit de41f0e9a08b796873bdd319fe784b6c90e28b23)
(cherry picked from commit e5e8a4a6fa866a23377d0a92eff433b59abfcebe)
commit cf6c6d3560d1188bace4531f8cdbd34f486e4948
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Jan 5 16:38:25 2009 +0100
Revert "examples: Avoid bashism in perfcount.init."
This reverts commit 744c7007b4b798699613e06933f92fdf5261b222.
(cherry picked from commit 26080fd575df450166e13836ea227a6d191e86c4)
commit 650c648410d3678adf4999f03524416746664199
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Jan 5 14:54:28 2009 +0100
examples: Avoid bashism in perfcount.init.
This fixes bug #6000.
Thanks to the Debian Samba package maintainers for providing the patch!
Remove trailing whitespaces.
Karolin
(cherry picked from commit 73875cd344608b591fa884ab99b5f3a10550c149)
(cherry picked from commit e273c07e94ee607bbf05b6fa66cf3cea13fe4502)
(cherry picked from commit a1bf1f1819ab184682327583d05b0258db8856ef)
(cherry picked from commit b4ffffc5c03b69ac2f8e0ed74fd7788549f7e822)
(cherry picked from commit 744c7007b4b798699613e06933f92fdf5261b222)
commit 901ac11aa85d56f7636ed1d30a0ccffe6101f273
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Jan 5 14:39:59 2009 +0100
docs: Document the -g option of smbclient.
This fixes bug #6013.
Thanks to the Debian Samba packages maintainers for reporting!
Karolin
(cherry picked from commit 6752d78e946b2c4278e2deba325c76fb7ffbc06a)
(cherry picked from commit e6abdbde9b67801d46c9d331045d155717e8b241)
(cherry picked from commit 8a79b8796f98dd80b6e1f04d7302fb8342f0052d)
(cherry picked from commit 1f979334266706656874fdbe6cce14f17105360b)
(cherry picked from commit 74f5828112581fa230301f43f7685ec208a8e4f6)
commit 88c325d993cb80e69e7ae482f0243899700ab6fb
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Jan 2 09:46:17 2009 +0100
Happy New Year!
metze
(cherry picked from commit 041435d841b457f493c940e0281cd496b52fb7dc)
commit 1ab8a195b74cd5ef4efb6412a5a2ccc5821ec066
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed Dec 17 16:26:43 2008 +0100
s3/smb.h: Remove unused LDAP_SSL_ON.
LDAP_SSL_ON is not defined at all.
Ldaps can be used by specifying an ldaps URL using the "passdb backend"
parameter.
Karolin
(cherry picked from commit 0c6cf1f8793edfde924289aafbd174ce4a4fae0c)
(cherry picked from commit 7f36de6906811d4f0428b75c79c72b17b8ccfcef)
(cherry picked from commit a3113657b4427eddcfbb10d71e9e8ade06bbd16f)
commit 573f4f87897d60aaa48abcdf002de96cdee9cb04
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed Dec 17 15:53:51 2008 +0100
s3/loadparm.c: Change default value for "ldap ssl".
LDAP_SSL_ON is not defined at all. That's why the actual default value
was "" for a long time. Set a more sensible default value without chnging the
default behaviour.
-----8<------------------snip--------------8<--------------
user at host:/data/git/samba/v3-0-test/source> git grep LDAP_SSL_ON | cat
include/smb.h:enum ldap_ssl_types {LDAP_SSL_ON, LDAP_SSL_OFF,
LDAP_SSL_START_TLS};
param/loadparm.c: Globals.ldap_ssl = LDAP_SSL_ON;
----->8------------------snap-------------->8--------------
It's the same in 3.2 and 3.3 series.
Karolin
(cherry picked from commit e6d883e003d4560c55259ae1cfdf7319602f76e3)
(cherry picked from commit 5c686419096362176d80f3d05339b8836d0178a4)
(cherry picked from commit 7a39f3eaf571fd9da6f8e103eeb50c5bcebd18c1)
commit e3ae2913fb22a05820c558f2d6c32d72e3d2e304
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed Dec 17 16:18:38 2008 +0100
docs: Update section "ldap ssl" in man smb.conf.
Remove non-existent value "on".
Change default value to "no".
Add hint about ldaps.
Karolin
(cherry picked from commit 580461629bb88ce3b61770e7abfe2c942a121877)
(cherry picked from commit d74356627579fe7b9961844a77c4e6daa978d62b)
(cherry picked from commit 882ac5e5a79646754dfd1669ea6720ab52c9b6ee)
(cherry picked from commit e147c4679f8095738fea6ab2c9fb37fbecc9bb85)
commit 3e46c10e7b1dca04301e3fe1e42680e62aeacbab
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed Dec 17 15:42:12 2008 +0100
docs: Fix some formatting issues in the "ldap ssl" section of man smb.conf.
Karolin
(cherry picked from commit 6ac36698e975649d26e3f2975c2101129c3ffe97)
(cherry picked from commit 655a1c7b05d56326d6cfffbc8e46e1d64565717a)
(cherry picked from commit 2534619eedc3e9528d589cfee793a55b3cc62bed)
(cherry picked from commit 78ec02e8221aea7633ed63f5fc5084a12c9796d4)
commit 4faf351364ab82ef61b43d417c970678cd9ec6e3
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed Dec 17 09:17:26 2008 +0100
docs: Fix TOC of generated HTML docs.
This fixes bug #5968.
Thanks to Christian Perrier <bubulle at debian.org> for reporting!
Karolin
(cherry picked from commit 675b363b712e0b91b9b7d1189a819a36853db539)
(cherry picked from commit 3566615292f9cb2d00b03156e515274751e05969)
(cherry picked from commit 0d6b3df8d9c8b5e777ac6717168a11455b2ad2ce)
(cherry picked from commit 875dfb887dba90807ed5b371334574997be419a8)
commit a4d5329212a9cbb39d3baaaeeda451dcd410af3c
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue Dec 16 15:10:29 2008 +0100
docs: "acl compatibility" is a global parameter.
This fixes bug #5866.
Thanks to TAKAHASHI Motonobu <monyo at samba.gr.jp> for reporting!
Karolin
(cherry picked from commit 9e64ed018e5aa84d802b01953b481fbb07eb00aa)
(cherry picked from commit 386b0fc4bdc0822ffbc51cfee536bea23df0a755)
(cherry picked from commit 877951eea6e67273748aa9f56a56e41cf2dca00a)
(cherry picked from commit 0a93af41475783ab80644729efb48a80915f7bfc)
commit 206808c2e88b832b1434a63a54581bbca2fa0434
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)
(cherry picked from commit d54a1e49d5fe567bcda7c4c02f6ace2d03e189e9)
(cherry picked from commit 2550b433e8764df83197ffb9f3a7088bbceeb215)
commit a436d9ea19d13a2dc4d870b62d0c4af4020dc7b2
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)
(cherry picked from commit 879a4fbe99739b67d877caac2d7a2f763c69d41f)
(cherry picked from commit 51a9b237d401151eed43ab917d2dd10d8693a764)
commit cb84e07512bc001b0c741572092a8012f9f899db
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)
(cherry picked from commit fda3f00246c3ecb664d2bf387ecd0e28dec16e34)
(cherry picked from commit 90c5d04c5161bd2acb1c16d737b68893f11f3d18)
commit 1a50f7d9be88e0bb073d44827a009b8871d769d6
Author: Jeremy Allison <jra at samba.org>
Date: Thu Dec 4 15:35:07 2008 -0800
Fix bug #5937 - filenames with "*" char hide other files
Jeremy.
(cherry picked from commit 7917038db0277d16e5284ee261a4913e278e5ac7)
commit 4ba5b2509bb0fcfebfe12cf9ff513d0f853db9b5
Author: Jeremy Allison <jra at samba.org>
Date: Thu Dec 4 11:07:53 2008 -0800
Fix bug #1254 - write list not working under share-level security
(mtab.c, fix build).
Jeremy.
(cherry picked from commit 680e4c398c79867f8a7ad40e9c2cd9c401922edd)
commit 540e0da4e5256cf0a0fc93f3e4276c8b8dabf6e9
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)
(cherry picked from commit 1ba197a3054c6d997ceca6f124039d3cabf00289)
(cherry picked from commit 09ccdf6aee15169b0fe9c532ee9143bd0cff9d78)
commit f59c4f1f0e348d1321e8c2a93050d8dcc8d6055e
Author: Andreas Schneider <anschneider at suse.de>
Date: Wed Oct 29 14:12:04 2008 +0100
Fix circular dependency error with autoconf 2.6.3.
Signed-off-by: Andreas Schneider <anschneider at suse.de>
(cherry picked from commit 26e82e3e006a80c9d4d1cb437eb39b02efa7c3ad)
commit 70bc6712e1848581257b20566366ae0be6bf87ad
Author: Jeremy Allison <jra at samba.org>
Date: Tue Nov 25 15:57:18 2008 -0800
Fix bug #5914 - Build failure: redefinition of struct name_list
Jeremy.
(cherry picked from commit d326dc7dc08acbb7bf511ca9579cefe591b0ba94)
commit 796c7c9279edae25ddda611ca82bb559478c5082
Author: Jeremy Allison <jra at samba.org>
Date: Mon Nov 24 15:40:50 2008 -0800
Fix bug #5873 - ACL inheritance cannot be broken. This regresses #4308, but that will have to
be fixed another way.
Jeremy.
(cherry picked from commit 649572c454328b81714b86d3f99f730bf61625e0)
commit 408341905e604d464759126f8cc4e856753a0762
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Nov 24 15:26:21 2008 +0100
libads/ldap.c: return an error instead of crashing when no realm is given
The bug was triggered by "net ads info -S 127.8.7.6" (where 127.8.7.6 doesn't ex
and "disable netbios = yes".
metze
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 114b94f86e15d482f3b39912f28eb72b66b36bc8)
commit 47408aa39ea4325cd64b2cb9de577b740fa61851
Author: Michael Adam <obnox at samba.org>
Date: Sat Nov 22 00:43:43 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
(cherry picked from commit a2329ec0eea66108f44dae3853e578dbbf835f96)
commit 73283c531777b67092fb6533a1e658463b5ad974
Author: Michael Adam <obnox at samba.org>
Date: Sat Nov 22 00:42:54 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
(cherry picked from commit 06f19e52489b3253ea4292795e4c73fa94cfd392)
commit 495bf7a217a96bdfa1282f066ab67791379a6fd4
Author: Yasuma Takeda <yasuma at osstech.co.jp>
Date: Thu Nov 20 11:41:47 2008 -0800
Fix bug #5909 - MS-DFS does not work on Vista, if link name includes multibyte character.
(cherry picked from commit 92f3ba8e20bd4a5a2afdd13feb5519d723784274)
commit 0369f0c991194eda3a5ec3f0b56fe48c4c330d4b
Author: Dina Fine <dina at exanet.com>
Date: Tue Nov 18 12:43:26 2008 -0800
Fix bug #5908 - Samba 3.0.32 - internal change notify on share directory fails"
(cherry picked from commit cc97e2a0d51f52a79982ac265f073d3829c1357a)
commit 47d6c3b9a96a6d249779aab29de064b1df6f9c06
Author: Carsten Dumke <carsten at cdumke.de>
Date: Thu Nov 13 12:05:00 2008 -0600
net: Fix documentation of net rap printq info (bug #5892)
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>
(cherry picked from commit 67692e9b8f5ae09702c73c081f3a6937bd6de518)
commit d6819bad39b2c8ea425777480506ba3d2a7f161d
Author: Jeremy Allison <jra at samba.org>
Date: Wed Nov 12 14:09:22 2008 -0800
Fix memory leak in error path, spotted by Martin Zielinski <mz at seh.de>.
Jeremy.
(cherry picked from commit ba12ab479b3764e0d251d74401dc5fa31a48f83d)
commit e691ce689f5de4b50691d4aa1315b05dd7a5b4e1
Author: Kai Blin <kai at samba.org>
Date: Fri Nov 7 09:43:46 2008 +0100
ntlm_auth: Put huge NTLMv2 blobs into extra_data on CRAP auth
This fixes bug #5865
(cherry picked from commit 1941f42b04dd20763449ba57e4543aca41ca2155)
commit e934fa83f83275086a1de172b23e5b1a81453acf
Author: Kai Blin <kai at samba.org>
Date: Fri Nov 7 09:40:35 2008 +0100
winbindd: Reformat the WBFLAGS defines to prepare for adding a new flag.
(cherry picked from commit 1f3eba80c8df79f31757bc2075f5730cd261806c)
commit e1cce62024545be0b8439eb617a564bec72d9a8c
Author: Jeff Layton <jlayton at redhat.com>
Date: Thu Nov 6 15:20:55 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>
(cherry picked from commit 66ec780d878979a9fa33ff868f1849e9d2166dcf)
commit 980e56109ba42703a658f6f983021843ddd06d16
Author: Jeremy Allison <jra at samba.org>
Date: Wed Nov 5 19:12:10 2008 -0800
Add reference to bug #4308 to remind me to add regression test to smbtorture.
Jeremy.
(cherry picked from commit 0de73eeb1a17b6af217babd626b203eca975541f)
commit e38a8e536d9bd10e015f172c0ebf9d6ba5e8e0e5
Author: Volker Lendecke <vl at samba.org>
Date: Mon Nov 3 17:14:35 2008 +0100
Fix bug triggered by the RAW-SAMBA3OPLOCKLOGOFF test
(cherry picked from commit af33c8b3521564c229091f197341ba33a7d6f162)
commit 334879cd61ac78f9cdec9dc15e1d43862a3d5e30
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)
(cherry picked from commit d0c0fc92cd6c7549e190669aeaa605a0d436cf31)
commit dbf438d23903b498ee617526944684fffda8c897
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Oct 27 19:40:23 2008 +0100
utils/net_ads.c: 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>
(cherry picked from commit feef594d275881466e2c3f59c0ff54609a9cc53b)
commit d28d6d679bf64613c25bf04075ba75208961c46e
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Oct 27 19:39:30 2008 +0100
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)
commit 117eeb34f1c828ee493d30bffa1b8b192316b3b6
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Oct 27 19:38:15 2008 +0100
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)
commit 7fe3265853fe61bbbd691c11f8a33ace23ad0b18
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Oct 27 19:36:25 2008 +0100
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)
commit 1acfb4223fa815e6e48c2469730d8ca46367f59f
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Oct 27 19:31:30 2008 +0100
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)
commit 6324ed75c09a7857d9c5dff1814ef97442cc88a7
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Oct 27 09:40:25 2008 +0100
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)
commit 948cae7a2b2c3078673160a8304b8302dd49566c
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)
commit bd7b1af4347bc2fbd2d25a2d932d08885fff200c
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)
commit e5a0e7963c7526ba76f83f07f9bb9652e707e4bf
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
(cherry picked from commit 559ba0215cada4093efd22f165b608c41913d935)
commit a02caa4274454759c553642c301c23495e0f53f9
Author: Andreas Schneider <mail at cynapses.org>
Date: Fri Oct 24 12:01:24 2008 +0200
Fix the build of pam_winbind.
(cherry picked from commit 90651d77f1f7fc6d29629d3a0dd566d07c090609)
commit 89a41d923f338afb4386daff21ab0c5da1436f0f
Author: Andreas Schneider <mail at cynapses.org>
Date: Mon Oct 20 17:39:35 2008 +0200
Delete the krb5 ccname variable from the PAM environment if set.
If winbind sets the KRB5CCNAME variable it should unset it when
the cache gets destroyed.
(cherry picked from commit 98f3369e08f4d5bc759e93d36f3d67a3c057f40d)
commit 6eb75bb5839a2ffae19d062f0c1bec3efbe5c5d8
Author: Jeremy Allison <jra at samba.org>
Date: Thu Oct 16 21:01:56 2008 -0700
Cope with bad trans2mkdir requests from System i QNTC IBM SMB client.
If total_data == 4 Windows doesn't care what values
are placed in that field, it just ignores them.
The System i QNTC IBM SMB client puts bad values here,
so ignore them.
Jeremy.
(cherry picked from commit cfdbe8a1f2057ad1a8886ca7445a812219648d19)
commit 125580546418ce7f38d9c9afdcc734cd2183185e
Author: Jeff Layton <jlayton at redhat.com>
Date: Thu Oct 9 10:51:33 2008 -0400
mount.cifs: make return codes match the return codes for /bin/mount (try #3)
The manpage for /bin/mount specifies that the return code should be a
positive integer (actually, it's a bitfield). Clean up the return
codes from mount.cifs to make them match the expected return values
from /bin/mount. This necessary for proper integration with autofs.
This is the third attempt at this patch. The changes here are minor,
just changing some return's from main() into exit() calls for
consistency's sake.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
(cherry picked from commit 4558c09c921793dd358de3ad4b9b4dd091e43662)
commit 09f332882baf4bde40c083e7b15739a670775d6e
Author: Jeff Layton <jlayton at redhat.com>
Date: Thu Oct 9 10:47:45 2008 -0400
mount.cifs: have uppercase_string return success on NULL pointer
We currently don't attempt to uppercase the device portion of the mount
string if there isn't a prefixpath. Fix that by making uppercase_string
return success without doing anything on a NULL pointer.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
(cherry picked from commit 41849ee120297b845ef288c76b45d039ad04112d)
commit 6c08a3c5389a0c39c9f7316510441d5d1ab0e821
Author: Jeremy Allison <jra at samba.org>
Date: Wed Oct 8 11:37:43 2008 -0700
Fix bug #5814 - Winbindd dumping core in a strange manner while doing "rescan_trusted_domain".
From analysis by hargagan <shargagan at novell.com> :
"The winbindd_child_died() is also getting called from process_loop() in case of
SIGCHLD signal. In this case it doesn't make the timeout_handler to NULL for
the first request. It then initiate a new request using
schedule_async_request() which installs a new timeout handler for the same
request. In such a case, for a badly unresponsive system both the timeout
handler can be called. For the first call the "private_data" will be cleared
and for another call the timeout handler will be detecting the double free. So,
for such a case as well, the winbindd_child_died() should make the
timeout_handler to NULL."
Jeremy.
(cherry picked from commit cfa9d20db78875969ea8065161f8efdf5281d003)
commit 34968305c72fb9148b355cfdcac74c11c9b16d76
Author: Jeremy Allison <jra at samba.org>
Date: Wed Oct 1 13:23:36 2008 -0700
Fix use of DLIST_REMOVE as spotted by Constantine Vetoshev <gepardcv at gmail.com>.
This API is unusual in that if used to remove a non-list head it nulls out
the next and prev pointers. This is what you want for debugging (don't want
an entry removed from the list to be still virtually linked into it) but
means there is no consistent idiom for use as the next and prev pointers
get trashed on removal from the list, meaning you must save them yourself.
You can use it one way when deleting everything via the head pointer, as
this preserves the next pointer, but you *must* use it another way when not
deleting everything via the head pointer. Fix all known uses of this (the main
one is in conn_free_internal() and would not free all the private data entries
for vfs modules. The other changes in web/statuspage.c and winbindd_util.c
are not strictly neccessary, as the head pointer is being used, but I've done
them for consistency. Long term we must revisit this as this API is too hard
to use correctly.
Jeremy.
(cherry picked from commit 45514fc5d85221339a4ee55b9f9f78c917b2fd19)
commit f3e34d052d82936bfa08f05cbf375625e3675aa8
Author: Jeremy Allison <jra at samba.org>
Date: Tue Sep 30 13:37:54 2008 -0700
Ensure we emit the notify message before renaming the open files.
Jeremy.
(cherry picked from commit ffa704347a9cf10de20105e3dd07963f975cbd77)
commit bc0a1ec9d51c877a75d06af77f4087c241febc25
Author: Jeremy Allison <jra at samba.org>
Date: Fri Sep 26 18:41:05 2008 -0700
Fix for bug #5790 - samba returns STATUS_OBJECT_NAME_NOT_FOUND on set file disposition call.
This was my fault. I use a singleton cache (positive and negative) to speed up pathname based
qfileinfo/setfileinfo lookups for alternate fsp's open on the same path. I only invalidated the
negative cache on adding a new file fsp, as I incorrectly imagined the new fsp was put at the *end* of
the open files list. DLIST_ADD puts it at the start, meaning any subsequent open wasn't seen once the
cache was set. Doh !
Jeremy.
(cherry picked from commit 3d10c237a9b71d269d7936d58c2f8c0172165cbe)
commit 4ff9dd0dce9d1d273df33aa0901bb4b866236317
Author: Jeremy Allison <jra at samba.org>
Date: Tue Sep 23 16:47:21 2008 -0700
Fix winbindd crash in an unusual failure mode. Bug #5737. Based on original patch from shargagan at novell.com
Jeremy.
(cherry picked from commit 2f230176a19788e659522c7ccccb19b289412166)
commit b91022198f7d798e197bf1407cd97f3db8eb9788
Author: Günther Deschner <gd at samba.org>
Date: Thu Sep 18 14:09:27 2008 +0200
fix net_io_q_srv_pwset2.
yes, we all love hand-marshalled rpc...
Guenther
(cherry picked from commit 72b4ca3ec5714d6056654ecb0fdcbd7d954e6984)
commit 4d6504da3a5e6bd026e7211198d729a141cc39bf
Author: Jeff Layton <jlayton at redhat.com>
Date: Sun Sep 14 08:37:58 2008 -0400
mount.cifs: make local versions of strlcat and strlcpy static
...to silence -Wmissing-prototypes
Signed-off-by: Jeff Layton <jlayton at redhat.com>
(cherry picked from commit a605c5352485cf1b50090301b909b5258de8be8c)
commit 2569ba68468577b8a2a9765d7a88b07d288abfd0
Author: Jeff Layton <jlayton at redhat.com>
Date: Sun Sep 14 08:37:57 2008 -0400
cifs.upcall: make most functions static and silence compiler warnings
...to silence -Wmissing-prototypes and some uninit'ed variable
warnings. Thanks to GD for the extra-paranoid compiler flags.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
(cherry picked from commit 99e75f00710be8369d844c58bd208938b902a49e)
commit eebbae5c99546ca59cba9ffa1600ba2fdba9bfa1
Author: Jeff Layton <jlayton at redhat.com>
Date: Fri Sep 12 16:58:00 2008 -0400
mount.cifs: don't prompt for password on krb5 mounts
krb5 mounts require that the user already have a valid krb5 ticket.
Since we can't currently use the password entered, don't prompt for it.
Also, switch to using strncmp instead of strcmp here.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
(cherry picked from commit d2bea898942e213fb1e33f46c76274527928473d)
commit bb67c2ba925c9776cb9d4c46fae8cdd16d3f6bbf
Author: Jeff Layton <jlayton at redhat.com>
Date: Fri Sep 12 16:58:00 2008 -0400
mount.cifs: fix several problems when mounting subdirectories of shares (try 2)
This patch is the second patch to attempt to fix up some of the problems
with mounting subdirectories of shares. The earlier patch didn't handle
this correctly when POSIX extensions were enabled. This one does.
This is a bit of a confusing area since the different components of
a service string have different rules:
1) hostname: no '/' (slash) or '\' (backslash) is allowed to be
embedded within the string
2) sharename: same rules as hostname
3) prefixpath: '\' *is* allowed to be embedded in a path component,
iff POSIX extensions are enabled. Otherwise, neither
character is allowed.
The idea here is to allow either character to act as a delimiter when we
know that the character can't be anything but a delimiter (namely
everywhere up to the start of the prefixpath). The patch will convert
any '\' unconditionally to '/' in the UNC portion of the string.
However, inside the prefixpath, we can't make assumptions about what
constitutes a delimiter because POSIX allows for embedded '\'
characters. So there we don't attempt to do any conversion, and pass the
prefixpath to the kernel as is. Once the kernel determines whether POSIX
extensions are enabled, it can then convert the path if needed and it's
able to do so. A patch to handle this has already been committed to the
cifs-2.6 git tree.
This patch also fixes an annoyance. When you mount a subdir of a share,
mount.cifs munges the device string so that you can't tell what the
prefixpath is. So if I mount:
//server/share/p1/p2/p3
..then /proc/mounts and mtab will show only:
//server/share
Finally, it also tries to apply some consistent rules to the uppercasing
of strings.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
(cherry picked from commit 59d7d3ae58432a07a858fc7e9161e27bb9478c9e)
commit 11ead90a52b770ab151f8ff07452cf005731994e
Author: Jeff Layton <jlayton at redhat.com>
Date: Fri Sep 12 16:58:00 2008 -0400
Introduce const DATA_BLOB data_blob_null = { NULL, 0, NULL };
Cherry picked from commit 3d3d61687ef00181f4f04e001d42181d93ac931e
Signed-off-by: Jeff Layton <jlayton at redhat.com>
(cherry picked from commit be4adc6938b06fc6df79c6c129528fdbb8b0c041)
commit 21e12dd7143146fa31e97a262c7213bfc2bee512
Author: Jeff Layton <jlayton at redhat.com>
Date: Fri Sep 12 16:57:59 2008 -0400
cifs.upcall: bump SPNEGO msg version number and don't reject old versions
When we added the ability for the kernel to send sec=mskrb5 to the
upcall, we subtly broke old cifs.upcall versions that don't understand
it. Bump the spnego message version to 2 to make this clear. Also,
change cifs.upcall to not reject requests with a version that's lower
than the current one, and to send the reply with the same version that
the request sent. The idea is to try and keep cifs.upcall backward
compatible with old kernels.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
(cherry picked from commit ce937b28a75b8c72e36bd3853d52a9ac1a7606b9)
commit 8ac48a7c19f549f357ae2ec17f8a7d319d0ea253
Author: Jeff Layton <jlayton at redhat.com>
Date: Fri Sep 12 16:57:59 2008 -0400
cifs.upcall: fix build warning
Signed-off-by: Jeff Layton <jlayton at redhat.com>
(cherry picked from commit b5cf5a34d227dd436b12a2d50ba8ddb728799089)
commit b5f84358fe563aebe96871342a4207f9e8b44398
Author: Jeff Layton <jlayton at redhat.com>
Date: Fri Sep 12 16:57:59 2008 -0400
cifs.upcall: handle MSKRB5 OID properly
When the kernel sends the upcall a sec=mskrb5 parameter, that means
the the MSKRB5 OID is preferred by the server. This patch fixes the
upcall to use that OID in place of the "normal" krb5 OID when it
gets a sec=mskrb5 parameter.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
Acked-by: Steve French <smfrench at gmail.com>
(cherry picked from commit 340fdd5fed64ec4a8d7fc937956c722d59a73ba8)
commit 1f89942757ae15201cb3f561320d3c8ca573c576
Author: Jeff Layton <jlayton at redhat.com>
Date: Fri Sep 12 16:57:59 2008 -0400
cifs.upcall: negatively instantiate keys on error
When a request-key upcall exits without instantiating a key, the kernel
will negatively instantiate the key with a 60s timeout. Older kernels,
however seem to also link that key into the session keyring. This
behavior can interefere with subsequent mount attempts until the
key times out. The next request_key() call will get this negative key
even if the upcall would have worked the second time.
Fix this by having cifs.upcall negatively instantiate the key itself
with a 1s timeout and don't attach it to the session keyring.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
(cherry picked from commit 8ee20a90bf312ba8c98ae86439bb8365a4c55561)
commit 04393d0251ab2988e5e2cd1cfd42fe10955336af
Author: Steve French <stevef at smf-t60p.smfdom>
Date: Fri Sep 12 16:57:59 2008 -0400
Building cifs.upcall is giving this build warning:
client/cifs.upcall.c:205: warning: function declaration isn’t a prototype
This patch fixes this by properly declaring usage() args as void.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
Signed-off-by: Steve French <sfrench at samba.org>
(cherry picked from commit 186eb5b26e29b687e9eab981a0ef673462f68f78)
commit 8c30e5af70c1e8376fdb16e39eb687728ba38abd
Author: Steve French <stevef at smf-t60p.smfdom>
Date: Fri Sep 12 16:57:59 2008 -0400
cifs.upcall: fix manpage and comments
The "cifs.resolver" key type has been changed to "dns_resolver". Fix
the comments at the top of cifs.upcall and the manpage accordingly.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
Signed-off-by: Steve French <sfrench at samba.org>
---
docs-xml/manpages-3/cifs.upcall.8.xml | 4 ++--
source/client/cifs.upcall.c | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
(cherry picked from commit de0e8337d4fdde8fc3e892710c1f27a697fdcef5)
commit 223f07887f99c6951ac12402179bb770556c60c6
Author: Steve French <stevef at smf-t60p.smfdom>
Date: Fri Sep 12 16:57:59 2008 -0400
cifs.upcall was not recognizing the newer name "dns_resolver" key type
(as a synonym for the older "cifs.resolver" name) when resolving host
names to ip addresses for the kernel.
Acked-by: Jeff Layton
(cherry picked from commit da92a35cae09d312f11f77d900132422162c435a)
commit f5621d6bf312e8489ab484813b8ebdfffa557de5
Author: Steve French <stevef at smf-t60p.smfdom>
Date: Fri Sep 12 16:57:59 2008 -0400
cifs.upcall: fix compile warning
Steve French noticed these warnings when building cifs.upcall:
Compiling client/cifs.upcall.c
client/cifs.upcall.c: In function 'usage':
client/cifs.upcall.c:204: warning: declaration of 'prog' shadows a global declaration
client/cifs.upcall.c:33: warning: shadowed declaration is here
Change the usage function to not take and arg and have it just use the global
"prog" variable. Fix a typo in the log message generated when an unknown
option is specified. Also getopt() always returns '?' when it sees an unknown
option so there's no point in printing it out.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
(cherry picked from commit fb47f5de055a444b8b7a4555da0160f8d624e286)
commit 7b1528b04bc7b8551e248cb875c6301042b1a9f0
Author: Michael Adam <obnox at samba.org>
Date: Fri Sep 12 16:57:59 2008 -0400
build: fix linking cifs.upcall when nscd_flush_cache() is found.
Michael
(cherry picked from commit c3d0508619e11f3c70fec3427d6cf1213b98895f)
commit f48ec1e53e2cf86722a740283d3b7695c8d99ec9
Author: Jeff Layton <jlayton at redhat.com>
Date: Fri Sep 12 16:57:58 2008 -0400
cifs.upcall: move default install location to EPREFIX/sbin
cifs.upcall links to libraries that live under /usr, so installing it
in /sbin doesn't seem appropriate. Move it to EPREFIX/sbin instead
(i.e. /usr/sbin).
Signed-off-by: Jeff Layton <jlayton at redhat.com>
(cherry picked from commit af743c4407c41ef988ee99891e36b66153697330)
commit a432a6e989b93e6c10073c3270ff30f4d4368b33
Author: Jeff Layton <jlayton at redhat.com>
Date: Fri Sep 12 16:57:58 2008 -0400
cifs.upcall: enable building by default on linux
When building on linux, default to building cifs.upcall. Throw a
warning if ADS support is disabled or keyutils isn't installed.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
(cherry picked from commit 362092be7114d0ed4a8771ff3b4b5166350bac92)
commit 444ad80cb202c9384b5aaa8bd5aeac244ac12eaf
Author: Jeremy Allison <jra at samba.org>
Date: Fri Sep 12 16:57:58 2008 -0400
This patchset comprises a number of cleanups for the cifs upcall
binary. The biggest change is that it renames it from cifs.spnego
to cifs.upcall since the cifs.spnego name really isn't applicable
anymore.
It also fixes a segfault when the program is run without any args
and adds a manpage. Comments and/or suggestions appreciated.
This set should apply cleanly to the 3.3 test branch.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
Jeremy.
(cherry picked from commit e2e41ff95cc2388dd41cee1e105a280fbfcf7c02)
commit 5e1cb15200cdf4ffacb348d4327fef59e44cf00d
Author: Igor Mammedov <niallain at gmail.com>
Date: Fri Sep 12 16:57:58 2008 -0400
Adds support for cifs.resolver upcall.
Here is a patch for userspace cifs.spnego handler that adds support for cifs.resolver
upcall used in DFS code.
Any comments are appreciated.
#############################
Cifs upcall with key type cifs.resolver is used for resolving
server names in handling DFS refferals.
Signed-off-by: Igor Mammedov <niallain at gmail.com>
(cherry picked from commit 64f1f899dc983196692f535e6142acc0c817c0ab)
commit 440395a71d5bd4c0f187990c469abf3b6bd82d29
Author: Simo Sorce <idra at samba.org>
Date: Fri Sep 12 16:57:58 2008 -0400
Fix warning
(cherry picked from commit 63aae3f3135741eab8702eb9b261f7cee2fbeca0)
commit c50f29c99846345ede42be938b91e6b5be1f1ec5
Author: Igor Mammedov <niallain at gmail.com>
Date: Fri Sep 12 16:57:58 2008 -0400
* helper source for handling cifs kernel module upcall for kerberos
authorization
* Added -c option to set service prefix to "cifs" in service principal by
default service prefix "host" is used
* replaced malloc/free/srtncpy with replacements from samba project
Signed-off-by: Igor Mammedov <niallain at gmail.com>
(cherry picked from commit 88989075056fb7b14e3ed33b951d5587227a7be7)
commit 1e0d637aec8dae1fa6acd09c030760e9624b5149
Author: Igor Mammedov <niallain at gmail.com>
Date: Fri Sep 12 16:57:58 2008 -0400
* Adds support for cifs.spnego helper into configure and Makefile.in
* Added checks for spnego prereq keyutils.h and kerberos in configure.in
Signed-off-by: Igor Mammedov <niallain at gmail.com>
(cherry picked from commit 9d2c5aee56d58930d4d982046b7164e12c12db5d)
commit c3cfbf78925fc8591cc6b8d0faea8063d45262d6
Author: Jeremy Allison <jra at samba.org>
Date: Fri Sep 12 11:16:03 2008 -0700
Backport of bugfix for #5751, smbclient: cannot show ACLs on DFS, done by
SATOH Fumiyasu <fumiyas at osstech.co.jp>.
Jeremy.
(cherry picked from commit 5e73ddba11cbf9ea2d6ca63be098720ff0d5a0d1)
commit 74d99ff9dc2a7e5a2b9388e15f0b4dc2b9e64738
Author: Jeremy Allison <jra at samba.org>
Date: Thu Sep 11 12:16:31 2008 -0700
Here's the fix for bug #5750. Note this bug does *NOT* affect
3.2.x (code is different there).
Jeremy.
(cherry picked from commit d3e790fa70d083a53de221907c951580ce2537a4)
commit d2b4cb374239018a41eda697875f690635e3a8e7
Author: Jeremy Allison <jra at samba.org>
Date: Wed Sep 10 16:23:54 2008 -0700
Fix bug #5052 - not work cancel inheritance on share. We were
using the parent security descriptor type and flags instead
of using the passed in SD.
Jeremy.
(cherry picked from commit 78941c166debc8315516d895b2ef77e52417f067)
commit 4a74c133a896443dd0b4479d24939a2a2e44734c
Author: Jeremy Allison <jra at samba.org>
Date: Fri Sep 5 15:36:59 2008 -0700
Remove unecessary msync.
Jeremy.
(cherry picked from commit 2f509fdbed5b0ab3d9ff06bc8101d9851989be19)
commit b45b965484b39566df91354898b192838c0972a2
Author: Qiao Yang <geoyang at ironport.com>
Date: Fri Sep 5 14:17:04 2008 +0200
Fix a memleak
request.extra_data is not freed if there is no extra_data in response or when
there is some error happens in processing. This patch will free the buffer
right after processing a request before sending back a response.
(cherry picked from commit 05a80132ea95f40fdc8d4cfa6f90d8ba472a0272)
commit 1502b4a63bbbbba0712ae2300969845c1a3d08a3
Author: Jeremy Allison <jra at samba.org>
Date: Wed Sep 3 13:19:20 2008 -0700
Fix bug #5729. Explicitly allow "-valid".
Jeremy
(cherry picked from commit f3d604ab72173c9d51661f3b696b0f25da602226)
commit 04e5401313c2bca6cb60656f975cac9eae03fc3c
Author: Simo Sorce <idra at samba.org>
Date: Wed Sep 3 10:44:09 2008 -0400
The msync manpage reports that msync *must* be called before munmap. Failure to do so may result in lost data. Fix an ifdef check, I really think we meant to check HAVE_MMAP here.
(cherry picked from commit 0b39c04fed2720aad07544c65a57b6580ae322a0)
commit cc3e075db52624d5343bba9d1c12669e4ce8902e
Author: Günther Deschner <gd at samba.org>
Date: Fri Aug 29 00:06:09 2008 +0200
net: net should just use machine account creds when changing passwords.
Guenther
(cherry picked from commit 09145720b510647e7c24e3062a4a1246cc7bff5b)
commit 49288787da55298dbd0746f3f1ae551b4ed376eb
Author: Günther Deschner <gd at samba.org>
Date: Fri Aug 29 00:05:32 2008 +0200
Backport bugfix for bug #5710.
In order to successfully update a machine account password we need to use
Netlogon ServerPasswordSet2 when NETLOGON_NEG_PASSWORD_SET2 has been negotiated.
Guenther
(cherry picked from commit 84fbac51ffc5f4a8a4f7b1baf5e9b1af174505f5)
commit 56abb3ee7e0d215c24cec97eff522de7d431cd89
Author: Günther Deschner <gd at samba.org>
Date: Fri Aug 29 00:02:54 2008 +0200
netlogon: "re-run make idl" - implement netr_ServerPasswordSet2 client.
Guenther
(cherry picked from commit a5b913dd31cc3c4d01458e6fcc0a03852a2738a2)
commit 6915e4bd474c41e2da112313263c5cb66e6e7c26
Author: Günther Deschner <gd at samba.org>
Date: Fri Aug 29 00:01:45 2008 +0200
netlogon: define NET_SRVPWSET2 call.
Guenther
(cherry picked from commit 15fe1a3fa07493060a0155bd4f9f0f9bd1588d50)
commit c60631879dbe6e87bc03c0412a4c8857b2f4339b
Author: Andrew Tridgell <tridge at samba.org>
Date: Tue Aug 26 09:59:54 2008 -0700
become root for AIO operations
We need to become root for AIO read and write to allow the AIO thread
to send a completion signal to the parent process when the IO
completes
(cherry picked from commit 91dcce0e4deb87c6d5e491eb9dbb09fd04981d28)
commit 6b4a425a072d471a28578744f934f92d38d44d1a
Author: Andrew Tridgell <tridge at samba.org>
Date: Tue Aug 26 09:59:20 2008 -0700
EINVAL is also a valid error return, meaning "this filesystem
cannot do sendfile for this file"
(cherry picked from commit 5f30f87dcbeaf30713fadeb130193cb86021e87f)
commit c1ef3b8e28777f70086c8d2ee851e3a0b5b4ca4c
Author: Andrew Tridgell <tridge at samba.org>
Date: Sun Aug 24 13:56:59 2008 +1000
Avoid a race condition in glibc between AIO and setresuid().
See this test: http://samba.org/~tridge/junkcode/aio_uid.c
The problem is that setresuid() tries to be clever about threads, and
tries to change the euid of any threads that are running. If a AIO read
or write completes while this is going on then the signal from the thread
where the IO completed is lost, as it gets -1/EPERM from rt_sigqueueinfo()
The simplest fix is to try to use setreuid() instead of setresuid(),
as setreuid() doesn't try to be clever. Unfortunately this also means
we must use become_root()/unbecome_root() in the aio code.
(cherry picked from commit 5e3b978c51e741d413b856adafa1b1090ed8dd7b)
commit b12957121da913f9c0bfb9bf376fca87c2090485
Author: Gerald (Jerry) Carter <jerry at samba.org>
Date: Mon Aug 25 17:41:42 2008 -0500
Set version to 3.0.33-GIT
(cherry picked from commit 1e1449afba5d37fcfd26e0ca7edde05715bc48f7)
commit ecaaefa2731c534a91e3c1176b5235d29e7a8937
Author: David Leonard <David.Leonard at quest.com>
Date: Mon Aug 25 15:14:41 2008 -0700
Fix bug 4516, no IPv6 on Solaris 2.6.
(cherry picked from commit e05cf6e9337f949d369c915d8eec20dc58aa614e)
-----------------------------------------------------------------------
Summary of changes:
docs-xml/Samba3-HOWTO/TOSHARG-TheNetCommand.xml | 2 +-
docs-xml/htmldocs.html | 8 +-
docs-xml/manpages-3/cifs.upcall.8.xml | 115 +++++++
docs-xml/manpages-3/idmap_ad.8.xml | 8 +-
docs-xml/manpages-3/mount.cifs.8.xml | 8 +-
docs-xml/manpages-3/net.8.xml | 2 +-
docs-xml/manpages-3/smbclient.1.xml | 24 +-
docs-xml/manpages-3/vfs_recycle.8.xml | 13 +-
docs-xml/smbdotconf/ldap/ldapssl.xml | 37 +--
docs-xml/smbdotconf/misc/addsharecommand.xml | 20 +-
docs-xml/smbdotconf/misc/changesharecommand.xml | 20 +-
docs-xml/smbdotconf/misc/deletesharecommand.xml | 18 +-
docs-xml/smbdotconf/misc/socketaddress.xml | 12 +-
docs-xml/smbdotconf/security/writeable.xml | 2 +
docs-xml/smbdotconf/vfs/aclcompatibility.xml | 2 +-
examples/perfcounter/perfcountd.init | 6 +-
source/Makefile.in | 25 ++-
source/auth/pampass.c | 5 +-
source/client/cifs.upcall.c | 392 +++++++++++++++++++++++
source/client/cifs_spnego.h | 46 +++
source/client/mount.cifs.c | 253 +++++++++------
source/client/mount.h | 38 +++
source/client/mtab.c | 220 +++++++++++++
source/client/umount.cifs.c | 22 +--
source/configure.in | 81 ++++-
source/include/ads.h | 1 -
source/include/rpc_dce.h | 2 +
source/include/rpc_netlogon.h | 18 +
source/include/smb.h | 4 +-
source/lib/events.c | 55 ++--
source/lib/replace/autoconf-2.60.m4 | 2 +
source/lib/util.c | 13 +
source/lib/util_tdb.c | 2 +-
source/libads/ldap.c | 56 +++-
source/libsmb/libsmbclient.c | 47 ++-
source/libsmb/namequery.c | 80 +++++-
source/libsmb/trusts_util.c | 28 +-
source/nsswitch/pam_winbind.c | 8 +
source/nsswitch/winbind_nss_solaris.c | 25 ++-
source/nsswitch/winbindd.c | 10 +-
source/nsswitch/winbindd_ads.c | 80 +++++-
source/nsswitch/winbindd_cm.c | 67 ++--
source/nsswitch/winbindd_cred_cache.c | 353 +++++++++++++++++----
source/nsswitch/winbindd_dual.c | 161 +++++++---
source/nsswitch/winbindd_nss.h | 31 +-
source/nsswitch/winbindd_pam.c | 24 +-
source/nsswitch/winbindd_passdb.c | 1 +
source/nsswitch/winbindd_rpc.c | 61 ++--
source/nsswitch/winbindd_util.c | 3 +-
source/param/loadparm.c | 4 +-
source/rpc_client/cli_netlogon.c | 50 +++
source/rpc_parse/parse_net.c | 80 +++++
source/smbd/aio.c | 6 +
source/smbd/conn.c | 2 +-
source/smbd/files.c | 10 +-
source/smbd/msdfs.c | 12 +-
source/smbd/notify.c | 3 +
source/smbd/posix_acls.c | 25 ++-
source/smbd/process.c | 2 +
source/smbd/reply.c | 9 +-
source/smbd/server.c | 20 +-
source/smbd/sesssetup.c | 10 +-
source/smbd/share_access.c | 4 +-
source/smbd/trans2.c | 16 +-
source/smbd/uid.c | 52 +++-
source/tdb/common/io.c | 4 +-
source/tdb/common/transaction.c | 2 +-
source/utils/net_ads.c | 5 +-
source/utils/net_rap.c | 2 +-
source/utils/net_rpc.c | 2 +
source/utils/ntlm_auth.c | 20 +-
source/utils/smbtree.c | 16 +-
source/web/statuspage.c | 5 +-
source/web/swat.c | 2 +-
74 files changed, 2322 insertions(+), 552 deletions(-)
create mode 100644 docs-xml/manpages-3/cifs.upcall.8.xml
create mode 100644 source/client/cifs.upcall.c
create mode 100644 source/client/cifs_spnego.h
mode change 100755 => 100644 source/client/mount.cifs.c
create mode 100644 source/client/mount.h
create mode 100644 source/client/mtab.c
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/htmldocs.html b/docs-xml/htmldocs.html
index d2be5ef..44fcc0f 100644
--- a/docs-xml/htmldocs.html
+++ b/docs-xml/htmldocs.html
@@ -23,19 +23,15 @@
<td valign="top">This book provides example configurations, it documents key aspects of Microsoft Windows networking, provides in-depth insight into the important configuration of Samba-3, and helps to put all of these into a useful framework.</td>
</tr>
<tr>
- <td valign="top"><a href="../using_samba/toc.html">Using Samba</a>, 2nd Edition</td>
+ <td valign="top"><a href="using_samba/toc.html">Using Samba</a>, 2nd Edition</td>
<td valign="top"><i>Using Samba</i>, Second Edition is a comprehensive guide to Samba administration. It covers all versions of Samba from 2.0 to 2.2, including selected features from an alpha version of 3.0, as well as the SWAT graphical configuration tool. Updated for Windows 2000, ME, and XP, the book also explores Samba's new role as a primary domain controller and domain member server, its support for the use of Windows NT/2000/XP authentication and filesystem security on the host Unix system, and accessing shared files and printers from Unix clients.</td>
</tr>
<tr>
- <td valign="top"><a href="manpages-3/index.html">Man pages</a></td>
+ <td valign="top"><a href="manpages/index.html">Man pages</a></td>
<td valign="top">The Samba man pages in HTML.</td>
</tr>
<tr>
<td valign="top"><a href="../../WHATSNEW.txt">WHATSNEW</a></td>
<td valign="top">Samba Release Notes.</td>
</tr>
-<tr>
- <td valign="top"><a href="../../README.VENDOR">README.VENDOR</a></td>
- <td valign="top">VENDOR specific information.</td>
-</tr>
</table></body></html>
diff --git a/docs-xml/manpages-3/cifs.upcall.8.xml b/docs-xml/manpages-3/cifs.upcall.8.xml
new file mode 100644
index 0000000..3c1bb24
--- /dev/null
+++ b/docs-xml/manpages-3/cifs.upcall.8.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<refentry id="cifs.upcall.8">
+
+
+<refmeta>
+ <refentrytitle>cifs.upcall</refentrytitle>
+ <manvolnum>8</manvolnum>
+ <refmiscinfo class="source">Samba</refmiscinfo>
+ <refmiscinfo class="manual">System Administration tools</refmiscinfo>
+ <refmiscinfo class="version">3.2</refmiscinfo>
+</refmeta>
+
+<refnamediv>
+ <refname>cifs.upcall</refname>
+ <refpurpose>Userspace upcall helper for Common Internet File System (CIFS)</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <cmdsynopsis>
+ <command>cifs.upcall</command>
+ <arg choice="opt">-c</arg>
+ <arg choice="opt">-v</arg>
+ <arg choice="req">keyid</arg>
+ </cmdsynopsis>
+</refsynopsisdiv>
+
+
+<refsect1>
+ <title>DESCRIPTION</title>
+
+ <para>This tool is part of the <citerefentry><refentrytitle>samba</refentrytitle>
+ <manvolnum>7</manvolnum></citerefentry> suite.</para>
+
+<para>cifs.upcall is a userspace helper program for the linux CIFS client
+filesystem. There are a number of activities that the kernel cannot easily
+do itself. This program is a callout program that does these things for the
+kernel and then returns the result.</para>
+
+<para>cifs.upcall is generally intended to be run when the kernel calls
+request-key<manvolnum>8</manvolnum> for a particular key type. While it
+can be run directly from the command-line, it's not generally intended
+to be run that way.</para>
+</refsect1>
+
+<refsect1>
+ <title>OPTIONS</title>
+ <variablelist>
+ <varlistentry>
+ <term>-c</term>
+ <listitem><para>When handling a kerberos upcall, use a service principal that starts with "cifs/". The default is to use the "host/" service principal.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-v</term>
+ <listitem><para>Print version number and exit.
+ </para></listitem>
+ </varlistentry>
+ </variablelist>
+</refsect1>
+
+<refsect1>
+ <title>CONFIGURATION FOR KEYCTL</title>
+ <para>cifs.upcall is designed to be called from the kernel via the request-key callout program. This requres that request-key be told where and how to call this program. The current cifs.upcall program handles two different key types:</para>
+
+ <variablelist>
+ <varlistentry>
+ <term>cifs.spnego</term>
+ <listitem><para>This keytype is for retrieving kerberos session keys
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>dns_resolver</term>
+ <listitem><para>This key type is for resolving hostnames into IP addresses
+ </para></listitem>
+ </varlistentry>
+ </variablelist>
+
+ <para>To make this program useful for CIFS, you'll need to set up entries for them in request-key.conf<manvolnum>5</manvolnum>. Here's an example of an entry for each key type:</para>
+<programlisting>
+#OPERATION TYPE D C PROGRAM ARG1 ARG2...
+#========= ============= = = ==========================================
+create cifs.spnego * * /usr/local/sbin/cifs.upcall -c %k
+create dns_resolver * * /usr/local/sbin/cifs.upcall %k
+</programlisting>
+<para>
+See <citerefentry><refentrytitle>request-key.conf<manvolnum>5</manvolnum></refentrytitle></citerefentry> for more info on each field.
+</para>
+</refsect1>
+
+<refsect1>
+ <title>SEE ALSO</title>
+ <para>
+ <citerefentry><refentrytitle>request-key.conf</refentrytitle>
+ <manvolnum>5</manvolnum></citerefentry>,
+ <citerefentry><refentrytitle>mount.cifs</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry>
+ </para>
+</refsect1>
+
+<refsect1>
+ <title>AUTHOR</title>
+
+ <para>Igor Mammedov wrote the cifs.upcall program.</para>
+ <para>Jeff Layton authored this manpage.</para>
+ <para>The maintainer of the Linux CIFS VFS is Steve French.</para>
+ <para>The <ulink url="mailto:linux-cifs-client at lists.samba.org">Linux
+ CIFS Mailing list</ulink> is the preferred place to ask
+ questions regarding these programs.
+ </para>
+</refsect1>
+
+</refentry>
diff --git a/docs-xml/manpages-3/idmap_ad.8.xml b/docs-xml/manpages-3/idmap_ad.8.xml
index a007b77..f488f2f 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/mount.cifs.8.xml b/docs-xml/manpages-3/mount.cifs.8.xml
index fcea5bc..86242a2 100644
--- a/docs-xml/manpages-3/mount.cifs.8.xml
+++ b/docs-xml/manpages-3/mount.cifs.8.xml
@@ -89,7 +89,7 @@ to be specified as part of the username.
<listitem><para>specifies the CIFS password. If this
option is not given then the environment variable
-<emphasis>PASSWD</emphasis> is used. If the password is not specified
+<emphasis>PASSWD</emphasis> is used. If the password is not specified
directly or indirectly via an argument to mount, <emphasis>mount.cifs</emphasis> will prompt
for a password, unless the guest option is specified.
</para>
@@ -106,14 +106,16 @@ below) or entered at the password prompt will be read correctly.
<listitem><para>
specifies a file that contains a username
- and/or password. The format of the file is:
+ and/or password and optionally the name of the
+ workgroup. The format of the file is:
</para>
<programlisting>
username=<replaceable>value</replaceable>
password=<replaceable>value</replaceable>
+ workgroup=<replaceable>value</replaceable>
</programlisting>
-
+
<para>
This is preferred over having passwords in plaintext in a
shared file, such as <filename>/etc/fstab</filename>. Be sure to protect any
diff --git a/docs-xml/manpages-3/net.8.xml b/docs-xml/manpages-3/net.8.xml
index 54606c3..8c9408b 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/manpages-3/smbclient.1.xml b/docs-xml/manpages-3/smbclient.1.xml
index dad6177..55f1d4a 100644
--- a/docs-xml/manpages-3/smbclient.1.xml
+++ b/docs-xml/manpages-3/smbclient.1.xml
@@ -13,7 +13,7 @@
<refnamediv>
<refname>smbclient</refname>
- <refpurpose>ftp-like client to access SMB/CIFS resources
+ <refpurpose>ftp-like client to access SMB/CIFS resources
on servers</refpurpose>
</refnamediv>
@@ -30,6 +30,7 @@
<arg choice="opt">-m maxprotocol</arg>
<arg choice="opt">-A authfile</arg>
<arg choice="opt">-N</arg>
+ <arg choice="opt">-g</arg>
<arg choice="opt">-i scope</arg>
<arg choice="opt">-O <socket options></arg>
<arg choice="opt">-p port</arg>
@@ -39,7 +40,7 @@
<arg choice="opt">-P</arg>
<arg choice="opt">-c <command></arg>
</cmdsynopsis>
-
+
<cmdsynopsis>
<command>smbclient</command>
<arg choice="req">servicename</arg>
@@ -54,6 +55,7 @@
<arg choice="opt">-m maxprotocol</arg>
<arg choice="opt">-A authfile</arg>
<arg choice="opt">-N</arg>
+ <arg choice="opt">-g</arg>
<arg choice="opt">-l log-basename</arg>
<arg choice="opt">-I destinationIP</arg>
<arg choice="opt">-E</arg>
@@ -233,7 +235,7 @@
on your WfWg PCs if you want them to always be able to receive
messages. </para></listitem>
</varlistentry>
-
+
<varlistentry>
<term>-p port</term>
<listitem><para>This number is the TCP port number that will be used
@@ -241,19 +243,27 @@
TCP port number for an SMB/CIFS server is 139, which is the
default. </para></listitem>
</varlistentry>
-
+
+ <varlistentry>
+ <term>-g</term>
+ <listitem><para>This parameter provides combined with
+ <parameter>-L</parameter> easy parseable output that allows processing
+ with utilities such as grep and cut.
+ </para></listitem>
+ </varlistentry>
+
<varlistentry>
<term>-P</term>
<listitem><para>
Make queries to the external server using the machine account of the local server.
</para></listitem>
</varlistentry>
-
+
&stdarg.help;
-
+
<varlistentry>
<term>-I IP-address</term>
- <listitem><para><replaceable>IP address</replaceable> is the address of the server to connect to.
+ <listitem><para><replaceable>IP address</replaceable> is the address of the server to connect to.
It should be specified in standard "a.b.c.d" notation. </para>
<para>Normally the client would attempt to locate a named
diff --git a/docs-xml/manpages-3/vfs_recycle.8.xml b/docs-xml/manpages-3/vfs_recycle.8.xml
index 21f72b1..f3bb324 100644
--- a/docs-xml/manpages-3/vfs_recycle.8.xml
+++ b/docs-xml/manpages-3/vfs_recycle.8.xml
@@ -185,14 +185,17 @@
<refsect1>
<title>EXAMPLES</title>
- <para>Log operations on all shares using the LOCAL1 facility
- and NOTICE priority:</para>
+ <para>Move files "deleted" on <parameter>share</parameter> to
+ <parameter>/data/share/.recycle</parameter> instead of deleting them:
+ </para>
<programlisting>
- <smbconfsection name="[global]"/>
+ <smbconfsection name="[share]"/>
+ <smbconfoption name="path">/data/share</smbconfoption>
<smbconfoption name="vfs objects">recycle</smbconfoption>
- <smbconfoption name="recycle:facility">LOCAL1</smbconfoption>
- <smbconfoption name="recycle:priority">NOTICE</smbconfoption>
+ <smbconfoption name="recycle:repository">.recycle</smbconfoption>
+ <smbconfoption name="recycle:keeptree">yes</smbconfoption>
+ <smbconfoption name="recycle:versions">yes</smbconfoption>
</programlisting>
</refsect1>
diff --git a/docs-xml/smbdotconf/ldap/ldapssl.xml b/docs-xml/smbdotconf/ldap/ldapssl.xml
index 39ed08f..d785071 100644
--- a/docs-xml/smbdotconf/ldap/ldapssl.xml
+++ b/docs-xml/smbdotconf/ldap/ldapssl.xml
@@ -3,36 +3,35 @@
type="enum"
advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
- <description>
+<description>
<para>This option is used to define whether or not Samba should
use SSL when connecting to the ldap server
This is <emphasis>NOT</emphasis> related to
- Samba's previous SSL support which was enabled by specifying the
- <command moreinfo="none">--with-ssl</command> option to the <filename moreinfo="none">configure</filename>
+ Samba's previous SSL support which was enabled by specifying the
+ <command moreinfo="none">--with-ssl</command> option to the
+ <filename moreinfo="none">configure</filename>
script.</para>
-
-<para>The <smbconfoption name="ldap ssl"/> can be set to one of three values:</para>
+
+ <para>LDAP connections should be secured where possible. This may be
+ done setting either this parameter to
+ <parameter moreinfo="none">Start_tls</parameter>
+ or by specifying <parameter moreinfo="none">ldaps://</parameter> in
+ the URL argument of <smbconfoption name="passdb backend"/>.</para>
+
+ <para>The <smbconfoption name="ldap ssl"/> can be set to one of
+ two values:</para>
<itemizedlist>
<listitem>
- <para><parameter moreinfo="none">Off</parameter> = Never
+ <para><parameter moreinfo="none">Off</parameter> = Never
use SSL when querying the directory.</para>
</listitem>
<listitem>
- <para><parameter moreinfo="none">Start_tls</parameter> = Use
- the LDAPv3 StartTLS extended operation (RFC2830) for
+ <para><parameter moreinfo="none">Start_tls</parameter> = Use
+ the LDAPv3 StartTLS extended operation (RFC2830) for
communicating with the directory server.</para>
</listitem>
-
- <listitem>
- <para><parameter moreinfo="none">On</parameter> = Use SSL
- on the ldaps port when contacting the <parameter
- moreinfo="none">ldap server</parameter>. Only available when the
- backwards-compatiblity <command
- moreinfo="none">--with-ldapsam</command> option is specified
- to configure. See <smbconfoption name="passdb backend"/></para>.
- </listitem>
- </itemizedlist>
+ </itemizedlist>
</description>
-<value type="default">start_tls</value>
+<value type="default">no</value>
</samba:parameter>
diff --git a/docs-xml/smbdotconf/misc/addsharecommand.xml b/docs-xml/smbdotconf/misc/addsharecommand.xml
index 9eb50f3..de8da7b 100644
--- a/docs-xml/smbdotconf/misc/addsharecommand.xml
+++ b/docs-xml/smbdotconf/misc/addsharecommand.xml
@@ -7,15 +7,19 @@
<para>
Samba 2.2.0 introduced the ability to dynamically add and delete shares via the Windows NT 4.0 Server
Manager. The <parameter moreinfo="none">add share command</parameter> is used to define an external program
- or script which will add a new service definition to <filename moreinfo="none">smb.conf</filename>. In order
- to successfully execute the <parameter moreinfo="none">add share command</parameter>, <command
- moreinfo="none">smbd</command> requires that the administrator be connected using a root account (i.e. uid == 0).
+ or script which will add a new service definition to
+ <filename moreinfo="none">smb.conf</filename>.
</para>
- <para>
- If the connected account has <literal>SeDiskOperatorPrivilege</literal>, scripts defined in
- <parameter moreinfo="none">change share</parameter> parameter are executed as root.
- </para>
+ <para>
+ In order to successfully execute the
+ <parameter moreinfo="none">add share command</parameter>,
+ <command moreinfo="none">smbd</command> requires that the administrator
+ connects using a root account (i.e. uid == 0) or has the
+ <literal>SeDiskOperatorPrivilege</literal>.
+ Scripts defined in the <parameter moreinfo="none">add share command</parameter>
+ parameter are executed as root.
+ </para>
<para>
When executed, <command moreinfo="none">smbd</command> will automatically invoke the
@@ -56,7 +60,7 @@
</itemizedlist>
<para>
- This parameter is only used for add file shares. To add printer shares, see the <smbconfoption
+ This parameter is only used to add file shares. To add printer shares, see the <smbconfoption
name="addprinter command"/>.
</para>
</description>
diff --git a/docs-xml/smbdotconf/misc/changesharecommand.xml b/docs-xml/smbdotconf/misc/changesharecommand.xml
index 5a42e22..2033fcf 100644
--- a/docs-xml/smbdotconf/misc/changesharecommand.xml
+++ b/docs-xml/smbdotconf/misc/changesharecommand.xml
@@ -8,14 +8,17 @@
Samba 2.2.0 introduced the ability to dynamically add and delete shares via the Windows NT 4.0 Server
Manager. The <parameter moreinfo="none">change share command</parameter> is used to define an external
program or script which will modify an existing service definition in <filename
-moreinfo="none">smb.conf</filename>. In order to successfully execute the <parameter moreinfo="none">change
-share command</parameter>, <command moreinfo="none">smbd</command> requires that the administrator be
-connected using a root account (i.e. uid == 0).
+moreinfo="none">smb.conf</filename>.
</para>
<para>
- If the connected account has <literal>SeDiskOperatorPrivilege</literal>, scripts defined in
- <parameter moreinfo="none">change share</parameter> parameter are executed as root.
+ In order to successfully execute the
+ <parameter moreinfo="none">change share command</parameter>,
+ <command moreinfo="none">smbd</command> requires that the administrator
+ connects using a root account (i.e. uid == 0) or has the
+ <literal>SeDiskOperatorPrivilege</literal>.
+ Scripts defined in the <parameter moreinfo="none">change share command</parameter>
+ parameter are executed as root.
</para>
<para>
@@ -58,13 +61,14 @@ connected using a root account (i.e. uid == 0).
</itemizedlist>
<para>
- This parameter is only used modify existing file shares definitions. To modify
- printer shares, use the "Printers..." folder as seen when browsing the Samba host.
+ This parameter is only used to modify existing file share definitions.
+ To modify printer shares, use the "Printers..." folder as seen
+ when browsing the Samba host.
</para>
</description>
<related>add share command</related>
<related>delete share command</related>
<value type="default"></value>
-<value type="example">/usr/local/bin/addshare</value>
+<value type="example">/usr/local/bin/changeshare</value>
</samba:parameter>
diff --git a/docs-xml/smbdotconf/misc/deletesharecommand.xml b/docs-xml/smbdotconf/misc/deletesharecommand.xml
index 40eb649..3def6b8 100644
--- a/docs-xml/smbdotconf/misc/deletesharecommand.xml
+++ b/docs-xml/smbdotconf/misc/deletesharecommand.xml
@@ -8,15 +8,17 @@
Samba 2.2.0 introduced the ability to dynamically add and delete shares via the Windows NT 4.0 Server
Manager. The <parameter moreinfo="none">delete share command</parameter> is used to define an external
program or script which will remove an existing service definition from
- <filename moreinfo="none">smb.conf</filename>. In order to successfully execute the
- <parameter moreinfo="none">delete share command</parameter>, <command moreinfo="none">smbd</command>
- requires that the administrator be connected using a root account (i.e. uid == 0).
+ <filename moreinfo="none">smb.conf</filename>.
--
Samba Shared Repository
More information about the samba-cvs
mailing list