[SCM] Samba Shared Repository - branch v3-2-stable updated -
release-3-2-7-141-g545072b
Karolin Seeger
kseeger at samba.org
Wed Jan 28 09:10:43 GMT 2009
The branch, v3-2-stable has been updated
via 545072b91fff2a125ea568ae569ced24a4c3146e (commit)
via f6f9b1b5e0b2bf215cbfa774672c18ec348cb2e9 (commit)
via f9bc6b4405e2bc330a50809ee45a5af282a8738e (commit)
via de5e7008c40844242f943e036f3c3173a73e3d52 (commit)
via 34448b75b1c704fb25d196264bc9a35fd43d7d65 (commit)
via 5b3d0f891b2f9e16ae912e4178b13ef4b5cc89c3 (commit)
via 715c51d30b061d20664ac2292e175c4f8f25970d (commit)
via ffdfcf1dda4a385287f310fe76cac966357c3fcb (commit)
via a713240b37d30164c95f85f20bc23beab10aa300 (commit)
via 38d5f486fef0c7647b9a0289f0a80323312c7407 (commit)
via 96c7c676c83b3a72fe4b303eb6980fb4932e63da (commit)
via 2868fd5258206ce3e4255549461d60ac438d5fca (commit)
via dce5898e0c0c11dc7eae25316c765af89f2c822f (commit)
via 9dd2b526c1a92af37b6c47629076d31166445fb2 (commit)
via d1a47654ee2c7d6fe38ceaf3fd65bfd33caabcb7 (commit)
via a0e1e76cdd4183e85ea14ce990e47bd80eedd8ef (commit)
via 0bec8ca5044a04433aa2701fe588fc94a9dea105 (commit)
via df1f8c623bf98815c1a9de67f9ffef9455075da0 (commit)
via 4aa9ca2b0c9f7c3ee42f69eed8e1f66e08cd8991 (commit)
via da24aca4a19eb78037301f48bd54ade16c92bec5 (commit)
via a1f3e8b12ae256a61fd7b8edc8912982ba25676a (commit)
via beee5ee29628c5205a34b7659ab3d9a80a939d54 (commit)
via 6808519747078dc17d2a131a3dfc74606e61fe96 (commit)
via c95963fd146c6d9bb0bada7a7cfe0feb2258f1be (commit)
via 2ef540159fae283fdbd56063abe78019b741637f (commit)
via c977a57f0245766302da3b301bd7c20256dac7d2 (commit)
via 81c8e0972297eeaf590f266cd60ebedbfaeea2aa (commit)
via 538536032e25e01aa70eab3b5be3953fcc0342bd (commit)
via aab36af2dfece9d7e221fd9299c2d9f27e8a07c8 (commit)
via 5860347258101dd8d800065e4bcdfdc3137d58a4 (commit)
via 04b02e35021cf57c05d990a041e6a8177682c18d (commit)
via 61856c881b541fa81b4242336d3f717cc0688cb5 (commit)
via b5afab9ce83a873290911cb81be696299c26f5f6 (commit)
via 0a8e64887b7bb2f4d473da342d035bf8a05193c7 (commit)
via ff5fcc5538b8f17a56fd4533f25bd2cb25523089 (commit)
via 6b21fd6bfb3f70667b6c6b1292557e889cdabffb (commit)
via 44f5047bfe8687c2eacc097d5b14c1e2a1bfcd55 (commit)
via b0f23b4dae1b31060579f716265b07c7b369768d (commit)
via 1a812bee2208970deb450e8de2487278ab709d06 (commit)
via 3ab393efc9be444de6f4fda5b08a6f8aa3a03af1 (commit)
via d540149c43d85d8c8a05f4d4a435dd55b440c290 (commit)
via c5d50c4f941d3f21d5b8449f951af51bdb23887f (commit)
via 629fc6c835a21f95cdf2f835afd5045b94c21258 (commit)
via 4f3059e900ebe65a6d12a0986e4d07bac251a0ca (commit)
via f0b6eca850ddbec7b6bb7b5bbe7bda1a75134c49 (commit)
via 8a57f19adc76ef87d3323c865769f1e62866b789 (commit)
via c38482dafffeab0a66642a17a786f1c553fbe657 (commit)
via 5c1505ce9d6925dd3368c4395d0fcec656df8656 (commit)
via 5d05e17cdba5cfd16fb4b85feb120acbbc78e2d1 (commit)
via 01124fe56cc406489c0bb6939249b10fdf6395b6 (commit)
via 0772953e6de5db916bc6c4b27348de1aab8681e1 (commit)
via 924615762a258945e61d4ce9d6c2b351cd0d3f7a (commit)
via 5fa4fb8a9b0f800f96dbf4e840392fff65237655 (commit)
via 7631b35bdd24f4a92fed540acf080a37b9e9909c (commit)
via 24be3b12a045b5b67c518a12e3517fe8e63866ba (commit)
via f3bf108bfeaa6e29a1720702e4501d1f05437cfe (commit)
via 4c15683140fa1d49b3f26a827145e22fc194b75b (commit)
via 18ee7b60583529e5b3bf18d740545119f7b5a8a2 (commit)
via f7fb3a6efaecce830d62c0f0250a8283fae76911 (commit)
via bc50c510bf58700f8ed781a5db0094e60aff27d2 (commit)
via 3d52e4b6a76becf7420dc849cbd52ead5194b126 (commit)
via a0a951d2a4f52ed43e7877c8be81f6853b22aa6f (commit)
via 988fae9d26c62690ce3ecad3316854be6d4297cf (commit)
via b21556530badf62fcf2d9a204a61e429e95b0b14 (commit)
via 5ee8d218f4bd0f846087fe37ef7fb1b2443281d6 (commit)
via 82d30e4cd26b2b34d3f2fe7643f407526f4ba86b (commit)
via b6ec8a88e143976f4d4a4bd7f77014ee782197c6 (commit)
via e3de003abe043bd427c245c4cf0678f327614b81 (commit)
via 414836e9c8d1659042273f40d2e70881409e6972 (commit)
via f41a4e5d9212f196aae979d38cd6b35018868f9c (commit)
via 413827e6d785da4974b33e5ce03d7883488e1466 (commit)
via 5b47d99110c1841227779b2a39de1b5c4d3ba01e (commit)
via 495f6326d2b3a723e82f41903e407cd63eadcdba (commit)
via a31ffd738fb31272a4f6b9dff99f46c13a45fe07 (commit)
via 2967b8a9981b3e193988f76e4fec24296a3858c1 (commit)
via 63bc7a8447eb7dfca228829dc428f791e4a01bae (commit)
via 627eb5683b7e2439d70f35c96f41f86ed5898383 (commit)
via 48496360782ca5340f793276d56825d1c2d32acb (commit)
via cc328e27c282e77cc23f4ca60c97cf9ff317775b (commit)
via f168bb40af4d21634c862b90ff5da597252c7ee4 (commit)
via 54a4a5e2672bb22a80ad6271378252a35cf32cb1 (commit)
via 0e784cddb1195a49c2ceaae4f4cec49144405ea5 (commit)
via 06e44cde3d718619c202a2180b0a0130f998594d (commit)
via 4a2d45699c99e129db143459a572826407bf12a7 (commit)
via 848b8477b477d9d82297185f82b089b14eb856db (commit)
via 5acce3c319a2e89591dbf614c7e97fe75dcdf04c (commit)
via 82cd6879b2f7403cd89ef4ae7173086620ebdb50 (commit)
via c7ea6c4c2f18fe49778a69fa0b997045521e503d (commit)
via cd86684e528998186929071f24c2f8be4c2dc6d7 (commit)
via e719e232426063f7ad7b07015001fcf7727f26aa (commit)
via 5a14dee5f005ee4c0b8e0eb1e864589ab23a3ec9 (commit)
via 020bffe7453bf5a777cae46eedc409deb72833d2 (commit)
via 5381d1a9b02dc9329de2cb21b7e70fb6aa40dff7 (commit)
via 02f3cab20766f70c3a5128e9c690a89720931637 (commit)
via 334c9ba5befbbda30db3109892aa340cb20c6bb1 (commit)
via 9e998a07214caa1fe6d837f365b39cbaad560111 (commit)
via 5e1af1344713dc0698e72e92592ca38c26cf22ef (commit)
via 61aa567170568901f934f1c150c17b11cbcbd363 (commit)
via 0aef161566733a9a8a43e063facc70f1d825bff4 (commit)
via 779aa8e920d4dd77f241d02ec1c69671a96d7a93 (commit)
via 7ebd26b830689a71d92217087fc6883d9447dcfb (commit)
via 492db227a016ea2ee812b27e6414831702dbd954 (commit)
via f09a7a3a753cb8457b521cd24f3399db253d14ea (commit)
via 02153307b3159dbb1504c4df143062c10dc51ede (commit)
via 81e0b04d99ff1dd1c4d95c279777181eabb6788c (commit)
via 367f439e81f2bf932c99c768d86ad7150c1d6e1d (commit)
via bcca19830ac724cfbca12b28b6197eec5a343d2a (commit)
via 3289614afe2a6ce879b7b24e4a0b766f941e7abb (commit)
via 3a93cfa27e663fca3645648efe654db3eabb2c06 (commit)
via fe0598bb63498a34015e2d4e8f74e829ba5145da (commit)
via 7dbd7074c2b69828078750b88502218bae65c3de (commit)
via 28bed70e5b44d05bb15f878d0a5e382ec19a447c (commit)
via 2f66c88039014f3fae8c1027c870c592043bf365 (commit)
via 7377d62032d81460f2c673c12a5da0ad8329be57 (commit)
via fd80b73cca40bb299a3855ff9428d02abc93f77f (commit)
via b58e2a0573bcd78e26ff3e6eb77596a1b94f0ca0 (commit)
via fc3031b3c52a6f7cc86bac3cb03596e52a559ac6 (commit)
via f0bb44cb7795ef1570ee753915aaa1b5b1681835 (commit)
via c523587a754f126ca088143477b39bcc493dd520 (commit)
via d6f3517263fb17fbe2f71e6b2fb1287344e892af (commit)
via 3baf43766e21d2772780cd446093c9a6d47e37ad (commit)
via 37b42e56a2d2cb80b2955c62950db408d6916215 (commit)
via e0a8c35aff008a9887edf4540648af32214f8c0e (commit)
via efecddca8b55732a8c384b1ae9b74e95e123e4c4 (commit)
via 03a7ad239908bea5d0e2e6fb62cddc0f02aa1da4 (commit)
via 59e6cce7f3e117d055ff4bfdf98e1296317091df (commit)
via a1cc47dd574cc890e66e3b900beb14dac75d6b2f (commit)
via 43f09acc77d0c22eac5130f224441653bf0d94ce (commit)
via d1d4ad612a066bc5215de7233da5e7b22a61ed0f (commit)
via 06f1c9799c57295c0b38cb9c41496546ca68a4fa (commit)
via e7e0ed9830fd3e63643577bbf1b9b36e230498c1 (commit)
via f5937b132ca658f27c0f67e54a4a42322eb9371d (commit)
via 4a0daa5fb5ebbf07d95173cbba7468e9375ade3e (commit)
via 47600645a651e7a9d30d28a7f3053f2f37913ffa (commit)
via a6478e64e331bfdd1772169bf365be907f705e38 (commit)
via 2a004972c76c34d282223f0f960f860c84ce0581 (commit)
via f3570652b785b241e31122626b7d20de98dce5c9 (commit)
via fdc37eb18338a9b1d3106781bd9994605e03e177 (commit)
via eac598406f23f441c0be838b95d4c2ce3fea8fa0 (commit)
via 68c4fdd1f76667b71de342e9d20dc6758676a68c (commit)
via 81af8d53063fb1aedf64ccf71051c067dd9da414 (commit)
from 0730f4e464b249ffe2319e98902ed96089f3230b (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable
- Log -----------------------------------------------------------------
commit 545072b91fff2a125ea568ae569ced24a4c3146e
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.
(cherry picked from commit 239a2d0ac6f1b56d67d7fffdb7388a3008eeb4e2)
commit f6f9b1b5e0b2bf215cbfa774672c18ec348cb2e9
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.
(cherry picked from commit 1497c6964767d6d73d6c1c1f6bbbeff2f05b35bc)
commit f9bc6b4405e2bc330a50809ee45a5af282a8738e
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 e4ae4becbe5ea1454d15f0fb2d6cd4fe7e8edfd7)
commit de5e7008c40844242f943e036f3c3173a73e3d52
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jan 27 16:21:04 2009 -0800
Fix detection of dns_sd libraries.
Jeremy.
(cherry picked from commit e0c56d65f4096cdbcf9e560309e71fc21faa7d9a)
commit 34448b75b1c704fb25d196264bc9a35fd43d7d65
Author: Michael Adam <obnox at samba.org>
Date: Tue Jan 27 15:48:20 2009 +0100
libreplace: fix detection of netinet/ip.h on solaris 8
(The test needs to additionally include <netinet/in_systm.h>.)
Michael
(cherry picked from commit a223b096700bc54b446a0e152c842b088566720b)
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit ac4d07ef8300a2b571296b8b3f7c23e8850b526a)
commit 5b3d0f891b2f9e16ae912e4178b13ef4b5cc89c3
Author: Michael Adam <obnox at samba.org>
Date: Tue Jan 27 12:13:55 2009 +0100
libreplace: fix bug #6066 - netinet/ip.h present but cannot be compiled
under solaris
Michael
(cherry picked from commit 1b7beaed69823b3c401bc4c0b1c502b671169168)
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 74534203b5b91445cd8ae4cd7f2a0d35ea73a281)
commit 715c51d30b061d20664ac2292e175c4f8f25970d
Author: Andreas Schneider <anschneider at suse.de>
Date: Mon Jan 26 14:38:34 2009 +0100
Document default of the printing config variable.
Signed-off-by: Andreas Schneider <anschneider at suse.de>
(cherry picked from commit d8f15e4efc00b9d509ff5761e9ca8ff5c6f443f7)
(cherry picked from commit 541704e253f06f8b33006b6c27f51b934c2eb51f)
(cherry picked from commit 69880dac28ac1681bb0c3d84280494de3d788cc6)
(cherry picked from commit c2d30b0a8e3609854908aeff19174e8e4e291cb7)
commit ffdfcf1dda4a385287f310fe76cac966357c3fcb
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Jan 26 14:17:23 2009 +0100
docs: Add manpage for vfs_shadow_copy2.
Karolin
(cherry picked from commit 512cf0ad50d30fcb35a28b0ef1b859d754f42a99)
(cherry picked from commit 7ca4b8ec65d5f8794c58f27f3f17033143732897)
(cherry picked from commit addd0f41eeaf255217f1ab156e970c41a929aa43)
(cherry picked from commit a09ca37c438f31133943238b15c63a5834226c73)
commit a713240b37d30164c95f85f20bc23beab10aa300
Author: Günther Deschner <gd at samba.org>
Date: Sat Jan 24 02:10:47 2009 +0100
s3-eventlog: fix various invalid memcpy in read_package_entry().
Guenther
(cherry picked from commit 75fff603625e0259f187e0fa47efd85887092fae)
(cherry picked from commit a691e29b466fdf1776160d92704e1ca958fa9eee)
commit 38d5f486fef0c7647b9a0289f0a80323312c7407
Author: Günther Deschner <gd at samba.org>
Date: Sat Jan 24 02:07:40 2009 +0100
s3-eventlog: fix buffer allocation in eventlog read call.
This broke with f6fa3080fee1b20df9f1968500840a88cf0ee592 back in April 2007...
Guenther
(cherry picked from commit 547c70e896b6890dd5f7b911e4e0ca107c8a3fa3)
(cherry picked from commit 632f4b83158d46ae456713286a27ac0c2aa2ee25)
commit 96c7c676c83b3a72fe4b303eb6980fb4932e63da
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Jan 23 13:02:46 2009 +0100
docs: Fix formatting issue in man libsmbclient.
Karolin
(cherry picked from commit aa2fb0efb7ce2bc732569b4baf20c57375fdce59)
(cherry picked from commit e1e3a0554fcaabacc5bec51c213622271a83ad04)
(cherry picked from commit 84237fb48aad5f11789d75a6767a6f47465f140b)
commit 2868fd5258206ce3e4255549461d60ac438d5fca
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Jan 22 11:52:54 2009 +0100
lib/replace: add defines to let the callers find out if pwrite and pread are thread/fork safe
metze
(cherry picked from commit 7fc7ee9331d0539359ad88c527f59d5fdf212209)
(cherry picked from commit d74b63091781e442e42b1fa7881e903a0bcc928c)
(cherry picked from commit 9483b143fe473d374e7f5c71f0d497f28f4e69f7)
commit dce5898e0c0c11dc7eae25316c765af89f2c822f
Author: Jeremy Allison <jra at samba.org>
Date: Thu Jan 22 16:25:30 2009 -0800
Apply same logic fix for #4308 Excel save operation corrupts file ACLs
to NFSv4 ACL code as this uses the same flawed logic as posix_acls.c.
Jeremy.
(cherry picked from commit 7b994fc658ad175bc40af9e38a8f1b870276d980)
commit 9dd2b526c1a92af37b6c47629076d31166445fb2
Author: Jeremy Allison <jra at samba.org>
Date: Thu Jan 22 16:10:36 2009 -0800
Fix logic error in try_chown - we shouldn't arbitrarily chown
to ourselves unless that was passed in.
Jeremy.
(cherry picked from commit d04d93f783533612e20326b7b6ea5958eb5fcdc6)
commit d1a47654ee2c7d6fe38ceaf3fd65bfd33caabcb7
Author: Jeremy Allison <jra at samba.org>
Date: Thu Jan 22 14:32:44 2009 -0800
Second part of the attemt to fix #4308 - Excel save operation corrupts file ACLs.
If the chown succeeds then the ACL set should also. Ensure this is the case
(refactor some of this code to make it simpler to read also).
Jeremy.
(cherry picked from commit 7e38054a94d3feacda9c249549d2721a4ee0b261)
commit a0e1e76cdd4183e85ea14ce990e47bd80eedd8ef
Author: Jeremy Allison <jra at samba.org>
Date: Thu Jan 22 10:59:47 2009 -0800
Another attempt to fix bug #4308 - Excel save operation corrupts file ACLs.
Simo is completely correct. We should be doing the chown *first*, and fail the
ACL set if this fails. The long standing assumption I made when writing the
initial POSIX ACL code was that Windows didn't control who could chown a file
in the same was as POSIX. In POSIX only root can do this whereas I wasn't sure
who could do this in Windows at the time (I didn't understand the privilege
model). So the assumption was that setting the ACL was more important (early
tests showed many failed ACL set's due to inability to chown). But now we have
privileges in smbd, and we must always fail an ACL set when we can't chown
first. The key that Simo noticed is that the CREATOR_OWNER bits in the ACL
incoming are relative to the *new* owner, not the old one. This is why the old
user owner disappears on ACL set - their access was set via the USER_OBJ in the
creator POSIX ACL and when the ownership changes they lose their access.
Patch is simple - just ensure we do the chown first before evaluating the
incoming ACL re-read the owners. We already have code to do this it just wasn't
rigorously being applied.
Jeremy.
(cherry picked from commit 9c3da895e6dd5df2f4e3377e1bf562b376436081)
commit 0bec8ca5044a04433aa2701fe588fc94a9dea105
Author: Michael Adam <obnox at samba.org>
Date: Wed Jan 21 15:10:10 2009 +0100
build-docs: cleanup exit of the script
exit in the directory where it was called using pushd/popd.
Michael
(cherry picked from commit b319549f129b1c79afc9bfd4a84f2730b96d69a3)
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 0ee05c012e5f58c9132549c59cfd1ed74dd27759)
commit df1f8c623bf98815c1a9de67f9ffef9455075da0
Author: Michael Adam <obnox at samba.org>
Date: Wed Jan 21 15:09:46 2009 +0100
s3:docs: clean build/catalog.xml in "make clean"
Michael
(cherry picked from commit 5e21fc3506f2ba7b1135b1acad2697dfb86b5df0)
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit c421d57e69de4d8c135123ed9f78dc9712bc7b3d)
commit 4aa9ca2b0c9f7c3ee42f69eed8e1f66e08cd8991
Author: Michael Adam <obnox at samba.org>
Date: Wed Jan 21 15:09:12 2009 +0100
s3:docs: clean generated .png images in "make clean"
Michael
(cherry picked from commit 9b32e839bec8611c30745607a3a6b124d5b34c01)
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit bd3bb83824803c5301201f7fa2703a52971eae8f)
commit da24aca4a19eb78037301f48bd54ade16c92bec5
Author: Michael Adam <obnox at samba.org>
Date: Wed Jan 21 11:47:46 2009 +0100
s3:docs: fix ommission in fix of (real)distclean targets
Michael
(cherry picked from commit 37412017c5dd2f05a7f4bbe0410a6e00ce4805e5)
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit f3d355ffa75cd2b0f8cc51189e80aaf3552766d0)
commit a1f3e8b12ae256a61fd7b8edc8912982ba25676a
Author: Michael Adam <obnox at samba.org>
Date: Wed Jan 21 11:41:14 2009 +0100
s3:docs: fix distclean target and add realdistclean target
- remove stuff created by configure in distclean
- remove stuff created by autoconf in realdistclean
Michael
(cherry picked from commit 65c92fea3d18c3520ff2a1e53a0c5c8825c9788f)
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 410acb0410ce3c33da15dbefd0b59e971494d2fb)
commit beee5ee29628c5205a34b7659ab3d9a80a939d54
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue May 27 18:40:14 2008 +0200
Depend on latexfigures files directly as using a rule in between causes problems.
(This used to be commit bf3c2773f94c1db29a8a3e5935ff587f16f9a905)
(cherry picked from commit 5f6d0078d41e790ab4fa7dac15294821cdb4d4f0)
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit d2e79f3e54cf1762df2ef814af90dcb16cb8e859)
commit 6808519747078dc17d2a131a3dfc74606e61fe96
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed May 21 17:55:20 2008 +0200
Use double colon targets.
(This used to be commit 825cf91fa8b30a67d04cbda8885ff62a4c26458f)
(cherry picked from commit 323be4a6907e4915bb76aa103bf5b868f0b459b1)
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit fe3680cb7ab54142d589c89789af73a3e32a6b79)
commit c95963fd146c6d9bb0bada7a7cfe0feb2258f1be
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri May 16 15:46:36 2008 +0200
Add test target in Makefile.
(This used to be commit ac0d768676b1b8105a9141169b1afa248df6ce66)
(cherry picked from commit 0f3ba4b766ed83d2a38e6cae8db8690374d88989)
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit d5f74cfc4434d754afc9fdd746c2a575ebdd3641)
commit 2ef540159fae283fdbd56063abe78019b741637f
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri May 16 15:31:54 2008 +0200
Make the make output a bit less chatty.
(This used to be commit 1fa4ef553c437bae07389c0f6a5410ba22ee4905)
(cherry picked from commit 70f52c06ba1d0d9638f1dfb8c42cd0d70364e9df)
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 299f1ae3f335ce99cb9b5d477e0950a4108f80cb)
commit c977a57f0245766302da3b301bd7c20256dac7d2
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed Jan 21 11:37:30 2009 +0100
build_docs: Use 'make distclean' instead of 'make clean'.
This fixes bug #6058.
Thanks to Christian Perrier for reporting!
Karolin
(cherry picked from commit 162e4b66601b41dd5adb24e192f3b5a91dfb41cc)
(cherry picked from commit 2545fcc48888628eef2d6b83ef5656be1e53bf7e)
commit 81c8e0972297eeaf590f266cd60ebedbfaeea2aa
Author: Richard Sharpe <realrichardsharpe at gmail.com>
Date: Mon Jan 19 18:11:04 2009 -0800
Fix mistake in DEBUG message
(cherry picked from commit e9de9cd33a3260c0b1b019208db9c3f96d9d5f3a)
commit 538536032e25e01aa70eab3b5be3953fcc0342bd
Author: Andreas Schneider <anschneider at suse.de>
Date: Mon Jan 19 16:26:07 2009 +0100
Avoid flooding of syslog with failing pam_putenv messages.
Signed-off-by: Andreas Schneider <anschneider at suse.de>
Signed-off-by: Günther Deschner <gd at samba.org>
(cherry picked from commit 5db09d4dd27e10c926c3413bcd3088e72a4af487)
commit aab36af2dfece9d7e221fd9299c2d9f27e8a07c8
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Jan 19 10:22:46 2009 +0100
S3-ByExample: Use 'winbindd -D' instead of 'winbindd -B'.
The option '-B' does not exist at all.
Thanks to Jason Ellison for reporting!
Karolin
(cherry picked from commit 4b26c7bbf4fe93f5ffb92d3f04012be290be25be)
(cherry picked from commit 05c7d97e6cf25c05ba6a661c0a31c88946ffd5cd)
(cherry picked from commit f89c3db4ae0bcf1680c2532833ee115005b8ed70)
commit 5860347258101dd8d800065e4bcdfdc3137d58a4
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Jan 19 08:55:30 2009 +0100
S3-HowTo: Change 'winbindd -B' to 'winbindd -D'.
There is no option '-B' at all.
Thanks to Jason Ellison for reporting!
Karolin
(cherry picked from commit 7c1e08518bfbe054db270e72476c642d5db93c0a)
(cherry picked from commit 3b5d2fd4cc5f7cbe22be1dfc593ca4ba29197b66)
(cherry picked from commit 0900b10f64fbb9f2e55591d1b11be9bb29526744)
commit 04b02e35021cf57c05d990a041e6a8177682c18d
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Jan 14 11:52:01 2009 +0100
s3:docs: vfs_fileid manpage
metze
(cherry picked from commit 6a94b7b9270f3d69595b93e2632051c9842645c9)
(cherry picked from commit 8e13be1db5c51002ae72c42c505a79406b2f4f63)
(cherry picked from commit 652151fe7b0a48b5ae6272a088ce80ad428f1928)
commit 61856c881b541fa81b4242336d3f717cc0688cb5
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Jan 14 13:59:09 2009 +0100
s3:vfs_fileid: readd "fileid:algorithm" as option.
"fileid:mapping" is still supported as fallback.
metze
(cherry picked from commit 554a89df0cf6d9832778e2913f9fe50b78baeedc)
(cherry picked from commit fe9ad21b8cb5286845350fe2280da2cbe2647bb7)
(cherry picked from commit 3c56cd9f701254dec33aa60b6f6b3fa90a28557a)
commit b5afab9ce83a873290911cb81be696299c26f5f6
Author: Andrew Tridgell <tridge at samba.org>
Date: Mon Apr 21 18:40:45 2008 +0200
keep compatibility with v3-0-ctdb name for fileid:mapping option
(cherry picked from commit 2856d2e4a43fbcc6c8f8ac7b1613828170362861)
(cherry picked from commit 174b595bb171c32be9079f9f691b415ac0fdc635)
commit 0a8e64887b7bb2f4d473da342d035bf8a05193c7
Author: Derrell Lipman <derrell.lipman at unwireduniverse.com>
Date: Sat Jan 17 13:35:12 2009 -0500
Determine case sensitivity based on file system attributes.
- Most of the time, we can determine from the file system we're connecting to
whether it supports case sensitivity. In those cases, we now set the
internal case sensitivity flag automatically. For those cases where the
request to retrieve file system attributes fails, we'll use the
user-specified option value.
Derrell
(cherry picked from commit ded86426c222b11b9c2e8d8e4cae5ed0eff19edd)
commit ff5fcc5538b8f17a56fd4533f25bd2cb25523089
Author: Derrell Lipman <derrell.lipman at unwireduniverse.com>
Date: Fri Jan 16 20:29:28 2009 -0500
[Bug 6022] smbc_urlencode and smbc_urldecode were not exported
- Since the revamp of libsmbclient, there has still been an external
declaration for smbc_urlencode and smbc_urldecode in libsmbclient.h, yet
those functions were renamed and made private. The two choices were to
remove the function names from libsmbclient.h or to make them public
again. The reported requested that they be public. This commit makes it so.
Derrell
(cherry picked from commit 91d30b8a3406d01b5fca97a96ad5964703813f0e)
commit 6b21fd6bfb3f70667b6c6b1292557e889cdabffb
Author: Derrell Lipman <derrell.lipman at unwireduniverse.com>
Date: Fri Jan 16 16:00:41 2009 -0500
Treat file names in POSIX-like case-sensitive fashion by default
*** THIS COMMIT CAUSES A CHANGE OF DEFAULT BEHAVIOR IN libsmbclient!!! ***
- libsmbclient now calls cli_set_case_sensitive() for a new CLI. By default,
it requests case-sensitive, but the old behavior of case-insensitive can be
requested with smbc_setOptionCaseSensitive(context, False);
The change of behavior is considered a bug fix, as it was previously
possible to accidentally overwrite a file that had the same case-insensitive
name but a different case-sensitive name as a previously-existing file,
while creating a new file.
Derrell
(cherry picked from commit ac4baafeb8d74bf1db7f2ce84b2bc3abdef90337)
commit 44f5047bfe8687c2eacc097d5b14c1e2a1bfcd55
Author: Andreas Schneider <anschneider at suse.de>
Date: Fri Jan 16 12:23:00 2009 -0800
Fix a segfault if ? is there but the options are NULL. This is the case if SMBC_parse_path is called by SMBC_stat_ctx.
(cherry picked from commit d9f66f3e3d9af9c3323029207e62391f382632e9)
commit b0f23b4dae1b31060579f716265b07c7b369768d
Author: Jeremy Allison <jra at samba.org>
Date: Fri Jan 16 11:55:40 2009 -0800
"First thing, kill all the language lawyers" :-). Ensure possible insane compilers
can't kill us later.
Jeremy.
(cherry picked from commit 3504910d91fa6d174861815255062efefb0c46aa)
commit 1a812bee2208970deb450e8de2487278ab709d06
Author: Tim Prouty <tprouty at samba.org>
Date: Thu Jan 8 17:21:08 2009 -0800
s3: Remove a few unnecessary checks from the streams depot module and fix to work with NTRENAME
Handling of error codes when renaming a file to a stream and a stream
to a file is now done in rename_internals_fsp.
The NTRENAME stream path only passes in the stream name, so the new
base can now be different from the old base.
(cherry picked from commit 2cca28b3e999a8886539b9a5dde267bb8a3a1db7)
commit 3ab393efc9be444de6f4fda5b08a6f8aa3a03af1
Author: Tim Prouty <tprouty at samba.org>
Date: Thu Jan 8 17:20:14 2009 -0800
s3: Remove a few unnecessary checks from the streams xattr module
Handling of error codes when renaming a file to a stream and a stream
to a file is now done in rename_internals_fsp.
The NTRENAME stream path only passes in the stream name, so the new
base can now be different from the old base.
(cherry picked from commit 078c4fbab8a5be2e23acda1978fd6d6071898dd9)
commit d540149c43d85d8c8a05f4d4a435dd55b440c290
Author: Tim Prouty <tprouty at samba.org>
Date: Thu Jan 8 17:19:24 2009 -0800
s3: Allow renames of streams via NTRENAME and fix stream error codes on rename
The test_streams_rename2 test in RAW-STREAMS verifies these changes
(cherry picked from commit ac7c18d642bef231730927347e7b0296b1c9d82b)
commit c5d50c4f941d3f21d5b8449f951af51bdb23887f
Author: Jeremy Allison <jra at samba.org>
Date: Thu Jan 15 15:54:07 2009 -0800
Fix bug #6040 - Missing <th> header in Status page.
Based on a patch from pkg-samba-maint at lists.alioth.debian.org.
Jeremy.
(cherry picked from commit b13f7e296a70e1280baae9f2f3156043c48bafa9)
commit 629fc6c835a21f95cdf2f835afd5045b94c21258
Author: Jeremy Allison <jra at samba.org>
Date: Thu Jan 15 15:51:40 2009 -0800
Allow reinit_after_fork to be called safely from within swat and other binaries that don't have
an event context or a msg context. Fixes crash bug in swat.
Jeremy.
(cherry picked from commit a2944e99825943f91d0260c218de06817acfcf51)
commit 4f3059e900ebe65a6d12a0986e4d07bac251a0ca
Author: Jeremy Allison <jra at samba.org>
Date: Thu Jan 15 10:30:19 2009 -0800
Fix bug #6040 - Calling Samba print server with an aliased DNS-name fails.
Jeremy.
(cherry picked from commit 76555085fd9bb40a4c0e2c18b5bf965dcf636cb1)
commit f0b6eca850ddbec7b6bb7b5bbe7bda1a75134c49
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jan 14 13:17:02 2009 -0800
Fix bug #6035 - Possible race between fcntl F_SETLKW and alarm delivery.
Jeremy.
(cherry picked from commit 7c0b99baafc4a0bc04251c9a456bf2cc104058c4)
commit 8a57f19adc76ef87d3323c865769f1e62866b789
Author: Bo Yang <boyang at novell.com>
Date: Wed Jan 14 11:49:11 2009 -0800
Fix bug in get_dc_name_via_netlogon(), null pointer refrence.
(cherry picked from commit 25e035815681136e69b9d49d548b7d7b908011c5)
commit c38482dafffeab0a66642a17a786f1c553fbe657
Author: Bo Yang <boyang at novell.com>
Date: Wed Jan 14 11:13:27 2009 -0800
Don't send message to any other child in child process.
(cherry picked from commit e443cfaa25c26a7761113bdde9b7453a97f8e5d5)
commit 5c1505ce9d6925dd3368c4395d0fcec656df8656
Author: Michael Adam <obnox at samba.org>
Date: Wed Jan 14 09:48:19 2009 +0100
Remove proto.h that got accidentially committet to v3-2-test
in commit 61c5589d1fa4d6fe7ce7293a6f6ceab96d4ee193
(fix for bug #6019)
When cherry-picking from v3-3-test (or master) to v3-2-test,
we need to check that proto.h gets removed before committing,
since v3-2-test still has make proto.
Michael
(cherry picked from commit 3ac7289b4d7fef830b05a8cb351476480681b28a)
commit 5d05e17cdba5cfd16fb4b85feb120acbbc78e2d1
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jan 13 15:57:53 2009 -0800
From boyang - ensure we never "return" from a forked child, always _exit().
Jeremy.
(cherry picked from commit e1af2b4bc824450615454adec460e6698a83cefc)
commit 01124fe56cc406489c0bb6939249b10fdf6395b6
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jan 13 11:15:10 2009 -0800
Fix bug #6019 File corruption in Clustered SMB/NFS environment managed via CTDB
Jeremy.
(cherry picked from commit 61c5589d1fa4d6fe7ce7293a6f6ceab96d4ee193)
commit 0772953e6de5db916bc6c4b27348de1aab8681e1
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Jan 12 12:32:46 2009 +0100
s3:libsmb: handle the smb signing states the same in the krb5 and ntlmssp cases
SMB signing works the same regardless of the used auth mech.
We need to start with the temp signing ("BSRSPYL ")
and the session setup response with NT_STATUS_OK
is the first signed packet.
Now we set the krb5 session key if we got the NT_STATUS_OK
from the server and then recheck the packet.
All this is needed to make the fallback from krb5 to
ntlmssp possible. This commit also resets the cli->vuid
value to 0, if the krb5 auth didn't succeed. Otherwise
the server handles NTLMSSP packets as krb5 packets.
The restructuring of the SMB signing code is needed to
make sure the krb5 code only starts the signing engine
on success. Otherwise the NTLMSSP fallback could not initialize
the signing engine (again).
metze
(cherry picked from commit 7d9fd64f38aa5821b38c1223cf87979fc87bfb71)
(cherry picked from commit 8e29070ccd0b5103af2e6da75644169f46700313)
(cherry picked from commit 38b297f99ec166e5c40ba33774222b37b45b4fec)
commit 924615762a258945e61d4ce9d6c2b351cd0d3f7a
Author: Volker Lendecke <vl at samba.org>
Date: Sat Jan 10 17:59:43 2009 +0100
Even for srclen == 0 we have to return something
This fixes a regression reported by Corinna Vinschen <corinna at vinschen.de>
Thanks,
Volker
(cherry picked from commit a77b622f05c50512626b2636343eb8da6d5e4549)
commit 5fa4fb8a9b0f800f96dbf4e840392fff65237655
Author: Bo Yang <boyang at novell.com>
Date: Mon Jan 12 15:41:02 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 d50a487b11c4c256c674327344a824e97eeb620e)
commit 7631b35bdd24f4a92fed540acf080a37b9e9909c
Author: Jeremy Allison <jra at samba.org>
Date: Sat Jan 10 20:02:09 2009 -0800
Fix logic bug introduce in backport of ccache_regain_all_now, sync with
3.3 implementation.
Jeremy.
(cherry picked from commit e0b70923298a0f33d92b9a2901098328d914ab1e)
commit 24be3b12a045b5b67c518a12e3517fe8e63866ba
Author: Bo Yang <boyang at novell.com>
Date: Sat Jan 10 14:33:36 2009 -0800
Backport of the clean event context after fork and
krb5 refresh chain fixes.
(cherry picked from commit 80a37595ef5c289fcc02a8902e18eb9ab289b28c)
commit f3bf108bfeaa6e29a1720702e4501d1f05437cfe
Author: Bo Yang <boyang at novell.com>
Date: Sat Jan 10 14:09:48 2009 -0800
Don't set child->requests to NULL in parent after fork
(cherry picked from commit 9811454d8ae3f09d9a206f14ed533fa6382a914c)
commit 4c15683140fa1d49b3f26a827145e22fc194b75b
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Jan 9 19:43:13 2009 -0800
s3/smbpasswd: Check if Unix account exists before asking for the password.
Admins shouldn't have to type in the password twice when the passdb account
cannot be created because the Unix account is missing.
Karolin
(cherry picked from commit 3bb5e3e0b44c25eede60925cfdc89d7df0d0e486)
commit 18ee7b60583529e5b3bf18d740545119f7b5a8a2
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)
commit f7fb3a6efaecce830d62c0f0250a8283fae76911
Author: Tim Prouty <tprouty at samba.org>
Date: Sat Dec 6 16:08:35 2008 -0800
Fix a delete on close divergence from windows [2/2]
This second patch cleans up by removing all of the code that is made
obsolete by the first patch. It should cause no functional changes.
(cherry picked from commit 62d547e1b853b6c5c871f1f9cb265d3cdd40a21d)
commit bc50c510bf58700f8ed781a5db0094e60aff27d2
Author: Tim Prouty <tprouty at samba.org>
Date: Sun Dec 7 10:30:01 2008 -0800
Fix a delete on close divergence from windows [1/2]
smbtorture4's BASE-DELETE:deltest17 was failing against win2k8,
win2k3, and winXPsp2 but passing against samba.
deltest17 does the following:
1. open file -> file is created
2. closes file
3. open file with DOC -> fnum1
4. check that DOC is not reported as being set from fnum1
5. opens file again Read Only -> fnum2
6. check that DOC is not reported as being set from either file handle
7. close fnum1 (the file handle that requested DOC to be set)
8. check if DOC is reported as being set from fnum2
* This is where windows and samba begin to diverge. Windows
reports that the DOC bit is set, while samba reports that it is not set.
9. close fnum2 (the last remaining open handle for the file)
10.See if the file has been deleted.
* On samba the file still exists. On windows the file was deleted.
The way open_file_ntcreate is written now, if an open has the DOC bit
set on the wire, DOC (fsp->initial_delete_on_close) is not set unless:
a. the open creates the file, or b. there is an open file handle with
a share_entry in the struct lck that has the
SHARE_MODE_ALLOW_INITIAL_DELETE_ON_CLOSE bit set (let's call it
SM_AIDOC).
My understanding of SM_AIDOC is that it was added to differentiate
between DOC being set on an open that creates a file vs an open that
opens an existing. As described in step 8/10 above, it appears that
windows does not make this differentiation.
To resolve this issue there are two patches. This first patch is a
simple proof of concept change that is sufficient to fix the bug. It
removes the differentiation in open_file_ntcreate, and updates
deltest17 to allow it to pass against win2k3/xp. This makes
open_file_ntcreate more closely match the semantics in open_directory
and rename_internals_fsp. This change also does not break any other
tests in BASE-DELETE or "make test". Specifically test deltest20b
which verifies the CIFSFS rename DOC semantics still passes :).
(cherry picked from commit e2b4e25b433a43960bb37258c0f24d9b77598056)
commit 3d52e4b6a76becf7420dc849cbd52ead5194b126
Author: Jeremy Allison <jra at samba.org>
Date: Thu Jan 8 15:42:53 2009 -0800
Fix bug #6021 - smbclient du command does not recuse properly
Jeremy.
(cherry picked from commit f21a6d66f0bde933e5bf8cf673fc380e5dd52793)
commit a0a951d2a4f52ed43e7877c8be81f6853b22aa6f
Author: Jeremy Allison <jra at samba.org>
Date: Thu Jan 8 10:55:28 2009 -0800
Remove "strict allocate = partial" code that got accidentally committed.
Jeremy.
(cherry picked from commit ab0359a19986f744075bf861dd43626210c2ecf7)
commit 988fae9d26c62690ce3ecad3316854be6d4297cf
Author: Jeremy Allison <jra at samba.org>
Date: Thu Jan 8 10:38:44 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 0e30f6d835016a73e89e3159d827a2703058d34b)
commit b21556530badf62fcf2d9a204a61e429e95b0b14
Author: Karolin Seeger <kseeger at samba.org>
Date: Thu Jan 8 13:10:59 2009 +0100
packaging RHEL: Fix syntax error in samba.spec.tmpl.
Karolin
(cherry picked from commit 097e9d64ade609da9f920156c98b466dc6c42dab)
commit 5ee8d218f4bd0f846087fe37ef7fb1b2443281d6
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jan 7 14:55:51 2009 -0800
Fix bug #6016 - Alternate Data Streams / Extended Attributes seem to conflict.
Jeremy.
(cherry picked from commit a2042edb42e312d5b8fc5b4750bf5b91b5ee1b3c)
commit 82d30e4cd26b2b34d3f2fe7643f407526f4ba86b
Author: boyang <boyang at suse.de>
Date: Wed Jan 7 11:07:42 2009 -0800
refresh sequence number as soon as possible when domain->sequence_number == -1 or domain->last_status is not ok.
(cherry picked from commit 3954c6965240836a467d16f447197681b7396a31)
commit b6ec8a88e143976f4d4a4bd7f77014ee782197c6
Author: Michael Adam <obnox at samba.org>
Date: Wed Dec 17 22:27:39 2008 +0100
packaging(RHEL): fix typo in [u]mount.cifs installation
Michael
(cherry picked from commit 835108bcf84a5f47f46d237c7a93c572348125a1)
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 71c74725bce403e36e4dc38287802c95b8d4de66)
(cherry picked from commit cfc140d3924dd6be893d242ce5df22e2128f09f8)
(cherry picked from commit 8b4c199deffd724a4a2219ccb8ffb91524101cd9)
(cherry picked from commit 9995378cf3f28af183030c3867513552d85bf935)
commit e3de003abe043bd427c245c4cf0678f327614b81
Author: Michael Adam <obnox at samba.org>
Date: Wed Dec 17 18:56:34 2008 +0100
packaging(RHEL): fix build of [u]mount.cifs
mount.cifs is now built by make everything.
And it needs extra objects anyways (mtab.o),
which is why the build of mount.cifs failed.
Michael
(cherry picked from commit 96c811cf222be5463a6705feae73d6215685c5f1)
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 308dbca653ce1d689b75f9b781237c67df4233a8)
(cherry picked from commit 9745e36c011a76669aad7a0a861ba1520ef8cec3)
(cherry picked from commit 1c1e196b648ae3ef241401f859842450c5153181)
(cherry picked from commit c93a5131913a1a18645c4f972be6f6b2c1715f28)
commit 414836e9c8d1659042273f40d2e70881409e6972
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jan 6 16:06:43 2009 -0800
Fix bug #6017, - magic script does not work. based on a patch from monyo at samba.gr.jp.
Jeremy.
(cherry picked from commit 4af1d077915c7bbe5268b78bde71b102861a2b98)
commit f41a4e5d9212f196aae979d38cd6b35018868f9c
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)
commit 413827e6d785da4974b33e5ce03d7883488e1466
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)
commit 5b47d99110c1841227779b2a39de1b5c4d3ba01e
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)
commit 495f6326d2b3a723e82f41903e407cd63eadcdba
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jan 5 18:06:20 2009 -0800
Fix the build (event context init was different).
Jeremy.
(cherry picked from commit aef7ad9d2f65c5e2a3b9622b352cafd30be79663)
commit a31ffd738fb31272a4f6b9dff99f46c13a45fe07
Author: Bo Yang <boyang at novell.com>
Date: Mon Jan 5 17:55:22 2009 -0800
clean event context after child is forked.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 7045272e5436e3a24d187945e405cb3cc407ce73)
commit 2967b8a9981b3e193988f76e4fec24296a3858c1
Author: Jeremy Allison <jra at samba.org>
Date: Mon Jan 5 12:34:02 2009 -0800
Attempt to fix crash seen with new CUPS async printcap loading code.
Jeremy.
(cherry picked from commit 101ef64e3181335b66524296af08f7df04391b9a)
commit 63bc7a8447eb7dfca228829dc428f791e4a01bae
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)
commit 627eb5683b7e2439d70f35c96f41f86ed5898383
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Jan 5 16:37:01 2009 +0100
Revert "examples: Avoid bashism in perfcount.init."
This reverts commit b4ffffc5c03b69ac2f8e0ed74fd7788549f7e822.
(cherry picked from commit fbee9f20b30a426d5c336066522d047a504914b9)
commit 48496360782ca5340f793276d56825d1c2d32acb
Author: Volker Lendecke <vl at samba.org>
Date: Mon Jan 5 15:47:19 2009 +0100
Fix bug 6014 -- mget shouldn't segfault without arguments
Thanks to kevin.paulus at mtm.kuleuven.be for the bug report
Volker
(cherry picked from commit 2ad41fedc50f764e77e2ba56b4d53d1045947a9c)
commit cc328e27c282e77cc23f4ca60c97cf9ff317775b
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)
commit f168bb40af4d21634c862b90ff5da597252c7ee4
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)
commit 54a4a5e2672bb22a80ad6271378252a35cf32cb1
Author: Volker Lendecke <vl at samba.org>
Date: Mon Jan 5 13:36:34 2009 +0100
Fix a bad memleak in vfs_full_audit
(cherry picked from commit cc70e0f88328e36410089a81f41c5b33fef24a10)
commit 0e784cddb1195a49c2ceaae4f4cec49144405ea5
Author: Jeremy Allison <jra at samba.org>
Date: Sun Jan 4 11:47:44 2009 -0800
Fix bug #6009 - Setting "min receivefile size = 1" breaks writes.
Jeremy.
(cherry picked from commit 8275c3e7b1064dbf7b0922e0285dee28ff2eac3d)
commit 06e44cde3d718619c202a2180b0a0130f998594d
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Jan 2 14:51:23 2009 +0100
Revert "packaging(RHEL): fix build of [u]mount.cifs"
This reverts commit cd796359ec0c30a0204fe744805bfbea3550f57d.
Applies only for 3.3 series.
Karolin
(cherry picked from commit b17132c61c22962fc30747f4619d32d0be608272)
commit 4a2d45699c99e129db143459a572826407bf12a7
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Jan 2 14:50:14 2009 +0100
Revert "packaging(RHEL): fix typo in [u]mount.cifs installation"
This reverts commit b2ef64515d4a4876276d152ff2075546d2030d23.
This issue does apply for 3.3 series only.
Karolin
(cherry picked from commit 6dbaf86ba4119a4fe2b2aea56994c3d3ea5d8428)
commit 848b8477b477d9d82297185f82b089b14eb856db
Author: Michael Adam <obnox at samba.org>
Date: Wed Dec 17 22:27:39 2008 +0100
packaging(RHEL): fix typo in [u]mount.cifs installation
Michael
(cherry picked from commit 835108bcf84a5f47f46d237c7a93c572348125a1)
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 71c74725bce403e36e4dc38287802c95b8d4de66)
(cherry picked from commit cfc140d3924dd6be893d242ce5df22e2128f09f8)
(cherry picked from commit 8b4c199deffd724a4a2219ccb8ffb91524101cd9)
(cherry picked from commit b2ef64515d4a4876276d152ff2075546d2030d23)
commit 5acce3c319a2e89591dbf614c7e97fe75dcdf04c
Author: Michael Adam <obnox at samba.org>
Date: Wed Dec 17 18:56:34 2008 +0100
packaging(RHEL): fix build of [u]mount.cifs
mount.cifs is now built by make everything.
And it needs extra objects anyways (mtab.o),
which is why the build of mount.cifs failed.
Michael
(cherry picked from commit 96c811cf222be5463a6705feae73d6215685c5f1)
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 308dbca653ce1d689b75f9b781237c67df4233a8)
(cherry picked from commit 9745e36c011a76669aad7a0a861ba1520ef8cec3)
(cherry picked from commit 1c1e196b648ae3ef241401f859842450c5153181)
(cherry picked from commit cd796359ec0c30a0204fe744805bfbea3550f57d)
commit 82cd6879b2f7403cd89ef4ae7173086620ebdb50
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Jan 2 09:46:17 2009 +0100
Happy New Year!
metze
(cherry picked from commit 347f1b6dcc88e04307397ea965ca8d0412b7a8c8)
commit c7ea6c4c2f18fe49778a69fa0b997045521e503d
Author: Volker Lendecke <vl at samba.org>
Date: Thu Jan 1 22:05:03 2009 +0100
Fix bug 5913.
Never seen this to be a problem, but it doesn't hurt either :-)
(cherry picked from commit 3577e583eeabb0555dc1ec1dd231ca835d90d307)
commit cd86684e528998186929071f24c2f8be4c2dc6d7
Author: Volker Lendecke <vl at samba.org>
Date: Wed Dec 31 18:37:39 2008 +0100
recvfile can't be used for printing so far
(cherry picked from commit ce0a7974c5e5032893fa80fbc710edfc29353413)
commit e719e232426063f7ad7b07015001fcf7727f26aa
Author: Volker Lendecke <vl at samba.org>
Date: Tue Dec 30 22:24:04 2008 +0100
Fix an ancient uninitialized variable read
The callers of open_file_ntcreate expect *psbuf to be filled correctly
(cherry picked from commit f9f6bffc3763ddd8e19400616b6e5da962142e5e)
commit 5a14dee5f005ee4c0b8e0eb1e864589ab23a3ec9
Author: Volker Lendecke <vl at samba.org>
Date: Tue Dec 30 15:47:06 2008 +0100
Fix a memory leak in cups_pull_comment_location
We allocated "request" with ippNew, so we also should ippDelete it.
(cherry picked from commit 783247bdce9268d44b14005ec3eb84c35e0cd71a)
commit 020bffe7453bf5a777cae46eedc409deb72833d2
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 29 23:24:43 2008 +0100
Don't increment twice
Thanks metze :-)
(cherry picked from commit 69e7a69c781a10fc64f8e4d40c6ad07cdc23e645)
commit 5381d1a9b02dc9329de2cb21b7e70fb6aa40dff7
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 29 22:06:08 2008 +0100
Second part of the bugfix for #5933
Incrementing the next vuid did not correctly overflow
Now we survive BENCH-SESSSETUP with -o 100000. Takes a while though :-)
Thanks a lot to Ofer Tal <otsmb at shmoop.org> for reporting #5933
(cherry picked from commit f03e6b8faf8f3222e3dcdaae906f48e2aa3eeba8)
commit 02f3cab20766f70c3a5128e9c690a89720931637
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 29 22:01:57 2008 +0100
First part of bugfix for #5933
Ofer Tal <otsmb at shmoop.org> fully correctly noted that we're incrementing
num_validated_vuids twice per session setup, but decrement it only once.
Looking at sesssetup.c we always call register_initial_vuid() before
register_existing_vuid(), so there's no point in incrementing it in
register_existing_vuid().
Jeremy, please check!
(cherry picked from commit 228d0c9459e9187d671875eda03aaa1435ab8401)
commit 334c9ba5befbbda30db3109892aa340cb20c6bb1
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Dec 29 12:28:16 2008 +0100
s3:dbwrap: fix dbwrap_store_uint32() to match dbwrap_store_int32()
All callers expect 0 an success and -1 on error.
metze
(cherry picked from commit a255f9ce713b29552722ec73e4038226959e1c8e)
(cherry picked from commit 9aa543fee7ebcc95125d18868bdec7e4bf577d8a)
(cherry picked from commit c0fc381ac7ad09fd454fd6802149c46b607069ee)
commit 9e998a07214caa1fe6d837f365b39cbaad560111
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 22 22:42:44 2008 +0100
Add code to test write_data_iov a bit
(cherry picked from commit c364d44de2285cabb83a0c105f061b8640a3a431)
commit 5e1af1344713dc0698e72e92592ca38c26cf22ef
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 22 22:32:12 2008 +0100
Attempt to fix bug 5953: Make cli_send_smb_direct_writeX use writev
It seems there are SMB servers around which can't cope with the write header
being sent in a packet of its own. With writev we keep the advantage of direct
writes, giving the kernel the chance to coalesce the write calls.
(cherry picked from commit 75b5b7b2664e4d55aa97418f42a415fd88d3d4bd)
commit 61aa567170568901f934f1c150c17b11cbcbd363
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 22 22:17:59 2008 +0100
Make write_data use write_data_iov
(cherry picked from commit 6bfcf1904ef50b74656d1cfb7f11b730481d2c6c)
commit 0aef161566733a9a8a43e063facc70f1d825bff4
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 22 22:17:28 2008 +0100
Add write_data_iov
(cherry picked from commit 2d05db409e11443480c8cdc52e205f57aa512fba)
commit 779aa8e920d4dd77f241d02ec1c69671a96d7a93
Author: Volker Lendecke <vl at samba.org>
Date: Sun Dec 21 23:22:30 2008 +0100
Add sys_writev
(cherry picked from commit 9f6710abfaafa4b918b0c55547d5cd0823a26a56)
commit 7ebd26b830689a71d92217087fc6883d9447dcfb
Author: Jeremy Allison <jra at samba.org>
Date: Thu Dec 25 12:14:44 2008 -0800
Fix bug #5990 - strict allocate should be checked before ftruncate
reported by and based on a patch by Yasuma Takeda <yasuma at osstech.co.jp>.
Jeremy.
(cherry picked from commit b995677f9895ba7fa9744b079ebc905713e59d40)
commit 492db227a016ea2ee812b27e6414831702dbd954
Author: Tim Prouty <tprouty at samba.org>
Date: Tue Dec 23 09:19:25 2008 -0800
s3: Fix stream marshalling to return the correct streaminfo status
When there are enough streams on a file to fill up the max_data_count
when responding to a trans2 streaminfo, samba is returning
NT_STATUS_BUFFER_TOO_SMALL. Windows handles this by returning
NT_STATUS_BUFFER_OVERFLOW while still sending as much of the data that
it can fit into the buffer. When the windows client sees
BUFFER_OVERFLOW, it retries the streaminfo with a larger buffer (2x).
The windows client starts at 2K and will continue increasing the
buffer size by two until it reaches 64K. If the streams don't fit in
64K the windows client seems to give up.
This patch fixes marshall_stream_info to overfill the buffer by 1
stream so that send_trans2_replies can properly detect the overflow
and return the correct status.
(cherry picked from commit 7adf6961bfbbb3de07d40f397db5b5520d5f9d9f)
commit f09a7a3a753cb8457b521cd24f3399db253d14ea
Author: Gerald (Jerry) Carter <jerry at samba.org>
Date: Mon Dec 22 11:07:08 2008 -0800
Fix "allow trusted domain" so it disables trusted domains.
(cherry picked from commit ccd63a202b7978af3d6fdb46d1c17f0e9ac0fef6)
commit 02153307b3159dbb1504c4df143062c10dc51ede
Author: Jeremy Allison <jra at samba.org>
Date: Fri Dec 19 13:58:55 2008 -0800
Fix bug #5986 - Editing a stream is broken (rename problems).
Jeremy.
(cherry picked from commit 5122f064d8d05b24c755506f4d7043c693670e80)
commit 81e0b04d99ff1dd1c4d95c279777181eabb6788c
Author: Volker Lendecke <vl at samba.org>
Date: Fri Dec 19 12:04:59 2008 -0800
Fix a "ignoring function call result" warning
(cherry picked from commit fc86d348a41bf276c1863a0012bad3d3774bc12b)
commit 367f439e81f2bf932c99c768d86ad7150c1d6e1d
Author: Björn Jacke <bj at sernet.de>
Date: Fri Dec 19 12:12:59 2008 +0100
correct the description of the "ldap timeout" parameter
(cherry picked from commit 1aff97bc48844afba5de48447fdcdcc02d163a97)
(cherry picked from commit 40c510097a43edd10f6b5cd376a2cf6eca1f7e8b)
commit bcca19830ac724cfbca12b28b6197eec5a343d2a
Author: Jeremy Allison <jra at samba.org>
Date: Thu Dec 18 13:28:18 2008 -0800
Fix bug #5980 - Race condition when granting level2 oplocks can cause break notify to be missed.
Jeremy.
(cherry picked from commit 3a8ca8406e72c2029ccbe050069da010642baf14)
commit 3289614afe2a6ce879b7b24e4a0b766f941e7abb
Author: Jeremy Allison <jra at samba.org>
Date: Wed Dec 17 17:23:35 2008 -0800
Fix bug #5979 - Level 2 oplocks being granted improperly,
Jeremy.
(cherry picked from commit c5d9ba5a377174e3a5b61eb17e2bbda1c9f31f84)
commit 3a93cfa27e663fca3645648efe654db3eabb2c06
Author: Volker Lendecke <vl at sernet.de>
Date: Wed Dec 17 18:14:09 2008 +0100
Fix a valgrind error
Reported by naga_kishore_kommuri at yahoo.com
Derrel, please check!
Thanks,
Volker
(cherry picked from commit 3356b95f72e26ede4ab16a12c334be90b8b1a639)
commit fe0598bb63498a34015e2d4e8f74e829ba5145da
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)
commit 7dbd7074c2b69828078750b88502218bae65c3de
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)
commit 28bed70e5b44d05bb15f878d0a5e382ec19a447c
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)
commit 2f66c88039014f3fae8c1027c870c592043bf365
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)
commit 7377d62032d81460f2c673c12a5da0ad8329be57
Author: Lars Müller <lars at samba.org>
Date: Wed Dec 17 15:39:35 2008 +0100
Tweak with pam defines of older Linux versions
PAM_AUTHTOK_RECOVERY_ERR is not defined by older Linux versions (SUSE
Linux Enterprise 9 and RedHat Enterprise 4).
Patch suggested by Philipp Thomas <pth at suse dot de>.
(cherry picked from commit 9b5359f992e5ffac2cedc1360098c21f9c1d2f02)
commit fd80b73cca40bb299a3855ff9428d02abc93f77f
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)
commit b58e2a0573bcd78e26ff3e6eb77596a1b94f0ca0
Author: Kai Blin <kai at samba.org>
Date: Tue Dec 16 13:43:28 2008 -0800
(Fixed) Final part of fix for bug #5953 - smbclient crashes: cli_list_new segmentation fault (with NAS-BASIC server).
(cherry picked from commit b1727bbc7416f1a752cb1aadaff718e66f4a4381)
commit fc3031b3c52a6f7cc86bac3cb03596e52a559ac6
Author: Jeremy Allison <jra at samba.org>
Date: Tue Dec 16 13:34:11 2008 -0800
Revert "Final part of fix for bug #5953 - smbclient crashes: cli_list_new segmentation fault (with NASBASIC server)."
Error in commit !
This reverts commit 10e7d6b428c6e44f8b95c2794154dc1bfe4bde2d.
(cherry picked from commit bfc4c75c340e3182b5a9572763fcf8c004ec2eed)
commit f0bb44cb7795ef1570ee753915aaa1b5b1681835
Author: Kai Blin <kai at samba.org>
Date: Tue Dec 16 13:14:25 2008 -0800
Final part of fix for bug #5953 - smbclient crashes: cli_list_new segmentation fault (with NASBASIC server).
(cherry picked from commit 10e7d6b428c6e44f8b95c2794154dc1bfe4bde2d)
commit c523587a754f126ca088143477b39bcc493dd520
Author: SATOH Fumiyasu <fumiyas at osstech.jp>
Date: Wed Dec 17 00:54:30 2008 +0900
commit b520befe6f51644d20434add9864d7a2fa30aa2e
Author: SATOH Fumiyasu <fumiyas at osstech.co.jp>
Date: Wed Dec 17 00:42:25 2008 +0900
libsmbclient: Fix SIGBUS on non-x86 CPUs
We must align the struct smbc_dirent in the struct
SMBC_internal_data because the struct smbc_dirent
has numeric values that require alignment.
Signed-off-by: Derrell Lipman <derrell.lipman at unwireduniverse.com>
(cherry picked from commit 3f47eb787f5b8499e5580407dc84c904db70b725)
commit d6f3517263fb17fbe2f71e6b2fb1287344e892af
Author: SATOH Fumiyasu <fumiyas at osstech.jp>
Date: Tue Dec 16 16:59:07 2008 +0100
nss_winbind: Solaris 64-bit fix and...
PATCH 1:
Fix gmem->numgids and gmem->maxgids breakage on Solaris 64-bit
because sizeof(int) != sizeof(long int).
PATCH 2:
This patch fixes a compile-time warning
"warning: implicit function declaration: _nss_winbind_initgroups_dyn".
(cherry picked from commit cb036772d09227f870c2fec3ecd8c3f53787dfbc)
commit 3baf43766e21d2772780cd446093c9a6d47e37ad
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)
commit 37b42e56a2d2cb80b2955c62950db408d6916215
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)
commit e0a8c35aff008a9887edf4540648af32214f8c0e
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)
(cherry picked from commit 776c7ce0c1e73efc4f3d24a297bb3b2f3dd3892a)
commit efecddca8b55732a8c384b1ae9b74e95e123e4c4
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
(cherry picked from commit e504256f84927c9b22df3945a3e95baaa9bf7063)
commit 03a7ad239908bea5d0e2e6fb62cddc0f02aa1da4
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
(cherry picked from commit 73039cd49521e724a8351a353e9ae1d342be1352)
commit 59e6cce7f3e117d055ff4bfdf98e1296317091df
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)
(cherry picked from commit 3d2fe303830c0c1e425f6279a1625a56a27abd07)
commit a1cc47dd574cc890e66e3b900beb14dac75d6b2f
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)
(cherry picked from commit 9838de125505fdff18014d72ebe9816176a610f9)
commit 43f09acc77d0c22eac5130f224441653bf0d94ce
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)
(cherry picked from commit d47dda115e1a3df50357a7a82694522df884c374)
commit d1d4ad612a066bc5215de7233da5e7b22a61ed0f
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)
(cherry picked from commit 6359df973fa24a3babd0e10e9e131ace47e2b2e8)
commit 06f1c9799c57295c0b38cb9c41496546ca68a4fa
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)
(cherry picked from commit 60c0166fd492bb6cff41811973c8da026c5109d7)
commit e7e0ed9830fd3e63643577bbf1b9b36e230498c1
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)
(cherry picked from commit f771eee7878fd4d5e670000256032ed56f537d8e)
commit f5937b132ca658f27c0f67e54a4a42322eb9371d
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)
(cherry picked from commit 6ee994e2d25d14b31dc9de75264e94a9ac6a09d4)
commit 4a0daa5fb5ebbf07d95173cbba7468e9375ade3e
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)
(cherry picked from commit 8321caf35736401d2a0d53cefc5c432d5b9e2bc7)
commit 47600645a651e7a9d30d28a7f3053f2f37913ffa
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)
(cherry picked from commit 5e47b314550d1165b86bd556330d36e0787e5109)
commit a6478e64e331bfdd1772169bf365be907f705e38
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)
(cherry picked from commit 46d5eef85477d621c27e72910bffe6d15f83d6a6)
commit 2a004972c76c34d282223f0f960f860c84ce0581
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)
(cherry picked from commit e79ce10550e18a59e9aa2edb377e9b7130e60789)
commit f3570652b785b241e31122626b7d20de98dce5c9
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)
(cherry picked from commit d5f1a3b9196933f86f46a6664a044fd027a8f417)
commit fdc37eb18338a9b1d3106781bd9994605e03e177
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
(cherry picked from commit dc3c9fd570850e69ad5166184726f9abb7d8a9c7)
commit eac598406f23f441c0be838b95d4c2ce3fea8fa0
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
(cherry picked from commit c48a4e52b707a860c2956b3eb9d1d631ffffb1f1)
commit 68c4fdd1f76667b71de342e9d20dc6758676a68c
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)
commit 81af8d53063fb1aedf64ccf71051c067dd9da414
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>
(cherry picked from commit 9af716f5fb144a047f1fc9fe02f24bcc59a0bc97)
-----------------------------------------------------------------------
Summary of changes:
docs-xml/Makefile | 82 +++---
.../Samba3-ByExample/SBE-DomainAppsSupport.xml | 2 +-
.../Samba3-ByExample/SBE-SecureOfficeServer.xml | 4 +-
docs-xml/Samba3-ByExample/SBE-TheSmallOffice.xml | 4 +-
docs-xml/Samba3-HOWTO/TOSHARG-Compiling.xml | 6 +-
docs-xml/Samba3-HOWTO/TOSHARG-TheNetCommand.xml | 2 +-
docs-xml/Samba3-HOWTO/TOSHARG-Winbind.xml | 4 +-
docs-xml/htmldocs.html | 8 +-
docs-xml/manpages-3/idmap_ad.8.xml | 8 +-
docs-xml/manpages-3/libsmbclient.7.xml | 7 +-
docs-xml/manpages-3/mount.cifs.8.xml | 8 +-
docs-xml/manpages-3/smbclient.1.xml | 24 +-
docs-xml/manpages-3/vfs_fileid.8.xml | 112 +++++++
docs-xml/manpages-3/vfs_recycle.8.xml | 13 +-
docs-xml/manpages-3/vfs_shadow_copy2.8.xml | 174 ++++++++++
docs-xml/smbdotconf/ldap/ldapssl.xml | 37 +--
docs-xml/smbdotconf/ldap/ldaptimeout.xml | 4 +-
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/printing/printing.xml | 2 +
docs-xml/smbdotconf/vfs/aclcompatibility.xml | 2 +-
examples/perfcounter/perfcountd.init | 10 +-
packaging/RHEL/samba.spec.tmpl | 13 +-
release-scripts/build-docs | 22 +-
source/Makefile.in | 2 +-
source/client/client.c | 13 +-
source/client/mount.cifs.c | 221 +++++++------
source/configure.in | 2 +-
source/include/ads.h | 1 -
source/include/libsmb_internal.h | 28 +-
source/include/libsmbclient.h | 21 ++
source/include/smb.h | 5 +-
source/lib/charcnv.c | 6 +
source/lib/dbwrap_util.c | 4 +-
source/lib/events.c | 55 ++--
source/lib/ldb/include/ldb.h | 2 +-
source/lib/replace/libreplace_network.m4 | 9 +-
source/lib/replace/replace.h | 6 +
source/lib/sendfile.c | 4 +-
source/lib/system.c | 25 ++
source/lib/util.c | 25 +-
source/lib/util_sock.c | 124 ++++++--
source/lib/util_tdb.c | 2 +-
source/lib/xfile.c | 25 ++-
source/libads/ldap.c | 45 +++-
source/libads/ndr.c | 1 -
source/libnet/libnet_join.c | 31 ++-
source/libsmb/cliconnect.c | 51 ++-
source/libsmb/clidfs.c | 3 +-
source/libsmb/clientgen.c | 40 +--
source/libsmb/clilist.c | 9 +-
source/libsmb/dsgetdcname.c | 49 +++-
source/libsmb/libsmb_context.c | 1 +
source/libsmb/libsmb_dir.c | 12 +-
source/libsmb/libsmb_path.c | 10 +-
source/libsmb/libsmb_server.c | 66 ++++-
source/libsmb/libsmb_setget.c | 26 ++
source/libsmb/libsmb_xattr.c | 3 +-
source/libsmb/namequery.c | 77 +++++-
source/locking/locking.c | 57 +---
source/modules/nfs4_acls.c | 82 +++---
source/modules/vfs_default.c | 14 +
source/modules/vfs_fileid.c | 10 +-
source/modules/vfs_full_audit.c | 5 +-
source/modules/vfs_streams_depot.c | 30 +-
source/modules/vfs_streams_xattr.c | 11 -
source/nmbd/asyncdns.c | 3 +-
source/nmbd/nmbd.c | 3 +-
source/nsswitch/pam_winbind.c | 2 +-
source/nsswitch/pam_winbind.h | 9 +-
source/nsswitch/winbind_nss_solaris.c | 9 +-
source/nsswitch/winbind_nss_solaris.h | 3 +
source/param/loadparm.c | 2 +-
source/passdb/pdb_smbpasswd.c | 2 +-
source/printing/print_cups.c | 9 +-
source/printing/printfsp.c | 9 +-
source/printing/printing.c | 3 +-
source/rpc_parse/parse_eventlog.c | 4 +-
source/rpc_server/srv_eventlog_nt.c | 10 +-
source/rpc_server/srv_samr_nt.c | 4 +-
source/smbd/close.c | 16 +-
source/smbd/dosmode.c | 11 +-
source/smbd/nttrans.c | 14 +-
source/smbd/open.c | 176 ++++++-----
source/smbd/oplock.c | 54 +++-
source/smbd/password.c | 23 +-
source/smbd/posix_acls.c | 310 +++++++++---------
source/smbd/process.c | 2 +-
source/smbd/reply.c | 38 ++-
source/smbd/server.c | 7 +-
source/smbd/trans2.c | 32 +--
source/utils/net_ads.c | 2 +-
source/utils/net_status.c | 44 ++--
source/utils/smbcacls.c | 2 +
source/utils/smbpasswd.c | 9 +
source/web/statuspage.c | 3 +-
source/web/swat.c | 2 +-
source/winbindd/winbindd.c | 39 ++-
source/winbindd/winbindd_cache.c | 11 +-
source/winbindd/winbindd_cm.c | 85 +++---
source/winbindd/winbindd_cred_cache.c | 333 +++++++++++++++++---
source/winbindd/winbindd_dual.c | 219 +++++++++----
source/winbindd/winbindd_util.c | 13 +-
105 files changed, 2257 insertions(+), 1091 deletions(-)
create mode 100644 docs-xml/manpages-3/vfs_fileid.8.xml
create mode 100644 docs-xml/manpages-3/vfs_shadow_copy2.8.xml
Changeset truncated at 500 lines:
diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index 0f401d6..610d720 100644
--- a/docs-xml/Makefile
+++ b/docs-xml/Makefile
@@ -50,49 +50,56 @@ $(DOCBOOKDIR)/Samba3-Developers-Guide.xml: $(filter-out Samba3-Developers-Guide/
$(DOCBOOKDIR)/Samba4-HOWTO.xml: $(filter-out Samba4-HOWTO/index.xml,$(wildcard Samba4-HOWTO/*.xml)) Samba4-HOWTO-attributions.xml
# Pseudo targets
-all: $(TARGETS)
-everything: manpages3 pdf html-single html htmlman3 txt ps fo htmlhelp pearson
-release: manpages3 htmlman3 html pdf
-clean:
+all:: $(TARGETS)
+everything:: manpages3 pdf html-single html htmlman3 txt ps fo htmlhelp pearson
+release:: manpages3 htmlman3 html pdf
+clean::
@echo "Cleaning up..."
rm -rf $(OUTPUTDIR)/* $(DOCBOOKDIR)
rm -f $(patsubst %.svg,%.png,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-dia))) \
$(patsubst %.svg,%.pdf,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg))) \
- $(patsubst %.svg,%.eps,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg)))
+ $(patsubst %.svg,%.eps,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg))) \
+ $(patsubst %.svg,%.png,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg)))
rm -f *-attributions.xml *.d *.tpt *.tex *.loc *.toc *.lof *.glo *.idx *.aux
rm -f *-images-html*
- rm -f *-images-latex-* latexfigures
+ rm -f *-images-latex-* $(LATEX_FIGURES)
rm -f xslt/figures/*pdf
rm -f $(SMBDOTCONFDOC)/parameters.*.xml
rm -f $(addsuffix .*,$(MAIN_DOCS))
+ rm -f build/catalog.xml
# Output format targets
-pdf: $(patsubst %,$(PDFDIR)/%.pdf,$(MAIN_DOCS))
-dvi: $(patsubst %,$(DVIDIR)/%.dvi,$(MAIN_DOCS))
-ps: $(patsubst %,$(PSDIR)/%.ps,$(MAIN_DOCS))
-txt: $(patsubst %,$(TXTDIR)/%.txt,$(MAIN_DOCS))
-txt-chunks: $(addsuffix -txt-chunks,$(MAIN_DOCS))
-fo: $(patsubst %,$(FODIR)/%.fo,$(MAIN_DOCS))
-fo-pdf: $(patsubst %,$(FOPDFDIR)/%.pdf,$(MAIN_DOCS))
-tex: $(addsuffix .tex,$(MAIN_DOCS))
-texi: $(patsubst %,$(TEXINFODIR)/%.texi,$(MAIN_DOCS))
-texiinfo: $(patsubst %,$(TEXINFODIR)/%.info,$(MAIN_DOCS))
-manpages3: $(patsubst $(MANPAGEDIR3)/%.xml,$(OUTPUTDIR)/manpages-3/%,$(MANPAGES3))
-pearson: $(PEARSONDIR)/Samba3-HOWTO.xml
-pearson-verify: $(PEARSONDIR)/Samba3-HOWTO.report.html
-plucker: $(patsubst %,$(PLUCKERDIR)/%.pdb,$(MAIN_DOCS))
-htmlman3: $(patsubst $(MANPAGEDIR3)/%.xml,$(HTMLDIR)/manpages-3/%.html,$(MANPAGES3)) $(HTMLDIR)/manpages-3/index.html
-html-single: $(patsubst %,$(HTMLDIR)/%.html,$(MAIN_DOCS))
-html: $(patsubst %,$(HTMLDIR)/%/index.html,$(MAIN_DOCS)) $(HTMLDIR)/index.html
-htmlhelp: $(addprefix $(HTMLHELPDIR)/,$(MAIN_DOCS))
-validate: $(addsuffix -validate,$(MAIN_DOCS))
+pdf:: $(patsubst %,$(PDFDIR)/%.pdf,$(MAIN_DOCS))
+dvi:: $(patsubst %,$(DVIDIR)/%.dvi,$(MAIN_DOCS))
+ps:: $(patsubst %,$(PSDIR)/%.ps,$(MAIN_DOCS))
+txt:: $(patsubst %,$(TXTDIR)/%.txt,$(MAIN_DOCS))
+txt-chunks:: $(addsuffix -txt-chunks,$(MAIN_DOCS))
+fo:: $(patsubst %,$(FODIR)/%.fo,$(MAIN_DOCS))
+fo-pdf:: $(patsubst %,$(FOPDFDIR)/%.pdf,$(MAIN_DOCS))
+tex:: $(addsuffix .tex,$(MAIN_DOCS))
+texi:: $(patsubst %,$(TEXINFODIR)/%.texi,$(MAIN_DOCS))
+texiinfo:: $(patsubst %,$(TEXINFODIR)/%.info,$(MAIN_DOCS))
+manpages3:: $(patsubst $(MANPAGEDIR3)/%.xml,$(OUTPUTDIR)/manpages-3/%,$(MANPAGES3))
+pearson:: $(PEARSONDIR)/Samba3-HOWTO.xml
+pearson-verify:: $(PEARSONDIR)/Samba3-HOWTO.report.html
+plucker:: $(patsubst %,$(PLUCKERDIR)/%.pdb,$(MAIN_DOCS))
+htmlman3:: $(patsubst $(MANPAGEDIR3)/%.xml,$(HTMLDIR)/manpages-3/%.html,$(MANPAGES3)) $(HTMLDIR)/manpages-3/index.html
+html-single:: $(patsubst %,$(HTMLDIR)/%.html,$(MAIN_DOCS))
+html:: $(patsubst %,$(HTMLDIR)/%/index.html,$(MAIN_DOCS)) $(HTMLDIR)/index.html
+htmlhelp:: $(addprefix $(HTMLHELPDIR)/,$(MAIN_DOCS))
+validate:: $(addsuffix -validate,$(MAIN_DOCS))
+
+test:: validate
+check:: validate
+
+.PHONY: test check validate
# Intermediate docbook docs
#
$(DOCBOOKDIR)/%.xml: %/index.xml xslt/expand-sambadoc.xsl
@echo "Converting Samba-specific tags for $*..."
@mkdir -p $(@D)
- $(XSLTPROC) --stringparam latex.imagebasedir "$*/" --stringparam noreference 0 --xinclude --output $@ xslt/expand-sambadoc.xsl $<
+ @$(XSLTPROC) --stringparam latex.imagebasedir "$*/" --stringparam noreference 0 --xinclude --output $@ xslt/expand-sambadoc.xsl $<
$(DOCBOOKDIR)/manpages-3/%.xml: $(MANPAGEDIR3)/%.xml xslt/expand-sambadoc.xsl
@mkdir -p $(@D)
@@ -105,7 +112,6 @@ $(DOCBOOKDIR)/manpages-3/index.xml: $(MANPAGES3) xslt/manpage-summary.xsl
@echo "</variablelist></article>" >> $@
# HTML docs
-
$(HTMLDIR)/index.html: htmldocs.html
@mkdir -p $(@D)
cp $< $@
@@ -128,7 +134,7 @@ $(HTMLDIR)/%.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/samba.css xslt/html.xsl
%-attributions.xml:
@echo "Generating attributions file $@ from $*/"
@cp -f templates/attributions.xml $@
- $(XSLTPROC) --xinclude -o $@ xslt/generate-attributions.xsl $*/index.xml
+ @$(XSLTPROC) --xinclude -o $@ xslt/generate-attributions.xsl $*/index.xml
# Text files
$(TXTDIR)/%.txt: $(HTMLDIR)/%.html
@@ -139,15 +145,13 @@ $(TXTDIR)/%.txt: $(HTMLDIR)/%.html
%.tex: %/index.xml xslt/latex.xsl
@echo "Generating $@..."
@mkdir -p $(@D)
- $(XSLTPROC) $(DB2LATEX_ARGS) --stringparam latex.imagebasedir "$*/" --xinclude --output $@ xslt/latex.xsl $<
-
-latexfigures: $(LATEX_FIGURES)
+ @$(XSLTPROC) $(DB2LATEX_ARGS) --stringparam latex.imagebasedir "$*/" --xinclude --output $@ xslt/latex.xsl $<
$(PDFDIR)/%.pdf: %.pdf
@mkdir -p $(@D)
cp $< $@
-%.idx: %.tex latexfigures
+%.idx: %.tex $(LATEX_FIGURES)
-$(PDFLATEX) $<
%.ind: %.idx
@@ -156,8 +160,7 @@ $(PDFDIR)/%.pdf: %.pdf
# Dependency files
%.d: $(DOCBOOKDIR)/%.xml xslt/generate-dependencies.xsl
@echo "Generating dependency file for $*"
- $(XSLTPROC) \
- --novalid \
+ @$(XSLTPROC) --novalid \
--stringparam txtbasedir "$(TXTDIR)/$*/" \
--stringparam target "$*" \
-o $@ xslt/generate-dependencies.xsl $<
@@ -190,7 +193,7 @@ endif
endif
# Adobe PDF files
-%.pdf: %.tex %.ind latexfigures %-images-latex-png %-images-latex-pdf
+%.pdf: %.tex %.ind $(LATEX_FIGURES) %-images-latex-png %-images-latex-pdf
-$(PDFLATEX) $<
-$(PDFLATEX) $<
-$(PDFLATEX) $<
@@ -318,12 +321,15 @@ xslt/generate-attributions.xsl:
xslt/man.xsl:
xslt/pearson.xsl:
-distclean clobber: clean
- rm Makefile.settings config.status config.log configure
+distclean clobber:: clean
+ rm -f Makefile.settings config.status config.log
+
+realdistclean:: distclean
+ rm -f configure
rm -rf autom4te.cache
# Always keep intermediate files if we can
.SECONDARY:
-.PHONY: clean clobber archive release everything all $(TARGETS) latexfigures
+.PHONY: clean clobber archive release everything all
diff --git a/docs-xml/Samba3-ByExample/SBE-DomainAppsSupport.xml b/docs-xml/Samba3-ByExample/SBE-DomainAppsSupport.xml
index 6d144ab..c9ccd43 100644
--- a/docs-xml/Samba3-ByExample/SBE-DomainAppsSupport.xml
+++ b/docs-xml/Samba3-ByExample/SBE-DomainAppsSupport.xml
@@ -477,7 +477,7 @@ Password for ADMINISTRATOR at LONDON.ABMAS.BIZ:
<screen>
&rootprompt; smbd -D
&rootprompt; nmbd -D
-&rootprompt; winbindd -B
+&rootprompt; winbindd -D
</screen>
</para></step>
diff --git a/docs-xml/Samba3-ByExample/SBE-SecureOfficeServer.xml b/docs-xml/Samba3-ByExample/SBE-SecureOfficeServer.xml
index e03c010..2e60b4a 100644
--- a/docs-xml/Samba3-ByExample/SBE-SecureOfficeServer.xml
+++ b/docs-xml/Samba3-ByExample/SBE-SecureOfficeServer.xml
@@ -1910,8 +1910,8 @@ Loaded services file OK.
14290 ? S 0:00 /usr/sbin/smbd -D
$rootprompt; ps ax | grep winbind
-14293 ? S 0:00 /usr/sbin/winbindd -B
-14295 ? S 0:00 /usr/sbin/winbindd -B
+14293 ? S 0:00 /usr/sbin/winbindd -D
+14295 ? S 0:00 /usr/sbin/winbindd -D
</screen>
The <command>winbindd</command> daemon is running in split mode (normal), so there are also
two instances<footnote><para>For more information regarding winbindd, see <emphasis>TOSHARG2</emphasis>,
diff --git a/docs-xml/Samba3-ByExample/SBE-TheSmallOffice.xml b/docs-xml/Samba3-ByExample/SBE-TheSmallOffice.xml
index ca39af3..b178749 100644
--- a/docs-xml/Samba3-ByExample/SBE-TheSmallOffice.xml
+++ b/docs-xml/Samba3-ByExample/SBE-TheSmallOffice.xml
@@ -767,8 +767,8 @@ Ignoring unknown parameter "dogbert"
14290 ? S 0:00 /usr/sbin/smbd -D
$rootprompt; ps ax | grep winbind
-14293 ? S 0:00 /usr/sbin/winbindd -B
-14295 ? S 0:00 /usr/sbin/winbindd -B
+14293 ? S 0:00 /usr/sbin/winbindd -D
+14295 ? S 0:00 /usr/sbin/winbindd -D
</screen>
The <command>winbindd</command> daemon is running in split mode (normal), so there are also
two instances of it. For more information regarding <command>winbindd</command>, see
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-Compiling.xml b/docs-xml/Samba3-HOWTO/TOSHARG-Compiling.xml
index 130da81..1f1f51c 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-Compiling.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-Compiling.xml
@@ -492,9 +492,9 @@ netbios-ns dgram udp wait root /usr/local/samba/sbin/nmbd nmbd
<para><programlisting>
#!/bin/sh
-/usr/local/samba/sbin/smbd -D
-/usr/local/samba/sbin/winbindd -B
-/usr/local/samba/sbin/nmbd -D
+/usr/local/samba/sbin/smbd -D
+/usr/local/samba/sbin/winbindd -D
+/usr/local/samba/sbin/nmbd -D
</programlisting></para>
<para>
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/Samba3-HOWTO/TOSHARG-Winbind.xml b/docs-xml/Samba3-HOWTO/TOSHARG-Winbind.xml
index 7731e4e..adb0ba2 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-Winbind.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-Winbind.xml
@@ -1016,7 +1016,7 @@ start() {
in the example above with:
<programlisting>
- daemon /usr/local/samba/sbin/winbindd -B
+ daemon /usr/local/samba/sbin/winbindd -D
</programlisting>.
</para>
@@ -1125,7 +1125,7 @@ Again, if you would like to run Samba in dual daemon mode, replace:
</programlisting>
in the script above with:
<programlisting>
-/usr/local/samba/sbin/winbindd -B
+/usr/local/samba/sbin/winbindd -D
</programlisting>
</para>
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/idmap_ad.8.xml b/docs-xml/manpages-3/idmap_ad.8.xml
index 766eb85..d104c3e 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/libsmbclient.7.xml b/docs-xml/manpages-3/libsmbclient.7.xml
index ec95004..9257e1c 100644
--- a/docs-xml/manpages-3/libsmbclient.7.xml
+++ b/docs-xml/manpages-3/libsmbclient.7.xml
@@ -18,10 +18,11 @@
<refsynopsisdiv>
<cmdsynopsis>
- <command>Browser URL:</command>
<para>
- smb://[[[domain:]user[:password@]]server[/share[/path[/file]]]] [?options]
- </para>
+ Browser URL:
+ <command moreinfo="none">smb://[[[domain:]user[:password@]]server[/share[/path[/file]]]] [?options]
+ </command>
+ </para>
</cmdsynopsis>
</refsynopsisdiv>
diff --git a/docs-xml/manpages-3/mount.cifs.8.xml b/docs-xml/manpages-3/mount.cifs.8.xml
index 51a22b3..54fbc13 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/smbclient.1.xml b/docs-xml/manpages-3/smbclient.1.xml
index e2662cc..188ff11 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_fileid.8.xml b/docs-xml/manpages-3/vfs_fileid.8.xml
new file mode 100644
index 0000000..202d693
--- /dev/null
+++ b/docs-xml/manpages-3/vfs_fileid.8.xml
@@ -0,0 +1,112 @@
+<?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="vfs_fileid.8">
+
+<refmeta>
+ <refentrytitle>vfs_fileid</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>vfs_fileid</refname>
+ <refpurpose>Generates file_id structs with unique device id values for
+ cluster setups</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <cmdsynopsis>
+ <command>vfs objects = fileid</command>
+ </cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1>
+ <title>DESCRIPTION</title>
+
+ <para>This VFS module is part of the
+ <citerefentry><refentrytitle>samba</refentrytitle>
+ <manvolnum>7</manvolnum></citerefentry>
+ suite.</para>
+
+ <para>Samba uses file_id structs to uniquely identify files
+ for locking purpose. By default the file_id contains the device
+ and inode number returned by the <command>stat()</command> system call.
+ As the file_id is a unique identifier of a file, it must be the same
+ on all nodes in a cluster setup. This module overloads the
+ <command>SMB_VFS_FILE_ID_CREATE()</command> operation and
+ generates the device number based on the configured algorithm
+ (see the "fileid:algorithm" option).
+ </para>
+</refsect1>
+
+
+<refsect1>
+ <title>OPTIONS</title>
+
+ <variablelist>
+
--
Samba Shared Repository
More information about the samba-cvs
mailing list