[SCM] Samba Shared Repository - branch v3-2-stable updated -
release-3-2-5
Karolin Seeger
kseeger at samba.org
Thu Nov 27 14:08:33 GMT 2008
The branch, v3-2-stable has been updated
via 6de5de4f5c23ff79074b68d7a7447d35af8e200d (commit)
via 64a1d80851da5b05e70ec6c96f6e9bd473748369 (commit)
via 60a639b1ac6c88f3a5ef1fe111860eb4b89b3a7d (commit)
via b905dab61dc2304ebf89efcdab99974cf7c110c7 (commit)
via 8af08208de0bc78420e57ff3d643dfbbb9a4c19c (commit)
via a2088d3a7e3a25ce9c69de72037710ed17349721 (commit)
via 8e8104534b90fde188c12732e55bfa3479755861 (commit)
via baa6380bbc8bc4736e9dd9c2ac19734da7abd54e (commit)
via d8855aac511fd276a10b3acbc5a3a3f8b717d4a3 (commit)
via 8bba0e2f1cd7890e6542b17b31ee620bd8939410 (commit)
via 36635fda332905effb05311e0e19f4012847c6ef (commit)
via dd9020a6da0a9d897d5f41481fbaa4a601efce8f (commit)
via 6a8b50b699850ccd774a3f031ad195ce6e41da83 (commit)
via 8f38ac7fd08bdea2a96d423757c16fc19d3df603 (commit)
via bae0e060b0605679d273404b0d8f5f68f9b9501e (commit)
via dc10e3a5eda3bbc6f41fb8fd7bfcbcb91c49bb78 (commit)
via a04c5dec1aabc81b7af89742f47e5db3130e2e06 (commit)
via 54e0177e5edfba2376021df7a3439e1a479e99b4 (commit)
via ff1780f1325f24dbb5ca40ce8b6fc2f4c0c3bc69 (commit)
via 17608b3080ce8f363aa46b1f01ad2841d2092262 (commit)
via 27beb800b888cb4be66586bed85c2803573a4507 (commit)
via 3a5d68ca4bc47cfef413e1e7db220352634cb1eb (commit)
via b0f96fa3da51555a509a83dd0eb6cadadc526cf8 (commit)
via c39b84e111acb200d017ef4fc5d9ef69af61d768 (commit)
via 75423492fdfbc84e6f2d4b32088d1ba056f1e79f (commit)
via 95baa2d4757f343972c863e5307960ba2a755230 (commit)
via 6fc438de2b9888d8fc329d9cc9d572a931c93e85 (commit)
via b5dbb583e0e966c5d1bef6b323221b3f6689ec6b (commit)
via 62f7a2da9921071ab1877e43eac6b82c035c4806 (commit)
via 4d7b05ab9509a9c38b0c98d879928f6c4acc304a (commit)
via 2db91debc4088063ac84a6aa5f1a8adef8cc4064 (commit)
via 85d6e22624df9ef7240b7994ce59c3d7ce468a68 (commit)
via c2edb7f8fd0541f576a9ce5f4d8565fdc03a8622 (commit)
via 6d3dcf04a5148d150e5fe6cbfcfbeea43db455cd (commit)
via 621113226c2461d6fa3720dd24e22b43b4bc13ac (commit)
via 68f0bcdb345bb7731bb358c93f52d848551e142a (commit)
via 3895aecff181d0d13612fa6dacbe5115fd289176 (commit)
via 9eb2f72418dee36a10f7348cefd2cc4402f068a7 (commit)
via 5f16d0a11742d5e684d21072d03667a1dc4c3adc (commit)
via 7ec48d0020aa48858d0a673a61b02007e02e1ef2 (commit)
via e2cc0afcb9d6c33e723d3efc7a46de396d708560 (commit)
via 007bdd95e1a410979cf7975cd0aa3df46843cc82 (commit)
via e7fa97b6aa202b57c479555d0af1884a5fce781e (commit)
via b07f977aa4f635e65ba302e9c445247b2b9f6f0f (commit)
via 55c851c345aa23544afd96d6e770a51779ac8e6f (commit)
via 1e0e3aa442502cdcdb083893fba8489f40d22312 (commit)
via 2c36721294d3924d66225307524c848ff405ab86 (commit)
via 592f1c5a4a676a214b6eb6bc014022f3cffc750a (commit)
via 41eaf9b8e7ee6544c95f2b2bc7165e867fd4fcc6 (commit)
via 877a58459b8c0e365cdf929e2ffaaca4cb2f380c (commit)
via 94e155caa11ebff4f714c1a9dc5b91309f51c71a (commit)
via 0a45139dda11a72d684991e2c92dce2616daf9f3 (commit)
via bb0d37a0a1b281da0dec3797d4552424470784c4 (commit)
via 85123142ba3573113baf7e76e19307fe07ed5c45 (commit)
via 2a9b419f1cb6a43aabd90d18c8249c27129677b7 (commit)
via 086d430578b2b96c93768b64d6d9872ec324b124 (commit)
via f50add3d8cbe3f3cba7e75746a9cc39907501146 (commit)
via 8c19fcad5d8f9a765b6257c6cc0f25998a46f00c (commit)
via bbd4d7d146039b8b98f1b820d5c26af1c89bcc7a (commit)
via 0b78e48594fe4ab231010c5ef4edc518cd5f992b (commit)
via c187a869c434903c4895f751459074cc697b78f3 (commit)
via 4b15711c348bbdbecf20f7fe12bf8ff52d5fdb45 (commit)
via deaf70a87add07e9af6ef0eb411d949d2403433c (commit)
via 406e6e71b80769bebddbb720de2dd353e5fcda8e (commit)
via cc9940e432bf55839ec9ba25e1dd579ff7ce28a5 (commit)
via 3b0ba20f0ef9c655b2e40dbdd39beb2ff2a536df (commit)
via 1ed85fec76414753e2819ff81eef74e80fdebba8 (commit)
via c47f95baab5ec565ed778e98e95ee5fabba862da (commit)
via b9d1624849223029952d4f42cca6728d66398b0e (commit)
via 06c99500744f890c67f0fb4d473da652155a7f7e (commit)
from fd93db7084fdb5899fb823046b9d6ed1d05221c7 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable
- Log -----------------------------------------------------------------
commit 6de5de4f5c23ff79074b68d7a7447d35af8e200d
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue Nov 18 16:17:17 2008 +0100
WHATSNEW: Update WHATSNEW for 3.2.5.
Karolin
commit 64a1d80851da5b05e70ec6c96f6e9bd473748369
Author: Volker Lendecke <vl at samba.org>
Date: Sat Nov 8 17:14:06 2008 +0100
Fix the offset checks in the trans routines
This fixes a potential crash bug, a client can make us read memory we
should not read. Luckily I got the disp checks right...
Volker
commit 60a639b1ac6c88f3a5ef1fe111860eb4b89b3a7d
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:56 2008 +0100
Revert "build-docs: Add 'make clean'."
This reverts commit 4f9f592ab792e36e870bbeba96a1fb8f0ee9efda.
commit b905dab61dc2304ebf89efcdab99974cf7c110c7
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:56 2008 +0100
Revert "build: don't install the cifs.upcall binary twice."
This reverts commit cfc8dc236dda869dbe4141bef80f6965ce76188d.
commit 8af08208de0bc78420e57ff3d643dfbbb9a4c19c
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:56 2008 +0100
Revert "Fix bug #5783 FindFirst fails where search pattern == mangled filename."
This reverts commit fc9247572e0ace4956845e279c63c9d00fa667bd.
commit a2088d3a7e3a25ce9c69de72037710ed17349721
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:56 2008 +0100
Revert "Fix winbindd crash in an unusual failure mode. Bug #5737. Based on original patch from shargagan at novell.com"
This reverts commit 9a38a8454cfbd0011d804b3ab88c16e5d4f1c4bd.
commit 8e8104534b90fde188c12732e55bfa3479755861
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:55 2008 +0100
Revert "Fix bug #5790 samba returns STATUS_OBJECT_NAME_NOT_FOUND on set file disposition."
This reverts commit 24348e2e028f8f63c7acad33f2f9a362a3d3fdc0.
commit baa6380bbc8bc4736e9dd9c2ac19734da7abd54e
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:55 2008 +0100
Revert "SMB traffic analyzer vfs module from Holger Hetterich <hhetter at novell.com>"
This reverts commit aeabc475d8abf9a820b4846a30cf92cc253bc939.
commit d8855aac511fd276a10b3acbc5a3a3f8b717d4a3
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:55 2008 +0100
Revert "Fix the new vfs_smb_traffic_analyzer build for static links"
This reverts commit f64bcae4ff2bb1a9db603c1f38e1e4fa2e5148bc.
commit 8bba0e2f1cd7890e6542b17b31ee620bd8939410
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:55 2008 +0100
Revert "Use IPv4/v6 independent calls. Change safe_strcpy/cat to strlcpy/cat (this"
This reverts commit caa0f1131872f82c1a346f701830544b372e4317.
commit 36635fda332905effb05311e0e19f4012847c6ef
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:55 2008 +0100
Revert "s3-srvsvc: fix _srvsvc_NetShareAdd segfault."
This reverts commit aa9a74f33f1a1862836569565d64861706de5429.
commit dd9020a6da0a9d897d5f41481fbaa4a601efce8f
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:55 2008 +0100
Revert "Fix bug #5797 - Moving readonly files fails. Reported by infomail at lordb.de."
This reverts commit 7292c322ca70e9df82e020f45f1510e9ca02efbc.
commit 6a8b50b699850ccd774a3f031ad195ce6e41da83
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:54 2008 +0100
Revert "Second part of the fix for bug #5790 - samba returns STATUS_OBJECT_NAME_NOT_FOUND on set file disposition call."
This reverts commit e73c090b5ff624f71ce827c494cd71ca73144ba9.
commit 8f38ac7fd08bdea2a96d423757c16fc19d3df603
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:54 2008 +0100
Revert "Add an initial version of a manpage for the vfs_smb_traffic_analyzer module."
This reverts commit 1394827cfda4eeff5b4239b6ed5c93fcaaed0e2e.
commit bae0e060b0605679d273404b0d8f5f68f9b9501e
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:54 2008 +0100
Revert "Avoid freeing fsp twice when opening new_file fails. (Debian #431696)"
This reverts commit 7c9a7cb8682156ffb39382a44e3abf40408bff63.
commit dc10e3a5eda3bbc6f41fb8fd7bfcbcb91c49bb78
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:54 2008 +0100
Revert "Ensure we null out fsp after a close in all paths."
This reverts commit a48d591ef5d839159f600a8c7e2966211450c00b.
commit a04c5dec1aabc81b7af89742f47e5db3130e2e06
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:54 2008 +0100
Revert "fixed segv on startup with trusted domains"
This reverts commit 8b41be0c7080edaf9fb33e583c66f2ef50a91643.
commit 54e0177e5edfba2376021df7a3439e1a479e99b4
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:54 2008 +0100
Revert "re-added "winbind:ignore domains" patch"
This reverts commit 37d4e792bfd72e4b12811e0fbdb75cec2eda8f2a.
commit ff1780f1325f24dbb5ca40ce8b6fc2f4c0c3bc69
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:53 2008 +0100
Revert "Fix the make test problem Karolin reported. Now rename_open_files actually works correctly we must emit the change notify before we change the name, not before."
This reverts commit ac2046979cacf96f8d4df7c5ece06e55d51758c8.
commit 17608b3080ce8f363aa46b1f01ad2841d2092262
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:53 2008 +0100
Revert "Restructure the module so it connects to the remote data sink"
This reverts commit 1bf75ac9781c60be5a7b5899bc42aa1d198091d9.
commit 27beb800b888cb4be66586bed85c2803573a4507
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:53 2008 +0100
Revert "Convert to allocated strings. Use write_data(), not send as this doesn't correctly"
This reverts commit 747f7a5647851290f6a3968477a8749e1134777c.
commit 3a5d68ca4bc47cfef413e1e7db220352634cb1eb
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:53 2008 +0100
Revert "Turn the socket connections into a refcounted list - in the common case there'll now only be one socket per smbd."
This reverts commit 63603373628901fcb6a816d9ac9b5340dd8d8662.
commit b0f96fa3da51555a509a83dd0eb6cadadc526cf8
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:53 2008 +0100
Revert "Fix use of DLIST_REMOVE as spotted by Constantine Vetoshev <gepardcv at gmail.com>."
This reverts commit 8443b4859f64aa5459976ce37ca96a90daae889a.
commit c39b84e111acb200d017ef4fc5d9ef69af61d768
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:53 2008 +0100
Revert "Whitespace cleanup."
This reverts commit a2f298883f21c3e9afe686ee393410f2bcb28370.
commit 75423492fdfbc84e6f2d4b32088d1ba056f1e79f
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:53 2008 +0100
Revert "Fix bug 5805: don't close stdout"
This reverts commit a937de4a626a8084e852bf7d345441bab15963cd.
commit 95baa2d4757f343972c863e5307960ba2a755230
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:52 2008 +0100
Revert "Fix bug #5080. Access to cups-printers via samba broken with cups 1.3.4, Unsupported character set."
This reverts commit 47161923108222c41db4572b5f44cdb2b6d84a51.
commit 6fc438de2b9888d8fc329d9cc9d572a931c93e85
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:52 2008 +0100
Revert "libaddns: Use the same prerequisite for DDNS update as Windows XP."
This reverts commit 35130846b4595cc3a937e10a113d2805a5b2c096.
commit b5dbb583e0e966c5d1bef6b323221b3f6689ec6b
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:52 2008 +0100
Revert "net_dns: Make "lwinet ads dns register" honor the "interfaces" parameter."
This reverts commit d2242f9776cfed2dfff44db180dbf34fbbba2e5e.
commit 62f7a2da9921071ab1877e43eac6b82c035c4806
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:52 2008 +0100
Revert "Correctly fix smbclient to terminate on eof from server."
This reverts commit 28fa519a80bfcd30737a51ad157d134322c1fed9.
commit 4d7b05ab9509a9c38b0c98d879928f6c4acc304a
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:52 2008 +0100
Revert "Fix a potential NULL deref in line 258 found by the IBM checker"
This reverts commit 589fe1c879ef23ee9e45f5f877f2696142d57e70.
commit 2db91debc4088063ac84a6aa5f1a8adef8cc4064
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:52 2008 +0100
Revert "Fix an uninitialized variable found by the IBM Checker"
This reverts commit 2ed66bc2b6e22aeb0dcc1aba68bac3791ee0647f.
commit 85d6e22624df9ef7240b7994ce59c3d7ce468a68
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:52 2008 +0100
Revert "Fix an unlikely memleak found by the IBM checker"
This reverts commit a0ee34c3c55a64ac2b73fdbaa32233d01ee131c6.
commit c2edb7f8fd0541f576a9ce5f4d8565fdc03a8622
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:51 2008 +0100
Revert "Fix an uninitialized variable warning"
This reverts commit 2e65d8bce755ddfa35bae5ad4c5107db7e18515a.
commit 6d3dcf04a5148d150e5fe6cbfcfbeea43db455cd
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:51 2008 +0100
Revert "OS/X does not have rl_done in readline.h"
This reverts commit 829e29c95ad6c1b5744dcffb4586ff7c875e3831.
commit 621113226c2461d6fa3720dd24e22b43b4bc13ac
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:51 2008 +0100
Revert "Fix some missing error handlings"
This reverts commit 4ac937db865d9fc56cb49838a361dd697d06efc7.
commit 68f0bcdb345bb7731bb358c93f52d848551e142a
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:51 2008 +0100
Revert "Remove an unused variable"
This reverts commit 7cb9d82244a8e93261d12a3800334d8152a2431e.
commit 3895aecff181d0d13612fa6dacbe5115fd289176
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:51 2008 +0100
Revert "Attempt to fix bug 5778"
This reverts commit ecc67001315111493738e893917c4550be7828a1.
commit 9eb2f72418dee36a10f7348cefd2cc4402f068a7
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:51 2008 +0100
Revert "Log in the parent winbind log where a request is going"
This reverts commit b1bcaf45ce14108b7e2b429b96908e30bf6eb90d.
commit 5f16d0a11742d5e684d21072d03667a1dc4c3adc
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:50 2008 +0100
Revert "If name_to_fqdn fails, retry with the dns domain the DC gave us"
This reverts commit 82a086fb6f70dd6b725e4976293bc377a6a90f3a.
commit 7ec48d0020aa48858d0a673a61b02007e02e1ef2
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:50 2008 +0100
Revert "Fixed "declaration shadows global declaration" warnings."
This reverts commit fa3096b975de2c7fd747ca9f344e36c911e27a9c.
commit e2cc0afcb9d6c33e723d3efc7a46de396d708560
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:50 2008 +0100
Revert "Fixed build warning "passing arg from incompatible pointer type""
This reverts commit ed955214133c264865d2f6ca532349f0c1ea8d4b.
commit 007bdd95e1a410979cf7975cd0aa3df46843cc82
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:50 2008 +0100
Revert "Fix bug #5814 - Winbindd dumping core in a strange manner while doing "rescan_trusted_domain"."
This reverts commit 15b2f1d8744d157b131a0441e8738d8519de37c7.
commit e7fa97b6aa202b57c479555d0af1884a5fce781e
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:50 2008 +0100
Revert "mount.cifs: have uppercase_string return success on NULL pointer"
This reverts commit 3f4cdabc965f824b70891f6a6bcb29e5f9b579e5.
commit b07f977aa4f635e65ba302e9c445247b2b9f6f0f
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:49 2008 +0100
Revert "mount.cifs: make return codes match the return codes for /bin/mount (try #3)"
This reverts commit 98bcd52a568c274707cc6ccb9071d07a8bfca1ca.
commit 55c851c345aa23544afd96d6e770a51779ac8e6f
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:49 2008 +0100
Revert "Make use of ZERO_STRUCT (the first memset was actually wrong)"
This reverts commit 69de2806465742ea6f1ea96d75d2cb3be6b84284.
commit 1e0e3aa442502cdcdb083893fba8489f40d22312
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:49 2008 +0100
Revert "Now it's working, back port the aync fix for parsing large cups printer lists."
This reverts commit f5f7ed4041ef986a5ce208d59bbf39d34373ce71.
commit 2c36721294d3924d66225307524c848ff405ab86
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:49 2008 +0100
Revert "Fix the build"
This reverts commit 916bb3a8dc1ab23e416508cc2ed7a5791540e622.
commit 592f1c5a4a676a214b6eb6bc014022f3cffc750a
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:48 2008 +0100
Revert "Fix bug 5691: SIGBUS on Solaris"
This reverts commit 41b2199fd87598076a1f45106b512c94042f7968.
commit 41eaf9b8e7ee6544c95f2b2bc7165e867fd4fcc6
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:48 2008 +0100
Revert "Enable optional anonymization of user names,"
This reverts commit e9359e6e8f692c693aad95f9a241c41cc23aa02a.
commit 877a58459b8c0e365cdf929e2ffaaca4cb2f380c
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:48 2008 +0100
Revert "Update the manpage for vfs_smb_traffic_analyzer to include the anonymize_prefix option"
This reverts commit 9222fde6505deb31324b507d73c96bcb6edb161d.
commit 94e155caa11ebff4f714c1a9dc5b91309f51c71a
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:48 2008 +0100
Revert "Fix the "Premature end of data in tag" error when buiding the manpage, fix a typo in the text, add an example for anonymization usage."
This reverts commit abfdb52b60e84980d22e6c6c3479e67e20311b12.
commit 0a45139dda11a72d684991e2c92dce2616daf9f3
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:48 2008 +0100
Revert "Note url explaining this code."
This reverts commit 9953885d0be6a2477f5fd29940f3f1d6a7136cf4.
commit bb0d37a0a1b281da0dec3797d4552424470784c4
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:48 2008 +0100
Revert "Attempt to fix bug #5818 - "smbcacls: sorts ACEs improperly and loses inheritance", based on"
This reverts commit 5d2d94b46bd2ab03e2f83036b4d7fa3e401c3458.
commit 85123142ba3573113baf7e76e19307fe07ed5c45
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:47 2008 +0100
Revert "WHATSNEW: Update changes since 3.2.4."
This reverts commit fac5f4c8421b371b22d337853f1f8241c3bdbc5b.
commit 2a9b419f1cb6a43aabd90d18c8249c27129677b7
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:47 2008 +0100
Revert "WHATSNEW: Update changes since 3.2.4."
This reverts commit ec9f180390852a9356df11412bc7478f48f52b43.
commit 086d430578b2b96c93768b64d6d9872ec324b124
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:47 2008 +0100
Revert "Don't use debug level 1 to log a trivial message."
This reverts commit 520dcfffe78bb079bbdad6de5a4cdc392527f4b8.
commit f50add3d8cbe3f3cba7e75746a9cc39907501146
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:47 2008 +0100
Revert "Fix bug 5826 - Directory/Filenames get truncated when 3.2.0 client acesses old server."
This reverts commit f3b0e219f1a7660ff275db701935eecbe053fa25.
commit 8c19fcad5d8f9a765b6257c6cc0f25998a46f00c
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:47 2008 +0100
Revert "Unify the logic in pull_ascii_base_talloc() and pull_ucs2_base_talloc()."
This reverts commit 01fd94981e322da59ac2c00055220c89de135ebe.
commit bbd4d7d146039b8b98f1b820d5c26af1c89bcc7a
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:47 2008 +0100
Revert "Cope with bad trans2mkdir requests from System i QNTC IBM SMB client."
This reverts commit feb057d4503118e519b5dbd9d2c3ca2c1ee55380.
commit 0b78e48594fe4ab231010c5ef4edc518cd5f992b
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:46 2008 +0100
Revert "Unify access checks for lsa server functions."
This reverts commit afed4929f9c707fb72b0e8dd12b1a1e8dcab9a84.
commit c187a869c434903c4895f751459074cc697b78f3
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:46 2008 +0100
Revert "s3-samr-server: be consistent when reporting we do password complexity."
This reverts commit f8d4596ec2b8f35dd3cc05aa7ee356abb9c0920b.
commit 4b15711c348bbdbecf20f7fe12bf8ff52d5fdb45
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:46 2008 +0100
Revert "WHATSNEW: Update changes."
This reverts commit 1d86b5e003effb4bb56ef9b0444da63a909fbc3c.
commit deaf70a87add07e9af6ef0eb411d949d2403433c
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:46 2008 +0100
Revert "Delete the krb5 ccname variable from the PAM environment if set."
This reverts commit ddba89d7713923bfbf1c8492c5dc6c6d5b220f1e.
commit 406e6e71b80769bebddbb720de2dd353e5fcda8e
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:46 2008 +0100
Revert "Cope with MAXIMUM_ALLOWED_ACCESS requests when opening handles."
This reverts commit 042e50f8709cfbe45d5b184cb3c4fe1b16bdc3b0.
commit cc9940e432bf55839ec9ba25e1dd579ff7ce28a5
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:45 2008 +0100
Revert "Fix bug 5840: Segfault in "rpcclient lsaaddacctrights""
This reverts commit 369fecaeb2470a1f7e68417ccdddb61334e37d92.
commit 3b0ba20f0ef9c655b2e40dbdd39beb2ff2a536df
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:45 2008 +0100
Revert "Fix net rpc vampire, based on an *amazing* piece of debugging work by "Cooper S. Blake" <the_analogkid at yahoo.com>."
This reverts commit 61046225de8a4cd77e94d8c5c4a8f510bc11b79e.
commit 1ed85fec76414753e2819ff81eef74e80fdebba8
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:45 2008 +0100
Revert "s3-samr-server: _samr_DeleteUser needs to wipe out the user_handle on success."
This reverts commit ae01a98d49be39c258e479d610fa2e58ea2b6c62.
commit c47f95baab5ec565ed778e98e95ee5fabba862da
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:45 2008 +0100
Revert "Remove the requirement for ldap call made as root. Add in security"
This reverts commit b339f17132b18edad52b4c2f6b348e4b8d789bcb.
commit b9d1624849223029952d4f42cca6728d66398b0e
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:45 2008 +0100
Revert "s3-samr-server: fix access check in _samr_QuerySecurity()."
This reverts commit 96b35c32ae99d74608ad95d063629554fee77979.
commit 06c99500744f890c67f0fb4d473da652155a7f7e
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 17 14:02:44 2008 +0100
Revert "WHATSNEW: Update changes since 3.2.4."
This reverts commit fd93db7084fdb5899fb823046b9d6ed1d05221c7.
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 96 +---
docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml | 176 ------
release-scripts/build-docs | 3 -
source/Makefile.in | 6 +-
source/client/client.c | 13 +-
source/client/mount.cifs.c | 96 ++--
source/configure.in | 3 +-
source/include/rpc_lsa.h | 1 -
source/include/smb.h | 1 -
source/lib/charcnv.c | 50 +--
source/lib/debug.c | 4 +-
source/lib/dummysmbd.c | 10 -
source/lib/netapi/getdc.c | 5 -
source/lib/readline.c | 21 +-
source/lib/smbldap.c | 7 +
source/lib/socket_wrapper/socket_wrapper.c | 38 +-
source/lib/util_sid.c | 11 -
source/libaddns/dnsmarshall.c | 1 -
source/libaddns/dnsrecord.c | 4 +-
source/libads/ldap.c | 1 -
source/libads/util.c | 2 -
source/libnet/libnet_join.c | 11 +-
source/libnet/libnet_samsync.c | 48 +-
source/libsmb/dsgetdcname.c | 2 -
source/modules/vfs_gpfs.c | 6 +-
source/modules/vfs_smb_traffic_analyzer.c | 426 --------------
source/nsswitch/pam_winbind.c | 7 -
source/param/loadparm.c | 2 +-
source/printing/load.c | 2 +-
source/printing/nt_printing.c | 2 -
source/printing/pcap.c | 77 +--
source/printing/print_cups.c | 578 ++++----------------
source/rpc_client/cli_pipe.c | 2 +-
source/rpc_server/srv_lsa_nt.c | 21 +-
source/rpc_server/srv_samr_nt.c | 137 +-----
source/rpc_server/srv_srvsvc_nt.c | 4 +-
source/rpcclient/cmd_lsarpc.c | 2 +-
source/smbd/conn.c | 2 +-
source/smbd/filename.c | 3 +-
source/smbd/files.c | 16 +-
source/smbd/ipc.c | 6 +-
source/smbd/nttrans.c | 6 +-
source/smbd/open.c | 4 +-
source/smbd/posix_acls.c | 4 -
source/smbd/reply.c | 4 +-
source/smbd/session.c | 5 +-
source/smbd/trans2.c | 26 +-
source/utils/net_dns.c | 26 +-
source/utils/net_rpc.c | 11 +
source/utils/net_rpc_samsync.c | 39 +-
source/utils/smbcacls.c | 183 +------
source/web/statuspage.c | 5 +-
source/winbindd/idmap_tdb2.c | 22 +-
source/winbindd/winbindd_dual.c | 41 +--
source/winbindd/winbindd_util.c | 27 +-
55 files changed, 380 insertions(+), 1926 deletions(-)
delete mode 100644 docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml
delete mode 100644 source/modules/vfs_smb_traffic_analyzer.c
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index a9c4b6f..0028a05 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,18 +1,19 @@
==============================
Release Notes for Samba 3.2.5
-
+ November, 27 2008
==============================
-This is a bug fix release of the Samba 3.2 series.
-
-Major enhancements included in Samba 3.2.5 are:
+This is a security release in order to address CVE-2008-4314 ("Potential leak of
+arbitrary memory contents").
- o Fix Winbind crash bugs.
- o Fix moving of readonly files.
- o Fix access to cups-printers with cups 1.3.4.
- o Add new SMB traffic analyzer VFS module.
+ o CVE-2008-4314
+ Samba 3.0.29 to 3.2.4 can potentially leak
+ arbitrary memory contents to malicious
+ clients.
+The original security announcement for this and past advisories can
+be found http://www.samba.org/samba/security/
######################################################################
Changes
@@ -22,85 +23,8 @@ Changes since 3.2.4
-------------------
-o Jeremy Allison <jra at samba.org>
- * BUG 5080: Fix access to cups-printers with cups 1.3.4.
- * BUG 5737: Fix Winbind crash in an unusual failure mode.
- * BUG 5783: Fix FindFirst where search pattern equals the mangled filename.
- * BUG 5790: Fix returning of STATUS_OBJECT_NAME_NOT_FOUND on set file
- disposition.
- * BUG 5797: Fix moving of readonly files.
- * BUG 5814: Fix Winbind crash bug while doing "rescan_trusted_domain".
- * BUG 5818: Sort ACEs in smbcacl output properly and honor inheritance.
- * BUG 5826: Fix truncated filenames when accessing old servers.
- * Fix rename_open_files.
- * Restructure VFS SMB traffic analyzer VFS module.
- * Correctly fix smbclient to terminate on eof from server.
- * Unify access checks for lsa server functions.
- * Remove the requirement for ldap call made as root.
- * Cope with MAXIMUM_ALLOWED_ACCESS requests when opening handles.
- * Fix net rpc vampire, based on an *amazing* piece of debugging work by
- "Cooper S. Blake" <the_analogkid at yahoo.com>.
-
-
-o Gerald (Jerry) Carter <jerry at samba.org>
- * Use the same prerequisite for DDNS update as Windows XP.
- * Make "lwinet ads dns register" honor the "interfaces" parameter.
-
-
-o Guenther Deschner <gd at samba.org>
- * Fix duplicate installation of cifs.upcall.
- * Fix _srvsvc_NetShareAdd segfault.
- * Ensure consistency when reporting password complexity.
- * Fix _lsa_GetUserName.
- * Fix access check in _samr_QuerySecurity().
- * _samr_DeleteUser needs to wipe out the user_handle on success.
- * NetGroupEnum_r needs to handle servers with no groups.
-
-
-o Holger Hetterich <hhetter at novell.com>
- * Add new VFS module to analyze SMB traffic
-
-
-o Jeff Layton <jlayton at redhat.com>
- * Have uppercase_string return success on NULL pointer in mount.cifs.
- * Make mount.cifs return codes match the return codes for /bin/mount.
-
-
o Volker Lendecke <vl at samba.org>
- * BUG 5691: Fig smbd panic on Solaris.
- * BUG 5778: Check if strlcpy and strlcat are already defined.
- * BUG 5840: Fix segfault in "rpcclient lsaaddacctrights".
- * Fix a potential NULL deref in found by the IBM Checker.
- * Fix an uninitialized variable found by the IBM Checker.
- * Fix an unlikely memleak found by the IBM Checker.
- * Fix some missing error handlings.
- * Add workaround for domain joins using a netbios name which is different
- from the hostname.
-
-
-o Derrell Lipman <derrell.lipman at unwireduniverse.com>
- * BUG 5805: Don't close stdout when calling setup_logging multiple times.
-
-
-o Jim McDonough <jmcd at samba.org>
- * Fix the new vfs_smb_traffic_analyzer build for static links.
-
-
-o Tim Prouty <tim.prouty at isilon.com>
- * Fix several build warnings.
-
-
-o Andreas Schneider <mail at cynapses.org>
- * Delete the krb5 ccname variable from the PAM environment if set.
-
-
-o Andrew Tridgell <tridge at samba.org>
- * Fix segfault on startup with trusted domains.
- * Re-add "winbind:ignore domains" parameter.
-
-
-o Jelmer Vernooij <jelmer at samba.org>
- * Avoid freeing fsp twice when opening new_file fails (Debian #431696).
+ * Fix for CVE-2008-4314.
######################################################################
diff --git a/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml b/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml
deleted file mode 100644
index a12f44b..0000000
--- a/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?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_smb_traffic_analyzer.8">
-
-<refmeta>
- <refentrytitle>smb_traffic_analyzer</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_smb_traffic_analyzer</refname>
- <refpurpose>log Samba VFS read and write operations through a socket
- to a helper application</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
- <cmdsynopsis>
- <command>vfs objects = smb_traffic_analyzer</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>The <command>vfs_smb_traffic_analyzer</command> VFS module logs
- client write and read operations on a Samba server and sends this data
- over a socket to a helper program, which feeds a SQL database. More
- information on the helper programs can be obtained from the
- homepage of the project at:
- http://holger123.wordpress.com/smb-traffic-analyzer/
- </para>
- <para><command>vfs_smb_traffic_analyzer</command> currently is aware
- of the following VFS operations:</para>
-
- <simplelist>
- <member>write</member>
- <member>pwrite</member>
- <member>read</member>
- <member>pread</member>
- </simplelist>
-
- <para><command>vfs_smb_traffic_analyzer</command> sends the following data
- in a fixed format seperated by a comma through either an internet or a
- unix domain socket:</para>
- <programlisting>
- BYTES|USER|DOMAIN|READ/WRITE|SHARE|FILENAME|TIMESTAMP
- </programlisting>
-
- <para>Description of the records:
-
- <itemizedlist>
- <listitem><para><command>BYTES</command> - the length in bytes of the VFS operation</para></listitem>
- <listitem><para><command>USER</command> - the user who initiated the operation</para></listitem>
- <listitem><para><command>DOMAIN</command> - the domain of the user</para></listitem>
- <listitem><para><command>READ/WRITE</command> - either "W" for a write operation or "R" for read</para></listitem>
- <listitem><para><command>SHARE</command> - the name of the share on which the VFS operation occured</para></listitem>
- <listitem><para><command>FILENAME</command> - the name of the file that was used by the VFS operation</para></listitem>
- <listitem><para><command>TIMESTAMP</command> - a timestamp, formatted as "yyyy-mm-dd hh-mm-ss.ms" indicating when the VFS operation occured</para></listitem>
- </itemizedlist>
-
- </para>
-
- <para>This module is stackable.</para>
-
-</refsect1>
-
-
-<refsect1>
- <title>OPTIONS</title>
-
- <variablelist>
-
- <varlistentry>
- <term>smb_traffic_analyzer:mode = STRING</term>
- <listitem>
- <para>If STRING matches to "unix_domain_socket", the module will
- use a unix domain socket located at /var/tmp/stadsocket, if
- STRING contains an different string or is not defined, the module will
- use an internet domain socket for data transfer.</para>
-
- </listitem>
- </varlistentry>
-
-
- <varlistentry>
- <term>smb_traffic_analyzer:host = STRING</term>
- <listitem>
- <para>The module will send the data to the system named with
- the hostname STRING.</para>
-
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>smb_traffic_analyzer:port = STRING</term>
- <listitem>
- <para>The module will send the data using the TCP port given
- in STRING.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>smb_traffic_analyzer:anonymize_prefix = STRING</term>
- <listitem>
- <para>The module will replace the user names with a prefix
- given by STRING and a simple hash number.
- </para>
-
- </listitem>
- </varlistentry>
-
-
- </variablelist>
-</refsect1>
-
-<refsect1>
- <title>EXAMPLES</title>
-
- <para>The module running on share "example_share", using a unix domain socket</para>
- <programlisting>
- <smbconfsection name="[example_share]"/>
- <smbconfoption name="path">/data/example</smbconfoption>
- <smbconfoption name="vfs objects">smb_traffic_analyzer</smbconfoption>
- <smbconfoption name="smb_traffic_analyzer:mode">unix_domain_socket</smbconfoption>
- </programlisting>
-
- <para>The module running on share "example_share", using an internet socket,
- connecting to host "examplehost" on port 3491.</para>
- <programlisting>
- <smbconfsection name="[example_share]"/>
- <smbconfoption name="path">/data/example</smbconfoption>
- <smbconfoption name="vfs objects">smb_traffic_analyzer</smbconfoption>
- <smbconfoption name="smb_traffic_analyzer:host">examplehost</smbconfoption>
- <smbconfoption name="smb_traffic_analyzer:port">3491</smbconfoption>
- </programlisting>
-
- <para>The module running on share "example_share", using an internet socket,
- connecting to host "examplehost" on port 3491, anonymizing user names with
- the prefix "User".</para>
- <programlisting>
- <smbconfsection name="[example_share]"/>
- <smbconfoption name="path">/data/example</smbconfoption>
- <smbconfoption name="vfs objects">smb_traffic_analyzer</smbconfoption>
- <smbconfoption name="smb_traffic_analyzer:host">examplehost</smbconfoption>
- <smbconfoption name="smb_traffic_analyzer:port">3491</smbconfoption>
- <smbconfoption name="smb_traffic_analyzer:anonymize_prefix">User</smbconfoption>
- </programlisting>
-</refsect1>
-
-<refsect1>
- <title>VERSION</title>
- <para>This man page is correct for version 3.2.0 of the Samba suite.
- </para>
-</refsect1>
-
-<refsect1>
- <title>AUTHOR</title>
-
- <para>The original Samba software and related utilities
- were created by Andrew Tridgell. Samba is now developed
- by the Samba Team as an Open Source project similar
- to the way the Linux kernel is developed.</para>
-
- <para>The original version of the VFS module and the
- helper tools were created by Holger Hetterich.</para>
-</refsect1>
-
-</refentry>
diff --git a/release-scripts/build-docs b/release-scripts/build-docs
index 53500d7..fa38d8d 100755
--- a/release-scripts/build-docs
+++ b/release-scripts/build-docs
@@ -25,7 +25,4 @@ cd ../docs || exit 1
mv manpages-3 manpages
mv htmldocs/manpages-3 htmldocs/manpages
-cd $DOCSRCDIR || exit 1
-make clean
-
exit
diff --git a/source/Makefile.in b/source/Makefile.in
index 3573ead..12c62e1 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -175,7 +175,7 @@ PATH_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" \
# Note that all executable programs now provide for an optional executable suffix.
-SBIN_PROGS = bin/smbd at EXEEXT@ bin/nmbd at EXEEXT@ @SWAT_SBIN_TARGETS@ @EXTRA_SBIN_PROGS@
+SBIN_PROGS = bin/smbd at EXEEXT@ bin/nmbd at EXEEXT@ @SWAT_SBIN_TARGETS@ @EXTRA_SBIN_PROGS@ @CIFSUPCALL_PROGS@
ROOT_SBIN_PROGS = @CIFSMOUNT_PROGS@
@@ -601,7 +601,6 @@ VFS_TSMSM_OBJ = modules/vfs_tsmsm.o
VFS_FILEID_OBJ = modules/vfs_fileid.o
VFS_AIO_FORK_OBJ = modules/vfs_aio_fork.o
VFS_SYNCOPS_OBJ = modules/vfs_syncops.o
-VFS_SMB_TRAFFIC_ANALYZER_OBJ = modules/vfs_smb_traffic_analyzer.o
PLAINTEXT_AUTH_OBJ = auth/pampass.o auth/pass_check.o
@@ -2346,9 +2345,6 @@ bin/aio_fork. at SHLIBEXT@: $(BINARY_PREREQS) $(VFS_AIO_FORK_OBJ)
@echo "Building plugin $@"
@$(SHLD_MODULE) $(VFS_AIO_FORK_OBJ)
-bin/smb_traffic_analyzer. at SHLIBEXT@: $(BINARY_PREREQS) $(VFS_SMB_TRAFFIC_ANALYZER_OBJ)
- @echo "Building plugin $@"
- @$(SHLD_MODULE) $(VFS_SMB_TRAFFIC_ANALYZER_OBJ)
#########################################################
## IdMap NSS plugins
diff --git a/source/client/client.c b/source/client/client.c
index dc5e0f5..d794f8f 100644
--- a/source/client/client.c
+++ b/source/client/client.c
@@ -4342,8 +4342,6 @@ cleanup:
}
}
-static bool finished;
-
/****************************************************************************
Make sure we swallow keepalives during idle time.
****************************************************************************/
@@ -4390,8 +4388,6 @@ static void readline_callback(void)
DEBUG(0, ("Read from server failed, maybe it closed "
"the connection\n"));
- finished = true;
- smb_readline_done();
if (NT_STATUS_EQUAL(status, NT_STATUS_END_OF_FILE)) {
set_smb_read_error(&cli->smb_rw_error,
SMB_READ_EOF);
@@ -4420,12 +4416,7 @@ static void readline_callback(void)
{
unsigned char garbage[16];
memset(garbage, 0xf0, sizeof(garbage));
- if (!cli_echo(cli, 1, garbage, sizeof(garbage))) {
- DEBUG(0, ("SMBecho failed. Maybe server has closed "
- "the connection\n"));
- smb_readline_done();
- finished = true;
- }
+ cli_echo(cli, 1, garbage, sizeof(garbage));
}
}
@@ -4437,7 +4428,7 @@ static int process_stdin(void)
{
int rc = 0;
- while (!finished) {
+ while (1) {
TALLOC_CTX *frame = talloc_stackframe();
char *tok = NULL;
char *the_prompt = NULL;
diff --git a/source/client/mount.cifs.c b/source/client/mount.cifs.c
index 9278295..8fb652b 100644
--- a/source/client/mount.cifs.c
+++ b/source/client/mount.cifs.c
@@ -56,10 +56,6 @@
#endif /* _SAMBA_BUILD_ */
#endif /* MOUNT_CIFS_VENDOR_SUFFIX */
-#ifdef _SAMBA_BUILD_
-#include "include/config.h"
-#endif
-
#ifndef MS_MOVE
#define MS_MOVE 8192
#endif
@@ -79,15 +75,6 @@
#define MOUNT_PASSWD_SIZE 64
#define DOMAIN_SIZE 64
-/* exit status - bits below are ORed */
-#define EX_USAGE 1 /* incorrect invocation or permission */
-#define EX_SYSERR 2 /* out of memory, cannot fork, ... */
-#define EX_SOFTWARE 4 /* internal mount bug or wrong version */
-#define EX_USER 8 /* user interrupt */
-#define EX_FILEIO 16 /* problems writing, locking, ... mtab/fstab */
-#define EX_FAIL 32 /* mount failure */
-#define EX_SOMEOK 64 /* some mount succeeded */
-
const char *thisprogram;
int verboseflag = 0;
static int got_password = 0;
@@ -107,8 +94,6 @@ char * prefixpath = NULL;
/* like strncpy but does not 0 fill the buffer and always null
* terminates. bufsize is the size of the destination buffer */
-
-#ifndef HAVE_STRLCPY
static size_t strlcpy(char *d, const char *s, size_t bufsize)
{
size_t len = strlen(s);
@@ -119,13 +104,10 @@ static size_t strlcpy(char *d, const char *s, size_t bufsize)
d[len] = 0;
return ret;
}
-#endif
/* like strncat but does not 0 fill the buffer and always null
* terminates. bufsize is the length of the buffer, which should
* be one more than the maximum resulting string length */
-
-#ifndef HAVE_STRLCAT
static size_t strlcat(char *d, const char *s, size_t bufsize)
{
size_t len1 = strlen(d);
@@ -144,7 +126,6 @@ static size_t strlcat(char *d, const char *s, size_t bufsize)
}
return ret;
}
-#endif
/* BB finish BB
@@ -183,7 +164,7 @@ static void mount_cifs_usage(void)
printf("\n\t%s -V\n",thisprogram);
SAFE_FREE(mountpassword);
- exit(EX_USAGE);
+ exit(1);
}
/* caller frees username if necessary */
@@ -242,7 +223,7 @@ static int open_cred_file(char * file_name)
if(length > 4086) {
printf("mount.cifs failed due to malformed username in credentials file");
memset(line_buf,0,4096);
- exit(EX_USAGE);
+ exit(1);
} else {
got_user = 1;
user_name = (char *)calloc(1 + length,1);
@@ -266,7 +247,7 @@ static int open_cred_file(char * file_name)
if(length > MOUNT_PASSWD_SIZE) {
printf("mount.cifs failed: password in credentials file too long\n");
memset(line_buf,0, 4096);
- exit(EX_USAGE);
+ exit(1);
} else {
if(mountpassword == NULL) {
mountpassword = (char *)calloc(MOUNT_PASSWD_SIZE+1,1);
@@ -294,7 +275,7 @@ static int open_cred_file(char * file_name)
}
if(length > DOMAIN_SIZE) {
printf("mount.cifs failed: domain in credentials file too long\n");
- exit(EX_USAGE);
+ exit(1);
} else {
if(domain_name == NULL) {
domain_name = (char *)calloc(DOMAIN_SIZE+1,1);
@@ -327,7 +308,7 @@ static int get_password_from_file(int file_descript, char * filename)
if (mountpassword == NULL) {
printf("malloc failed\n");
- exit(EX_SYSERR);
+ exit(1);
}
if(filename != NULL) {
@@ -335,7 +316,7 @@ static int get_password_from_file(int file_descript, char * filename)
if(file_descript < 0) {
printf("mount.cifs failed. %s attempting to open password file %s\n",
strerror(errno),filename);
--
Samba Shared Repository
More information about the samba-cvs
mailing list