[SCM] Samba Shared Repository - branch v3-4-stable updated
Karolin Seeger
kseeger at samba.org
Wed Dec 30 02:24:11 MST 2009
The branch, v3-4-stable has been updated
via ce98fae... WHATSNEW: Update changes.
via f6919f6... Fix bug 6837 - "Too many open files" when trying to access large number of files
via 29c0dfa... WHATSNEW: Update changes.
via 8a15ef0... Fix bug 7005 - mangle method = hash truncates files with dot '.' character
via 3e2f6c1... WHATSNEW: Start release notes for Samba 3.4.4.
via 7fe8f2b... Fix bug #6939 - mangling method = hash breaks long filenames.
via dad3c6d... s3: Fix _samr_GetAliasMembership for results with 0 rids (cherry picked from commit 20bcdf85f16216c45ded886217fedc4516cc591c)
via 5f1d7a4... s3:posix_acls: Fix bug 6841 - "map acl inherit = yes" not working.
via 3fadf40... Second part of fix for 6875 - trans2 FIND_FIRST2 response --> FIND_FIRST2 Data -> Fille Attributes are returned as 0x220 for LANMAN2.1 dialect
via 9774732... spoolss: remove unused spoolss_StringArray2.
via 4e0a1a5... s4-smbtorture: fix and extend enum printerkey test.
via 1edc7e3... s4-smbtorture: enhance spoolss_EnumPrinterKey torture test.
via e9d5a70... s3-spoolss: fix enumprinter key client and server.
via 000b9bd... s3: re-run make samba3-idl.
via e7c439d... spoolss: use spoolss_KeyNames in spoolss_EnumPrinterKey.
via 7ce57cd... spoolss: add spoolss_KeyNames union.
via a138f5f... spoolss: hand-marshall the spoolss_StringArray2 struct for spoolss_EnumPrinterKey.
via 2d81158... s3-spoolss: handle SEC_FLAG_MAXIMUM_ALLOWED in spoolss_OpenPrinterEx.
via c474dca... samba-spoolss: use spoolss_StringArray2 in spoolss_EnumPrinterKey.
via 12b3eb0... spoolss: add spoolss_StringArray2.
via 2c94b13... s4-smbtorture: add tests for spoolss_EnumPrinterKey to RPC-SPOOLSS-PRINTER.
via 4876d21... s4-smbtorture: fix spoolss_EnumPrinterKey client in RPC-SPOOLSS-WIN.
via 6fe159b... s3:packaging: Fix version detection.
via 54d5350... s3:packaging: Fix source dir.
via dd39599... s3:packaging: Fix typo in comment.
via 4960fbd... s3:pdb_ldap: Fix large paged search.
via bd1ef17... fix bogus "out of memory" winbind msg
via ab9b30e... s3 aclocal.m4: Fix iconv checks, clean up m4 code
via abd4607... s3:docs: Document "directory name cache size".
via fff757d... create-tarball: Readd RFCs (fixes the merged build).
via c6d092c... s3: Prevent glibc errors: talloc()ed memory should not be SAFE_FREE()ed.
via 9a66230... s3:build: remove redundant qnx block size definition (cherry picked from commit a2929a638fa6824e38beec7eaa78ac108c522f50)
via d69a1a6... s3:build: fix shared library build on QNX
via 879b7d7... s3:auth: Fix typo in debug message.
via 63163e0... s3-kerberos: do not include authdata headers before including krb5 headers.
via a26fee5... Fix bug #6898 - Samba duplicates file content on appending. Move posix case semantics out from under the VFS. Jeremy. (cherry picked from commit 24282f2a282ba4ef78108d983d1ef4a6ad4cbf89)
via 185adab... s3: Fix shadow copy display on Windows 7
via f7e4670... s3-spoolss: simplify _spoolss_EnumPrinterKey a little more.
via 73ea8ab... s3-spoolss: fixes for _spoolss_EnumPrinterKey client and server.
via 9aa738c... s3-spoolss: fix spoolss_EnumPrinterKey client and server code.
via 7f5be2e... spoolss: fix spoolss_EnumPrinterKey IDL.
via 6cd57e1... s3-util: add pull_reg_sz() and pull_reg_multi_sz() convenience functions.
via 2e2a338... s3-util: add push_reg_sz() and push_reg_multi_sz() convenience functions.
via 0be27d4... misc: mark winreg_Data little-endian except for a REG_DWORD_BIG_ENDIAN.
via d24ab54... winreg: add winreg_Data union to IDL.
via 8b6e02f... s3-kerberos: fix the build on Mac OS X 10.6.2.
via 9e46443... s3-kerberos: add a missing reference to authdata headers.
via 7c66dae... s3-kerberos: only use krb5 headers where required.
via fdbd01f... s3-kerberos: Fix Bug #6929: build with recent heimdal.
via a141aaa... s3-kerberos: next step to resolve Bug #6929: build with recent heimdal.
via 6493082... s3-kerberos: add check for prerequisite krb5/krb5.h header while checking for krb5/locate_plugin.h.
via a32237b... nsswitch: fix compile of winbind_krb5_locator with recent Heimdal versions.
via c358975... cifs.upcall: 2nd part of fix for Bug #6868: support building with Heimdal we well as with MIT.
via 57b2d5a... s3-build: really fix build of winbind_krb5_locator.
via 723a545... nsswitch: fix the build of the winbind krb5 locator plugin.
via b4ec856... s3:docs: Fix typo in man mount.cifs.
via 710831b... s3: re-run make samba3-idl.
via e437f46... pidl: fix handling of output arguments in s3 client stubs.
via ee9ddad... pidl:Samba3/ClientNDR: $size can be 'foo / 2' so we need to add '(' and ')'
via 519b4a2... pidl:NDR/Parser: $size can be 'foo / 2' so we need to add '(' and ')'
via 8b63a9f... s3:docs: Document "aio write behind".
via e6dc58d... s3:docs: Document "ldap page size".
via ec51baa... s3:docs: Document "enable core files".
via 8b3ec36... s3:docs: Document "cache directory" and "state directory".
via 42d3641... create-tarball: Make it more comfortable to use the --copy-docs option.
via 8d4dee1... s3: Fix bug 6338 -- net rpc trustdom list always display "none" (cherry picked from commit e3dc0f527700a8be5e239dacedb880ca88c47312)
via 1a82cbf... docs: Fix Bug 6922: Add Registry patchfile for Win7 domain join.
via e6bcdbe... clikrb5: Prefer krb5_free_keytab_entry_contents to krb5_kt_free_entry.
via 03f1e1c... cifs.upcall: Fix Bug #6868: support building with Heimdal we well as with MIT.
via 820c552... s3-kerberos: add smb_krb5_principal_get_realm().
via c9e76cd... s3: fixed krb5 build problem on ubuntu karmic
via 50524e3... s3:idmap_ldap: trim the " chars from the location string in idmap_ldap_db_init
via a51a0fb... s3:idmap_ldap: trim the " chars from the location string in idmap_ldap_alloc_init
via 298e53e... s3:fix endianness bug in dbwrap_change_int32_atomic() (bug #6901)
via c1a52ee... s3:fix endianness bug in dbwrap_change_uint32_atomic() (bug #6901)
via 1566cf8... s3/docs: Document "enable spoolss".
via 108e983... s3-rpc_client: make sure cli_rpc_pipe_open_schannel() does not always return NT_STATUS_OK.
via fc1b929... Second part of the fix for bug 6828 - infinite timeout occurs when byte lock held outside of samba. Fixes case where a connection with a pending lock can me marked "idle", and ensures that the lock queue timeout is always recalculated. Jeremy. (cherry picked from commit aecf2dba0b2bfd65a307d9edae1792b3896fc73f)
via 14457e9... Fix bug 6861 - rfc1738_unescape converts '+' characters to spaces. Stop rfc1738_unescape() from mangling '+' characters to spaces. Noticed by Andrew Bartlett. Jeremy. (cherry picked from commit 66e356a4864373d63eee3dda00c826eaf69c7a82)
via 91d3742... Fix bug 6875 - trans2 FIND_FIRST2 response --> FIND_FIRST2 Data -> Fille Attributes are returned as 0x220 for LANMAN2.1 dialect Jeremy. (cherry picked from commit dc9b226d8ced06b8b24eb38b411eac11eace41be)
via e56c114... s3: Do not redefine strupr.
via 7639a33... Fix bug 6880 - cannot list workgroup servers reported by Alban Browaeys <prahal at yahoo.com> with fix. Revert 2e989bab0764c298a2530a2d4c8690258eba210c with extra comments - this broke workgroup enumeration. Jeremy. (cherry picked from commit 6be57c378c0dbc4c4ab732fffee0d6a74011fd14)
via 678de88... s3: Fix Bug #6869: Various annoying build warnings.
via 6f04c30... Fix bug 6867 - trans2findnext returns reply_nterror(req, ntstatus) In a directory with a lot of files. Jeremy. (cherry picked from commit a6e7be60322b981f9eb81f2b686d28223bd735bc)
via 6f7cbab... s3:configure: Fix typo in libtalloc check.
via 835128d... s3/docs: Fix typo.
via 7bbe6fe... s3/docs: Remove reference to nonexistent file.
via 008d748... s3:configure: only check for gpfs_gpl.h
via ebfe8c6... s3/docs: Document new pdbedit -K option.
via 2a7a5f9... s3: pdbedit: add option --kickoff-time/-K to set the user's kickoff time
via f0f0b6d... WHATSNEW: Start 3.4.4 release notes.
via afc3c26... VERSION: Raise version number up to 3.4.4.
from 8cd146c... WHATSNEW: Complete release notes.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-stable
- Log -----------------------------------------------------------------
commit ce98fae90b529eb7099aa18bb664da6573052d04
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed Dec 30 10:01:29 2009 +0100
WHATSNEW: Update changes.
Karolin
(cherry picked from commit 958367d09384731ad3330e396869b12770b11231)
commit f6919f62082e7bd44c27c0e93e10e8b79345d50e
Author: Jeremy Allison <jra at samba.org>
Date: Thu Dec 17 16:59:56 2009 -0800
Fix bug 6837 - "Too many open files" when trying to access large number of files
Win7 needs the Windows server open file handle number of 16384 handles.
Jeremy.
(cherry picked from commit bbdc2c017ca5abb35897ab61717b806133e0af0b)
commit 29c0dfa59510cc28e66a08c237e3302d6b2b1e8f
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue Dec 29 11:53:15 2009 +0100
WHATSNEW: Update changes.
Karolin
(cherry picked from commit 29b923666294cb615059a20ec761ae309238e789)
commit 8a15ef0dc0b3470785bf4916955b3b4fb1463857
Author: Jeremy Allison <jra at samba.org>
Date: Mon Dec 21 21:12:33 2009 -0800
Fix bug 7005 - mangle method = hash truncates files with dot '.' character
Don't change the contents of a const string via a pointer
alias (or if you do, change it back.....).
Jeremy.
(cherry picked from commit a5bfbad790870ff66d4b09f99f0835ccb61c10ed)
commit 3e2f6c1ad49b036ae1673930cba5d368b2b71e16
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed Dec 23 12:02:45 2009 +0100
WHATSNEW: Start release notes for Samba 3.4.4.
Karolin
(cherry picked from commit 3439ae9005ee3c6be05f0d173d26d3f11a427b06)
commit 7fe8f2b3ac4eccad003ec44ccd9c4c5736e537ec
Author: Jeremy Allison <jra at samba.org>
Date: Thu Dec 17 16:21:46 2009 -0800
Fix bug #6939 - mangling method = hash breaks long filenames.
We were returning the wrong sense of the bool. must_mangle()
has to return !NT_STATUS_IS_OK, not NT_STATUS_IS_OK.
Jeremy.
(cherry picked from commit 2f1a66a72a6bd9f3e160b01982171dd66835990e)
commit dad3c6d1fe05e41beab276633467e897c6cc196a
Author: Volker Lendecke <vl at samba.org>
Date: Tue Dec 15 14:01:43 2009 +0100
s3: Fix _samr_GetAliasMembership for results with 0 rids
(cherry picked from commit 20bcdf85f16216c45ded886217fedc4516cc591c)
Fix bug #6997 (Fix _samr_GetAliasMembership for results with 0 rids).
(cherry picked from commit e4e143e8fccc09b6543c4f765d0824f0472f95e9)
commit 5f1d7a445131bf7a8d5876fc2affce88246b1b5c
Author: Jeremy Allison <jra at samba.org>
Date: Fri Dec 18 13:46:13 2009 +0100
s3:posix_acls: Fix bug 6841 - "map acl inherit = yes" not working.
The code to read the new V2 SAMBA_PAI entries had
two errors.
Jeremy.
(cherry picked from commit ce060ae48d71e8988282b16f8348ca0b0434cfde)
commit 3fadf408b1ccab4f638d396e11d99fbe356c18ca
Author: Jeremy Allison <jra at samba.org>
Date: Tue Dec 15 18:36:36 2009 -0800
Second part of fix for 6875 - trans2 FIND_FIRST2 response --> FIND_FIRST2 Data -> Fille Attributes are returned as 0x220 for LANMAN2.1 dialect
Ensure dos_mode can return FILE_ATTRIBUTE_NORMAL, then filter the returned attributes by protocol level.
This makes us consistant in returning DOS attrs across all replies. Tested on OS/2 by Günter Kukkukk.
Jeremy.
(cherry picked from commit 22332e08ab5b406ca603576b29fcaf0c1f786708)
commit 977473289aa1238e500c9584f62ac1eb9728ac73
Author: Günther Deschner <gd at samba.org>
Date: Thu Dec 10 14:23:49 2009 +0100
spoolss: remove unused spoolss_StringArray2.
Guenther
The last 13 commits address bug #6883 (Add Printer fails with 0x000006f7 on
Windows 7).
(cherry picked from commit 874a4e34ff6222a4d387815f3ec896a24822f94e)
commit 4e0a1a53c3c951dbe607035cb0ed5e48c301894a
Author: Günther Deschner <gd at samba.org>
Date: Thu Dec 10 14:21:12 2009 +0100
s4-smbtorture: fix and extend enum printerkey test.
Guenther
(cherry picked from commit b1097e33ba4828d1dd7bf7409aa3880e6359c96e)
commit 1edc7e36c98a7ef896d7a9095282e41a63ab5c7b
Author: Günther Deschner <gd at samba.org>
Date: Wed Dec 9 15:31:51 2009 +0100
s4-smbtorture: enhance spoolss_EnumPrinterKey torture test.
This demonstrates that s3 still does not have that call implemented correctly.
Guenther
(cherry picked from commit 532376914d0852ab599a6275910ab315935f37d0)
commit e9d5a70d67f4fcaccbe991af35d12d954d86cae4
Author: Günther Deschner <gd at samba.org>
Date: Thu Dec 10 14:20:22 2009 +0100
s3-spoolss: fix enumprinter key client and server.
Guenther
(cherry picked from commit f20effc437970d826c5bd4f047ff47e23e7a1a73)
(cherry picked from commit ef1c97b8c252feabd02f68493f1d83cab9a852d0)
commit 000b9bd58378626eb45bdee287a00b7148afe7f9
Author: Günther Deschner <gd at samba.org>
Date: Fri Dec 11 11:02:55 2009 +0100
s3: re-run make samba3-idl.
Guenther
(cherry picked from commit c5e9df56b3b588f2c7f6f0876204aaf9b9289ee4)
commit e7c439d656bfca4f48b198b67c873b1809575257
Author: Günther Deschner <gd at samba.org>
Date: Thu Dec 10 14:19:28 2009 +0100
spoolss: use spoolss_KeyNames in spoolss_EnumPrinterKey.
Guenther
(cherry picked from commit 0ecb7f6ab28d7b7c1844554289f5ae8e876b1dcf)
(cherry picked from commit ab71e84ab446eb074a56f7d5d8e7ad69f02ed504)
commit 7ce57cd43d65ce08db2e49efe4e41db803ced543
Author: Günther Deschner <gd at samba.org>
Date: Thu Dec 10 14:18:46 2009 +0100
spoolss: add spoolss_KeyNames union.
Guenther
(cherry picked from commit cf2561473f7bd0bcef5c562c1e901d4ad17e6ee3)
(cherry picked from commit 969623c7963219ae3db3058349c257e00adc237b)
commit a138f5fe791fab381a58f1a08a6f624499bea960
Author: Günther Deschner <gd at samba.org>
Date: Wed Dec 2 21:26:10 2009 +0100
spoolss: hand-marshall the spoolss_StringArray2 struct for spoolss_EnumPrinterKey.
This call is just driving me nuts :-)
Guenther
(cherry picked from commit fc4b43089e08578f99b99de8eff1eecebaa4ae01)
commit 2d8115851b2102ef047b01b878692d139144bb77
Author: Günther Deschner <gd at samba.org>
Date: Thu Dec 3 23:23:36 2009 +0100
s3-spoolss: handle SEC_FLAG_MAXIMUM_ALLOWED in spoolss_OpenPrinterEx.
In case someone (smbtorture4) requests SEC_FLAG_MAXIMUM_ALLOWED, translate it
to a request of PRINTER_ACCESS_ADMINISTER.
Guenther
(cherry picked from commit 459a968fb4d6f96ea7f310f331d3547e2e466d6a)
(cherry picked from commit 7974ab9337c7de209f1cdafbd09fd2b71ef45f19)
commit c474dca73944c47bf776f20fb217c47d3040622c
Author: Günther Deschner <gd at samba.org>
Date: Wed Dec 2 14:53:39 2009 +0100
samba-spoolss: use spoolss_StringArray2 in spoolss_EnumPrinterKey.
This should finally resolve the endian issues we were seeing on sparc and is
much cleaner for spoolss clients and servers.
Guenther
(cherry picked from commit 191167fce3cb07e286c3b1cedf4fb70126e6daf7)
commit 12b3eb03e0f6c1d5cbce23a784a8ea4816228f53
Author: Günther Deschner <gd at samba.org>
Date: Wed Dec 2 14:22:52 2009 +0100
spoolss: add spoolss_StringArray2.
The difference to spoolss_StringArray is that in spoolss_StringArray2 the string
array is put into a subcontext of _ndr_size.
Guenther
(cherry picked from commit a6bd5d61685f5582a72d24ac72c6e3753f232f90)
commit 2c94b13cd27f928144081e0ad86f4db88e732805
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 20 16:33:29 2009 +0100
s4-smbtorture: add tests for spoolss_EnumPrinterKey to RPC-SPOOLSS-PRINTER.
Guenther
(cherry picked from commit f190de033b9b13b5ffaaf98e86a336bc48ce84e4)
commit 4876d2126937247cf87a33b00c06a88217cca53b
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 23 13:35:32 2009 +0100
s4-smbtorture: fix spoolss_EnumPrinterKey client in RPC-SPOOLSS-WIN.
Guenther
(cherry picked from commit a990887d02de6c92f7d97631bd3f04c49007df2e)
commit 6fe159bbca71ca8c7c07eac8ff21c645d7425af7
Author: Karolin Seeger <kseeger at samba.org>
Date: Thu Dec 10 14:57:08 2009 +0100
s3:packaging: Fix version detection.
Adapted from 728b01fc03.
Thanks god I was not root! It would have delted /*!
Karolin
(cherry picked from commit 0604c696a05773a439538d88f1b45aa6637766a7)
(cherry picked from commit fd30552aab88572b2d5944b9b87ee8ca76d29b35)
(cherry picked from commit 24f3fb1395673883e4435ffbf999b2f309c35306)
commit 54d53509d026a37e0bde55436d5a7bcea17e6364
Author: Karolin Seeger <kseeger at samba.org>
Date: Thu Dec 10 14:26:58 2009 +0100
s3:packaging: Fix source dir.
Karolin
(cherry picked from commit 85e79a2a03e8c1c6275363c39b0fa71283214562)
(cherry picked from commit 1ed3172d10ca96816ec548996953579ec55da660)
(cherry picked from commit f39cde691c0f19d8851b056d5f625967155d35cf)
commit dd39599f4756e25c3b591ccac626ce1fd0a9c611
Author: Karolin Seeger <kseeger at samba.org>
Date: Thu Dec 10 14:08:43 2009 +0100
s3:packaging: Fix typo in comment.
Karolin
(cherry picked from commit b5011ba2c897fa177f1e22dde075055b9ffd271d)
(cherry picked from commit 3b812b134d819097df51bb20bdb4fd856f4ad00d)
(cherry picked from commit c504e7f0d464944836d04db3f288ee786431b553)
commit 4960fbdc7c1038421bd83f393afc2aebf89b2511
Author: Volker Lendecke <vl at samba.org>
Date: Mon May 18 16:04:04 2009 +0200
s3:pdb_ldap: Fix large paged search.
Fix bug #6981 (Paged Search with DirX LDAP server broken).
(cherry picked from commit 0a3b576c0a4298cbe600ad8943e401e3a0639359)
commit bd1ef171fdb6b1bab5317cd9aeb956fdcd29fc18
Author: Volker Lendecke <vl at samba.org>
Date: Wed May 13 10:12:26 2009 +0200
fix bogus "out of memory" winbind msg
Fix bug #6982 (Erroneous out of memory error path in lookup_sid).
(cherry picked from commit a6d9c2161859fff61bdd0539d9428615da3da655)
commit ab9b30e5757a6124a145431f34e7c64a98824b2c
Author: Kai Blin <kai at samba.org>
Date: Fri Dec 4 09:47:25 2009 +0100
s3 aclocal.m4: Fix iconv checks, clean up m4 code
The check for iconv requiring giconv.h and libgiconv as well as
the check for iconv requiring biconv.h and libbiconv were using the wrong
variable to check for previous successful test results. This caused the checks
to always fall back to libbiconv on systems where that library was available.
In the course of fixing this, I had to clean up the indentation in that piece of
code, and I also rewrote/added some comments.
Many thanks to Tsurutani Naoki <turutani at scphys.kyoto-u.ac.jp> for the initial
patch and diagnosis.
(cherry picked from commit f5aff324cb9d965bbc75634596c3c40ffc588183)
Fix bug #4832 (iconv library is not used).
(cherry picked from commit 886a90cccbc5cf757c1037ee167282315055c358)
commit abd4607ac691d656fe2693dfbc938998153eb7f2
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Dec 7 16:28:30 2009 +0100
s3:docs: Document "directory name cache size".
Karolin
(cherry picked from commit 5055ba140d03189a3c8181d57ad920e68c6e387c)
(cherry picked from commit a9077c77b7119fb15cbc74d9b160a363932b0bde)
(cherry picked from commit 95d8039cb064d23a9f1f28484b08e00b93c152e2)
commit fff757d57ea3cf3cee537a48e2f8b67b95bafe39
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Dec 7 16:06:29 2009 +0100
create-tarball: Readd RFCs (fixes the merged build).
See http://lists.samba.org/archive/samba-technical/2009-December/068235.html
for more information.
Karolin
(cherry picked from commit 08b692828ed6a9929dc6098fabc8aa47a0e32f93)
(cherry picked from commit 7470559ce27af469cd57af0fd41b30aaee9a585a)
commit c6d092c6638a1ca48e9b92b7017c0c3c08f85f77
Author: Jim McDonough <jmcd at samba.org>
Date: Fri Dec 4 12:31:53 2009 -0500
s3: Prevent glibc errors: talloc()ed memory should not be SAFE_FREE()ed.
Fix bug #6967 (net ads join with OU fails with glibc error on free()).
(cherry picked from commit 779ebd6a6800ceb0d192232b2ec9687115115c73)
commit 9a66230da447d68597780a3f1c4cbe638e0ef576
Author: Björn Jacke <bj at sernet.de>
Date: Thu Dec 3 00:12:53 2009 +0100
s3:build: remove redundant qnx block size definition
(cherry picked from commit a2929a638fa6824e38beec7eaa78ac108c522f50)
Part of a fix for bug #6860.
(cherry picked from commit 6b430b4fd88eb033098366f9a6b204c55ca7f79e)
commit d69a1a66faac26c406288196e0320ed8fe71cca2
Author: Björn Jacke <bj at sernet.de>
Date: Thu Dec 3 00:02:44 2009 +0100
s3:build: fix shared library build on QNX
Fixes #6860. Thanks to Matt Kraai!
(cherry picked from commit 1d013fd03295433698f2b301dbf8324a3db528eb)
(cherry picked from commit 6ba6370c9f8d76a59b6a59f6e083c109eb5fba53)
commit 879b7d7fd3ef74173134ef7640e135ccdda1f8cc
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Dec 7 14:38:18 2009 +0100
s3:auth: Fix typo in debug message.
Karolin
(cherry picked from commit 71018ebe5303ca6e0f3e3e4b96ae45fb32d3e195)
(cherry picked from commit 626ae39f3952087e05cbcd42a049119860072bc8)
(cherry picked from commit e7e66fd949d970b03bce0812c6b934193ac9ff1c)
commit 63163e0a812b0d304484975cf32393626676ab97
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 27 18:30:18 2009 +0100
s3-kerberos: do not include authdata headers before including krb5 headers.
Guenther
Part of a fix for bug #6929.
(cherry picked from commit 579ac85a8e8f640790878cef5a35debec999dd0e)
commit a26fee51b87c954fa6fac8a27a04e75c2377ac34
Author: Jeremy Allison <jra at samba.org>
Date: Mon Nov 23 19:19:07 2009 -0800
Fix bug #6898 - Samba duplicates file content on appending. Move posix case semantics out from under the VFS. Jeremy.
(cherry picked from commit 24282f2a282ba4ef78108d983d1ef4a6ad4cbf89)
commit 185adabf0173bc808c35543ed703f2f107aecafc
Author: Volker Lendecke <vl at samba.org>
Date: Thu Oct 8 14:02:39 2009 +0200
s3: Fix shadow copy display on Windows 7
Windows 7 is a bit more picky on our NT_STATUS_BUFFER_TOO_SMALL. Announce the
right buffer size, the same amount we later check for.
Fix bug #6850 (Shadow Copy Support for VISTA / Windows 7).
(cherry picked from commit b1243ff12d4f4b948dc7bbd85795f8ee8f7621d9)
commit f7e4670c72b8d54252b61ae564362afa28673483
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 26 19:01:54 2009 +0100
s3-spoolss: simplify _spoolss_EnumPrinterKey a little more.
Guenther
(cherry picked from commit e512ccb5b677fa7f285829ec645fc067837c0e11)
Part of a fix for bug #6883 (Add Printer fails with 0x000006f7 on Windows 7).
(cherry picked from commit ab9e7e9ac813f4bbadf1ebf86dfaac2f47e75de2)
commit 73ea8ab474a06703a92f0295b687002b1bcbb333
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 24 15:22:04 2009 +0100
s3-spoolss: fixes for _spoolss_EnumPrinterKey client and server.
Thanks Metze for review!
Guenther
(cherry picked from commit 846aa18648f3b34ab5cbc4dc4ba334bbedeab2f4)
(cherry picked from commit 29c22e159352bcb334dfb7c5846e865967d77cb0)
commit 9aa738c8ec6cc8cd37bed892f3dc0298596484eb
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 20 16:34:00 2009 +0100
s3-spoolss: fix spoolss_EnumPrinterKey client and server code.
Guenther
(cherry picked from commit d464151f3b47c675664f464b1645ca85de663655)
(cherry picked from commit 5b86641b5003379208d8d55f2d6eac6aac6e1488)
commit 7f5be2ef31368a1a370d0e029665b93434f56d49
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 20 12:57:13 2009 +0100
spoolss: fix spoolss_EnumPrinterKey IDL.
Guenther
(cherry picked from commit 167a9ea770a38ffbe121da522bfdab79aa60413d)
commit 6cd57e11239c0bc9e9603af3f7df4a3effb76cb3
Author: Günther Deschner <gd at samba.org>
Date: Fri Sep 25 00:56:17 2009 +0200
s3-util: add pull_reg_sz() and pull_reg_multi_sz() convenience functions.
Guenther
(cherry picked from commit f8016cfee922cba97b70f56c752827e4584da6c6)
(cherry picked from commit 560b7a45ff8257b7d9994199218edfa3ea4e8dae)
commit 2e2a33853bd191fc6624806a3b28faae828028c8
Author: Günther Deschner <gd at samba.org>
Date: Wed Sep 23 20:42:20 2009 +0200
s3-util: add push_reg_sz() and push_reg_multi_sz() convenience functions.
Guenther
(cherry picked from commit fcee9d2c97a673347baf58f749f35785a896e468)
(cherry picked from commit 20b43200885d7e4cef5e26ad249c9a4c6529dca5)
commit 0be27d4f5ab7e69e3704b94d49f0d7fc45c2fab7
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 27 11:18:30 2009 +0100
misc: mark winreg_Data little-endian except for a REG_DWORD_BIG_ENDIAN.
Guenther
(cherry picked from commit 09d1d639da808b94c25749423675925fbe3b3660)
commit d24ab546594504c115244ab50d834e1a9c734aec
Author: Günther Deschner <gd at samba.org>
Date: Wed Sep 23 20:41:44 2009 +0200
winreg: add winreg_Data union to IDL.
Guenther
(cherry picked from commit a15f3cb7c72eebecce48db83e045739f771ab4d7)
commit 8b6e02fd30da0d33fd0ad6a33f4c54f1bccef574
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 27 20:08:44 2009 +0100
s3-kerberos: fix the build on Mac OS X 10.6.2.
Guenther
(cherry picked from commit 51328a7056918bc75a7c1c442f47cf0271075542)
(cherry picked from commit 200462730f39d7eaee3917801046b120bc807c3f)
commit 9e46443b373dcb9aeef633acba1e22d57a1c33fd
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 27 18:51:56 2009 +0100
s3-kerberos: add a missing reference to authdata headers.
Guenther
(cherry picked from commit da79cbb0800dd647be864e8bbb5fe1132708174b)
(cherry picked from commit a9a3504ede1306ceb86d99bceb5e8bf4d48f40c2)
commit 7c66dae8a206a0dcc378c4d7699e8200c422b429
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 27 15:52:57 2009 +0100
s3-kerberos: only use krb5 headers where required.
This seems to be the only way to deal with mixed heimdal/MIT setups during
merged build.
Guenther
(cherry picked from commit 41fb263aacc5dce50d3554598d08cb497ffd929f)
commit fdbd01ff4c2a8bfa8309816589cb61e5740174a6
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 27 01:06:36 2009 +0100
s3-kerberos: Fix Bug #6929: build with recent heimdal.
Heimdal changed the KRB5_DEPRECATED define (which now may not take an identifier
for activation) in new releases (like 1.3.1).
Guenther
(cherry picked from commit 1a8f8382740e352a83133b8c49aaedd4716210cd)
(cherry picked from commit 83ee139ddde91bffc7b5921eb5e6a4364a408d38)
commit a141aaa473d005ef13ff6cd24d82533308c751cf
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 26 10:15:45 2009 +0100
s3-kerberos: next step to resolve Bug #6929: build with recent heimdal.
Based on patch from Allan <allan at archlinux.org>.
Also should fix the FreeBSD build on the buildfarm.
Guenther
(cherry picked from commit 5b3a32be97a37c119e837bdee8f049684565458c)
(cherry picked from commit 9ea9c2089ed0835f4cf8f5fb6fecf4f156b19520)
commit 6493082542ec2b973c2813c3a1bb8e603603319d
Author: Günther Deschner <gd at samba.org>
Date: Wed Nov 25 21:33:48 2009 +0100
s3-kerberos: add check for prerequisite krb5/krb5.h header while checking for krb5/locate_plugin.h.
(Needed for new Heimdal versions).
Guenther
(cherry picked from commit c438b2b3923db66672ec82e795eef543de5fcb8a)
(cherry picked from commit 124c695872a6630cc6670a0547e1c3e6507be748)
commit a32237bf49f624caf1325fb008e8bc94d136ac7b
Author: Günther Deschner <gd at samba.org>
Date: Wed Nov 25 15:21:54 2009 +0100
nsswitch: fix compile of winbind_krb5_locator with recent Heimdal versions.
Guenther
(cherry picked from commit 51864219cc12ceb66c281355f3e1191d5e32842d)
(cherry picked from commit 0d19596e123d63343d31ca1783cc1f56d4f21684)
commit c35897540e19bc94cc3473b4e751beb0460b2abd
Author: Günther Deschner <gd at samba.org>
Date: Wed Nov 25 15:06:19 2009 +0100
cifs.upcall: 2nd part of fix for Bug #6868: support building with Heimdal we well as with MIT.
Guenther
(cherry picked from commit 660ee2e74523194e5f6b2b6428d76628beb74717)
(cherry picked from commit e3a06f282d5e5c06bd006497dd8736a531e6cb3b)
commit 57b2d5a8acedc539aef5f16dfd002842b4c2b1f6
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 19 13:44:33 2009 +0100
s3-build: really fix build of winbind_krb5_locator.
Guenther
(cherry picked from commit fc9f199f2619635f73e8ee7f3b5359521d63f325)
(cherry picked from commit 15832c25f0d252646045b292530556239805e737)
commit 723a5454bc2a3ddd2d99d5cd3047bef3052bc6c2
Author: Günther Deschner <gd at samba.org>
Date: Wed Oct 21 02:44:44 2009 +0200
nsswitch: fix the build of the winbind krb5 locator plugin.
Guenther
(cherry picked from commit b9d9353b548d9b2ab684aa171f511174e6414762)
(cherry picked from commit 8900c0a1c8dd16cd98bfd219232d3bc57acb033a)
commit b4ec856060805a932f100d5408ce7df368133e7c
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 30 14:53:23 2009 +0100
s3:docs: Fix typo in man mount.cifs.
Fix bug #6844 (wrong credential file format in mount.cifs manpage).
Thanks to the Debian Samba package maintainers for reporting!
Karolin
(cherry picked from commit 3b7f8a759f57f32a8c1bc2db85236e88f616ffd9)
(cherry picked from commit 54e2e0ae51e2e126696570104ed64d0458beb4ce)
(cherry picked from commit dbe41dce7491df93a26bb0f4bd2a33b53fe90188)
commit 710831b723f3e7f8923adaa64df7e424d1779593
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 27 16:49:48 2009 +0100
s3: re-run make samba3-idl.
Guenther
Fix bug #6934.
(cherry picked from commit b89d902b6ab0ab14c95cf7b7bbe37b3884fefea5)
commit e437f46f7857b80bcc50a10c9afea45142779505
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 27 16:44:39 2009 +0100
pidl: fix handling of output arguments in s3 client stubs.
a20e095 used (uint8_t) instead of (uint8_t *).
Guenther
(cherry picked from commit 11f5df11cc6998688cadc034b3e1e249d98bf3e1)
commit ee9ddad3f70ea39525de874bd05a6c363c7f9db1
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 27 11:37:01 2009 +0100
pidl:Samba3/ClientNDR: $size can be 'foo / 2' so we need to add '(' and ')'
foo / 5 * sizeof(bar)' isn't the same as
'(foo / 2) * sizeof(bar)'.
metze
(cherry picked from commit 4f14da8ddb1c903b75917cefaaea3e9b405a633a)
commit 519b4a2139881567ca1173a65d33420a2cfcce7a
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Nov 25 14:21:32 2009 +0100
pidl:NDR/Parser: $size can be 'foo / 2' so we need to add '(' and ')'
foo / 5 * sizeof(bar)' isn't the same as
'(foo / 2) * sizeof(bar)'.
metze
(cherry picked from commit ab1c92950f3cfdc8c52b772ecef23a5477f48f9d)
(cherry picked from commit d0d77d830072fbb5bda1c45f9df0722718f89096)
commit 8b63a9f4d52d4517a52d2a427797dd5316e178af
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 30 13:34:34 2009 +0100
s3:docs: Document "aio write behind".
Part of a fix for bug #6890 (Some smb.conf parameters are undocumented).
Karolin
(cherry picked from commit fde7c2ab19bc7442d8ee9d85ab2fe54e0cfb4782)
(cherry picked from commit 267ebc03b43dd8c11f5aebf341620b0d94d95135)
(cherry picked from commit 93bbbd3cc776e4aa69239cb086067ec953fc8c8e)
commit e6dc58d39c6a00f59e207d0049f41453a38afcd3
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 30 12:29:27 2009 +0100
s3:docs: Document "ldap page size".
Part of a fix for bug #6890 (Some smb.conf parameters are undocumented).
Karolin
(cherry picked from commit 9478ec35b5349f50a61bbe2aa88af88577918e91)
(cherry picked from commit 940121d666b9e0645584c93db178b763ac5c8c04)
(cherry picked from commit a1d8a6127448fbdc25d1d87a2541a2ea8e430e17)
commit ec51baa8fb77276443b5c7730d1b8616dbf66e9b
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 30 11:40:06 2009 +0100
s3:docs: Document "enable core files".
Part of a fix for bug #6890 (Some smb.conf parameters are undocumented).
Karolin
(cherry picked from commit b03ad70848e6ea889f382c0cb9f21057370f1ab6)
(cherry picked from commit 15f7b70b0e6b6bd2604255cff1c351bb0425e9f3)
(cherry picked from commit 5832bc1c5896b391131952a06013154cbdafe3f9)
commit 8b3ec36c33e8951fc48d027dc9edc88df5b54b7d
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Nov 30 11:04:50 2009 +0100
s3:docs: Document "cache directory" and "state directory".
Part of a fix for bug #6890 (Some smb.conf parameters are undocumented).
Karolin
(cherry picked from commit 0003b5fad1dee687bc15dfad9f71b6dfc40556d7)
(cherry picked from commit d677cea90f0b28d65ddba551acaed9157ea30c2e)
(cherry picked from commit 7e9537792a8c5b8aad27a14ca5968aa8327a89bd)
commit 42d3641516fd2122e6d8da3e75cd8961f4afb845
Author: Karolin Seeger <kseeger at samba.org>
Date: Thu Nov 26 11:18:39 2009 +0100
create-tarball: Make it more comfortable to use the --copy-docs option.
Now you can directly specify the 'make release' output dir without any
modifications.
Karolin
(cherry picked from commit 77e2d2f1d29b69699f4539abfce7b2f32db843e4)
(cherry picked from commit 62df932f9dc333f69bf901fe88bfac6fc4e59bcd)
(cherry picked from commit f35a774cd0a6837e5440acf51ef1fc032d434007)
commit 8d4dee1db055b3e97578a19ad14a8fa3ac413e0d
Author: Volker Lendecke <vl at samba.org>
Date: Sun Nov 22 22:38:45 2009 +0100
s3: Fix bug 6338 -- net rpc trustdom list always display "none"
(cherry picked from commit e3dc0f527700a8be5e239dacedb880ca88c47312)
commit 1a82cbfc31602b0fe9bd074aadf559f11efdf69b
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 24 11:36:14 2009 +0100
docs: Fix Bug 6922: Add Registry patchfile for Win7 domain join.
Patchfile from SATOH Fumiyasu <fumiyas at osstech.co.jp>.
Thanks!
Guenther
(cherry picked from commit 95d0f0aab01fdd751841d57cebe6150cd6fdf80c)
(cherry picked from commit 12dcd59dd9cf412bc45f4943f96ec9e1ab9efcf8)
commit e6bcdbe802b6147884e60365625f8879b64ca8fb
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Jun 4 23:43:31 2009 +0200
clikrb5: Prefer krb5_free_keytab_entry_contents to krb5_kt_free_entry.
Both functions exist in MIT Kerberos >= 1.7, but only
krb5_free_keytab_entry_contents has a prototype.
(cherry picked from commit b65ba0e26c781647e097f3f6fa279c7f3f7f4bd2)
Part of a fix for bug #6918 (Build breaks with krb5-client-1.7-6.1.i586).
(cherry picked from commit af52655be1852151421417035007cf3a127fdf34)
commit 03f1e1c21fdaa64c87010d01d0be092a810b7042
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 12 00:52:38 2009 +0100
cifs.upcall: Fix Bug #6868: support building with Heimdal we well as with MIT.
Guenther
(cherry picked from commit b29eed492f1c056adb0b53510be10e738276ca11)
(cherry picked from commit f9a9e3268212b0430588d7e727b37998ace23ba7)
commit 820c552112f7cc42ddee9142c5c2df5c6b1a13d8
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 12 00:51:46 2009 +0100
s3-kerberos: add smb_krb5_principal_get_realm().
Guenther
(cherry picked from commit 80d2ad88d8deac953346d1ce98fb519d7f2bf3de)
commit c9e76cd8c93c34f60f6fd03bbf2fe399676e8452
Author: Andrew Tridgell <tridge at samba.org>
Date: Fri Oct 16 10:40:50 2009 +1100
s3: fixed krb5 build problem on ubuntu karmic
Karmic has MIT krb5 1.7-beta3, which has the symbol
krb5_auth_con_set_req_cksumtype but no prototype for it.
See also http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=531635
(cherry picked from commit a6e4cb500b4162cae1d906a1762507370b4ee89e)
Part of a fix for bug #6918.
(cherry picked from commit 8c2dfcd24f69aa8d71a2854feaf2e8ea1802537e)
commit 50524e384f7589c921cc544315b06b2b7932ae12
Author: Michael Adam <obnox at samba.org>
Date: Fri Nov 20 12:44:43 2009 +0100
s3:idmap_ldap: trim the " chars from the location string in idmap_ldap_db_init
Fix bug #6910 (idmap_ldap stumbles over idmap backend = ldap:"ldap://ldap1
ldap://ldap2"=.
When idmap backend is specified as
idmap backend = ldap:"ldap://server1 ldap://server2"
then currently "ldap://server1 ldap://server2" was passed to
ldap_initialize including the quotes, leading to an ldap error.
Michael
(cherry picked from commit 5d6ea139d413cb05370137e4d04c4db391a06ac1)
commit a51a0fbe7cb719ff4a5bf7778b3adc80ce71b24d
Author: Michael Adam <obnox at samba.org>
Date: Fri Nov 20 12:38:44 2009 +0100
s3:idmap_ldap: trim the " chars from the location string in idmap_ldap_alloc_init
When idmap alloc backend is specified as
idmap alloc backend = ldap:"ldap://server1 ldap://server2"
then currently "ldap://server1 ldap://server2" was passed to
ldap_initialize including the quotes, leading to an ldap error.
Michael
(cherry picked from commit 210fc5a8cf384eea62cd51d398523d37723f72fb)
commit 298e53e2a9f97ebffcee4cde4944408b7e68accf
Author: Michael Adam <obnox at samba.org>
Date: Sat Nov 21 00:23:22 2009 +0100
s3:fix endianness bug in dbwrap_change_int32_atomic() (bug #6901)
Michael
(cherry picked from commit d96bc12a8634d50c0c74f583c264cf8f89e22637)
commit c1a52eea2d366c1d64b10868a59d215fe5f92156
Author: Michael Adam <obnox at samba.org>
Date: Sat Nov 21 00:21:56 2009 +0100
s3:fix endianness bug in dbwrap_change_uint32_atomic() (bug #6901)
Michael
(cherry picked from commit d3db4b2d3a56975b0170714828921e0871bfa4a2)
commit 1566cf8ed2cf422e2efdccb167e5493622c07e62
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed Nov 11 15:42:21 2009 +0100
s3/docs: Document "enable spoolss".
Karolin
(cherry picked from commit f3646ff392ab736ed82d2982490aa9d57e11ec6b)
(cherry picked from commit 2bef1fd0ef59bbb3d52c1fb475842ae3ca55308a)
(cherry picked from commit a23ff8b8f8c805bc052e531067733d283e4ebaee)
commit 108e983f70140ab9a6b121558fed13b626db34ae
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 10 13:10:12 2009 +0100
s3-rpc_client: make sure cli_rpc_pipe_open_schannel() does not always return NT_STATUS_OK.
Guenther
Part of a fix for bug #6697.
And hopefully a fix for bug #6889.
(cherry picked from commit bb86aea5007b8ccf6f2f01e5f3c7a32b74eb7d74)
commit fc1b92981abd0e9ee8d6b9094f2145d044c30346
Author: Jeremy Allison <jra at samba.org>
Date: Tue Oct 27 11:25:02 2009 -0700
Second part of the fix for bug 6828 - infinite timeout occurs when byte lock held outside of samba. Fixes case where a connection with a pending lock can me marked "idle", and ensures that the lock queue timeout is always recalculated. Jeremy.
(cherry picked from commit aecf2dba0b2bfd65a307d9edae1792b3896fc73f)
commit 14457e955753cc8338dab03da831e7189dd6f208
Author: Jeremy Allison <jra at samba.org>
Date: Fri Oct 30 14:16:03 2009 -0700
Fix bug 6861 - rfc1738_unescape converts '+' characters to spaces. Stop rfc1738_unescape() from mangling '+' characters to spaces. Noticed by Andrew Bartlett. Jeremy.
(cherry picked from commit 66e356a4864373d63eee3dda00c826eaf69c7a82)
commit 91d37423542de08e22257cb1fa408163868f1d43
Author: Jeremy Allison <jra at samba.org>
Date: Fri Nov 6 14:08:09 2009 -0800
Fix bug 6875 - trans2 FIND_FIRST2 response --> FIND_FIRST2 Data -> Fille Attributes are returned as 0x220 for LANMAN2.1 dialect Jeremy.
(cherry picked from commit dc9b226d8ced06b8b24eb38b411eac11eace41be)
commit e56c114f2762f1cfbf148bfbfbfcf1dcc78b96c5
Author: Matt Kraai <mkraai at beckman.com>
Date: Wed Aug 26 14:50:28 2009 -0700
s3: Do not redefine strupr.
Fixes bug #6751 (Fails to compile on QNX because of conflicting types for
strupr).
Signed-off-by: Günther Deschner <gd at samba.org>
(cherry picked from commit 6657598168724d4fe076f9014c2b5c16a034fe52)
(cherry picked from commit 268fb0106c892c4dd22e0e9bd5392a1e04121d2e)
commit 7639a3335129c8022e1527e8a0b1a643f0850a8b
Author: Jeremy Allison <jra at samba.org>
Date: Mon Nov 9 10:45:50 2009 -0800
Fix bug 6880 - cannot list workgroup servers reported by Alban Browaeys <prahal at yahoo.com> with fix. Revert 2e989bab0764c298a2530a2d4c8690258eba210c with extra comments - this broke workgroup enumeration. Jeremy.
(cherry picked from commit 6be57c378c0dbc4c4ab732fffee0d6a74011fd14)
commit 678de88a3ef48718bffcb746aba20e46ea60940d
Author: Günther Deschner <gd at samba.org>
Date: Wed Nov 4 15:58:08 2009 +0100
s3: Fix Bug #6869: Various annoying build warnings.
Guenther
(cherry picked from commit c59898d5e6ba2569e6691338a73c5ccffc08af0e)
commit 6f04c300b05cda9e9d63dc91e0a8197982d1872e
Author: Jeremy Allison <jra at samba.org>
Date: Mon Nov 2 12:53:46 2009 -0800
Fix bug 6867 - trans2findnext returns reply_nterror(req, ntstatus) In a directory with a lot of files. Jeremy.
(cherry picked from commit a6e7be60322b981f9eb81f2b686d28223bd735bc)
commit 6f7cbab6b99f690588b80cfd4b7949ad392a5243
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue Oct 27 16:29:20 2009 +0100
s3:configure: Fix typo in libtalloc check.
Fix bug #6849. Thanks to Mike Frysinger <vapier at gentoo.org> for reporting
and providing the patch!
Karolin
(cherry picked from commit 5897c3de95b8f9fad4e136d2fc1a390fb366b7b9)
commit 835128d11943358c4bafb2b1cd193522094e0d58
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Oct 30 16:47:22 2009 +0100
s3/docs: Fix typo.
Fix bug #4250. Thanks to TAKAHASHI Motonobu <monyo at samba.gr.jp> for reporting!
Karolin
(cherry picked from commit d1ad143a707b36b3aafcbb498554b73d2013f6e8)
(cherry picked from commit 5087e0ce311c68420c68c285fcdffc5174690621)
(cherry picked from commit 2a58988f5824e6561957ab916cbc72909040f9c7)
commit 7bbe6fec3554f174100790adbdb59419e0f7ab7a
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Oct 30 16:31:55 2009 +0100
s3/docs: Remove reference to nonexistent file.
Fix bug #4252. Thanks to TAKAHASHI Motonobu <monyo at samba.gr.jp> for reporting!
Karolin
(cherry picked from commit 52aa522a550de45aa28969d0a679ff4e9b6575d6)
(cherry picked from commit f6a1bcb69aea271a7afed409530da02595064f71)
(cherry picked from commit 50d54597e71cd6c4aafc117cd41ecb0e13346711)
commit 008d748e62376902946336ae4e826e4415ba7d5a
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Oct 28 11:21:27 2009 +0100
s3:configure: only check for gpfs_gpl.h
The header is everything we need in order to build vfs_gpfs.
metze
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit ee13e9c0becc2b4a4d3b233613d5e3e9bfb54938)
Fix bug #6856.
(cherry picked from commit b71f0e5f6f715d7c061d3a845f1e983e2472c1b0)
commit ebfe8c61c25a16068cb9af15d79233b3dc513ddd
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue Oct 27 16:04:35 2009 +0100
s3/docs: Document new pdbedit -K option.
Karolin
(cherry picked from commit 354038f170f2541318336aa72c9f2a0426c6607e)
Part of a fix for bug #6851.
(cherry picked from commit dbcacda71d59bb5e5587d241ae034adee38f5b67)
commit 2a7a5f99d227e975be9d877c087f146f257389a0
Author: Michael Adam <obnox at samba.org>
Date: Mon Oct 26 16:07:58 2009 +0100
s3: pdbedit: add option --kickoff-time/-K to set the user's kickoff time
Use "never" as argument to set this to unlimited.
Michael
(cherry picked from commit 8fdef14305ae1e32d61c80cb10859d41c5754023)
Fix bug #6851.
(cherry picked from commit 53c32c7f182266e73cd606a8de02bce9d6db16e8)
commit f0f0b6d0b7af541b6081d32da122f8a6d36f442f
Author: Karolin Seeger <kseeger at samba.org>
Date: Thu Oct 29 11:50:23 2009 +0100
WHATSNEW: Start 3.4.4 release notes.
Karolin
(cherry picked from commit 976763fd2cbafb79adb67409349498ffac9b07aa)
commit afc3c268405403657ab2f7fa89327b090fd33914
Author: Karolin Seeger <kseeger at samba.org>
Date: Thu Oct 29 11:48:22 2009 +0100
VERSION: Raise version number up to 3.4.4.
Karolin
(cherry picked from commit 4a4871251b576a0d2c707b8688fb1d7940b126cd)
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 101 +++++++-
docs-xml/manpages-3/mount.cifs.8.xml | 2 +-
docs-xml/manpages-3/pdbedit.8.xml | 10 +
docs-xml/registry/Win7_Samba3DomainMember.reg | Bin 0 -> 424 bytes
docs-xml/smbdotconf/base/enablecorefiles.xml | 15 +
docs-xml/smbdotconf/filename/manglednames.xml | 2 +-
docs-xml/smbdotconf/ldap/ldappagesize.xml | 18 ++
docs-xml/smbdotconf/locking/oplocks.xml | 4 +-
docs-xml/smbdotconf/misc/cachedirectory.xml | 22 ++
.../smbdotconf/misc/directorynamecachesize.xml | 14 +
docs-xml/smbdotconf/misc/statedirectory.xml | 22 ++
docs-xml/smbdotconf/printing/enablespoolss.xml | 10 +
docs-xml/smbdotconf/tuning/aiowritebehind.xml | 23 ++
lib/async_req/async_req.c | 4 +-
lib/async_req/async_req.h | 2 +-
lib/util/util.c | 5 -
librpc/gen_ndr/cli_echo.c | 4 +-
librpc/gen_ndr/cli_epmapper.c | 4 +-
librpc/gen_ndr/cli_eventlog.c | 4 +-
librpc/gen_ndr/cli_ntsvcs.c | 4 +-
librpc/gen_ndr/cli_spoolss.c | 16 +-
librpc/gen_ndr/cli_spoolss.h | 3 +-
librpc/gen_ndr/cli_srvsvc.c | 2 +-
librpc/gen_ndr/cli_svcctl.c | 20 +-
librpc/gen_ndr/cli_winreg.c | 8 +-
librpc/gen_ndr/misc.h | 41 +++
librpc/gen_ndr/ndr_misc.c | 290 ++++++++++++++++++++
librpc/gen_ndr/ndr_misc.h | 6 +
librpc/gen_ndr/ndr_spoolss.c | 185 +++++++++----
librpc/gen_ndr/ndr_spoolss.h | 1 +
librpc/gen_ndr/ndr_winreg.c | 40 +---
librpc/gen_ndr/ndr_winreg.h | 3 -
librpc/gen_ndr/spoolss.h | 7 +-
librpc/gen_ndr/srv_spoolss.c | 15 +-
librpc/gen_ndr/winreg.h | 34 +---
librpc/idl/misc.idl | 28 ++
librpc/idl/spoolss.idl | 9 +-
librpc/idl/winreg.idl | 17 +-
nsswitch/winbind_krb5_locator.c | 5 +
packaging/RHEL/makerpms.git.sh | 6 +-
packaging/RHEL/makerpms.sh.tmpl | 2 +-
pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm | 4 +-
pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 2 +-
pidl/tests/samba3-cli.pl | 2 +-
release-scripts/create-tarball | 21 ++-
source3/Makefile.in | 2 +-
source3/VERSION | 2 +-
source3/auth/auth_sam.c | 4 +-
source3/client/cifs.upcall.c | 37 ++--
source3/configure.in | 70 +++---
source3/include/ads.h | 71 ++----
source3/include/authdata.h | 2 -
source3/include/includes.h | 156 +-----------
source3/include/krb5_protos.h | 147 ++++++++++
source3/include/local.h | 24 ++-
source3/include/proto.h | 8 +-
source3/include/smb_krb5.h | 72 +++++
source3/lib/dbwrap_util.c | 18 +-
source3/lib/util_reg.c | 65 +++++
source3/libaddns/dnsgss.c | 2 +
source3/libads/ads_status.c | 1 +
source3/libads/authdata.c | 2 +
source3/libads/kerberos.c | 1 +
source3/libads/kerberos_keytab.c | 1 +
source3/libads/kerberos_verify.c | 1 +
source3/libads/krb5_errs.c | 1 +
source3/libads/krb5_setpw.c | 1 +
source3/libads/ldap.c | 2 +-
source3/libnet/libnet.h | 1 +
source3/librpc/gen_ndr/messaging.h | 2 +
source3/librpc/gen_ndr/notify.h | 2 +
source3/libsmb/cliconnect.c | 1 +
source3/libsmb/clikrb5.c | 50 +++-
source3/libsmb/clispnego.c | 1 +
source3/libsmb/libsmb_dir.c | 19 +-
source3/m4/aclocal.m4 | 57 ++--
source3/modules/vfs_default.c | 1 -
source3/param/loadparm.c | 16 +
source3/passdb/pdb_ldap.c | 1 +
source3/rpc_client/cli_lsarpc.c | 3 +-
source3/rpc_client/cli_netlogon.c | 2 +-
source3/rpc_client/cli_pipe.c | 5 +-
source3/rpc_client/cli_spoolss.c | 11 +-
source3/rpc_server/srv_samr_nt.c | 10 +-
source3/rpc_server/srv_spoolss_nt.c | 42 ++-
source3/smbd/blocking.c | 15 +-
source3/smbd/dosmode.c | 26 ++
source3/smbd/files.c | 2 -
source3/smbd/mangle_hash.c | 14 +-
source3/smbd/nttrans.c | 45 +++-
source3/smbd/open.c | 11 -
source3/smbd/posix_acls.c | 37 ++-
source3/smbd/trans2.c | 43 ++--
source3/utils/net_rpc.c | 28 ++-
source3/utils/ntlm_auth.c | 1 +
source3/utils/pdbedit.c | 32 ++-
source3/winbindd/idmap_ldap.c | 4 +
source3/winbindd/winbindd_cred_cache.c | 2 +
source3/winbindd/winbindd_pam.c | 2 +
source4/torture/rpc/spoolss.c | 145 ++++++++++
source4/torture/rpc/spoolss_win.c | 9 +-
101 files changed, 1763 insertions(+), 604 deletions(-)
create mode 100644 docs-xml/registry/Win7_Samba3DomainMember.reg
create mode 100644 docs-xml/smbdotconf/base/enablecorefiles.xml
create mode 100644 docs-xml/smbdotconf/ldap/ldappagesize.xml
create mode 100644 docs-xml/smbdotconf/misc/cachedirectory.xml
create mode 100644 docs-xml/smbdotconf/misc/directorynamecachesize.xml
create mode 100644 docs-xml/smbdotconf/misc/statedirectory.xml
create mode 100644 docs-xml/smbdotconf/printing/enablespoolss.xml
create mode 100644 docs-xml/smbdotconf/tuning/aiowritebehind.xml
create mode 100644 source3/include/krb5_protos.h
create mode 100644 source3/include/smb_krb5.h
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index ca66189..129cd3f 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,4 +1,101 @@
=============================
+ Release Notes for Samba 3.4.4
+ January 7, 2009
+ =============================
+
+
+This is the latest stable release of Samba 3.4.
+
+Major enhancements in Samba 3.4.4 include:
+
+ o Fix interdomain trust relationships with Win2008R2 (bug #6697).
+ o Fix Winbind crashes when queried from nss (bug #6889).
+ o Fix "UID range full" error in Winbind (bug #6901).
+ o Fix multiple LDAP servers in "idmap backend" and "idmap alloc
+ backend" (bug #6910).
+
+
+######################################################################
+Changes
+#######
+
+Changes since 3.4.3
+-------------------
+
+o Michael Adam <obnox at samba.org>
+ * BUG 6851: Add pdbedit --kickoff-time/-K to set the user's kickoff time.
+ * BUG 6901: Fix "UID range full" error in Winbind.
+ * BUG 6910: Fix multiple LDAP servers in "idmap backend" and "idmap alloc
+ backend".
+
+
+o Jeremy Allison <jra at samba.org>
+ * BUG 6828: Fix infinite timeout when byte lock held outside of samba.
+ * BUG 6837: Fix "Too many open files" message when trying to access a large
+ number of files with Windows 7.
+ * BUG 6841: Fix "map acl inherit = yes".
+ * BUG 6867: Fix listing of directories with a lot of files.
+ * BUG 6875: Fix DOS attributes on OS/2 clients.
+ * BUG 6880: Fix listing of workgroup servers in libsmbclient.
+ * BUG 6898: Samba duplicates file content on appending.
+ * BUG 6939: Fix long filenames with "mangling method = hash".
+ * BUG 7005: Fix "mangle method = hash" truncates files with dot "."
+ character.
+
+
+o Kai Blin <kai at samba.org>
+ * BUG 4832: Fix iconv checks.
+
+
+o Günther Deschner <gd at samba.org>
+ * BUG 6697: Fix interdomain trust relationships with Win2008R2.
+ * BUG 6868: Support building with Heimdal we well as with MIT.
+ * BUG 6889: Fix Winbind crashes when queried from nss.
+ * BUG 6929: Fix build with recent heimdal.
+ * Fix the build of the winbind krb5 locator plugin.
+ * Fix enumprinter key client and server.
+
+
+o Volker Lendecke <vl at samba.org>
+ * BUG 6338: Do not always display "none" in 'net rpc trustdom list'.
+ * BUG 6850: Fix shadow copy display on Windows 7.
+ * BUG 6981: Fix paged search with DirX LDAP server.
+ * BUG 6982: Remove erroneous out of memory error path in lookup_sid.
+ * BUG 6997: Fix _samr_GetAliasMembership for results with 0 rids.
+
+
+o Jim McDonough <jmcd at samba.org>
+ * BUG 6967: Fix 'net ads join' with OU.
+
+
+o Andrew Tridgell <tridge at samba.org>
+ * BUG 6918: Fix krb5 build problem on Ubuntu karmic.
+
+
+######################################################################
+Reporting bugs & Development Discussion
+#######################################
+
+Please discuss this release on the samba-technical mailing list or by
+joining the #samba-technical IRC channel on irc.freenode.net.
+
+If you do report problems then please try to send high quality
+feedback. If you don't provide vital information to help us track down
+the problem then you will probably be ignored. All bug reports should
+be filed under the Samba 3.4 product in the project's Bugzilla
+database (https://bugzilla.samba.org/).
+
+
+======================================================================
+== Our Code, Our Bugs, Our Responsibility.
+== The Samba Team
+======================================================================
+
+
+Release notes for older versions follow:
+----------------------------------------
+
+ =============================
Release Notes for Samba 3.4.3
October 29, 2009
=============================
@@ -135,8 +232,8 @@ database (https://bugzilla.samba.org/).
======================================================================
-Release notes for older versions follow:
-----------------------------------------
+----------------------------------------------------------------------
+
=============================
Release Notes for Samba 3.4.2
diff --git a/docs-xml/manpages-3/mount.cifs.8.xml b/docs-xml/manpages-3/mount.cifs.8.xml
index 9481458..db6028e 100644
--- a/docs-xml/manpages-3/mount.cifs.8.xml
+++ b/docs-xml/manpages-3/mount.cifs.8.xml
@@ -124,7 +124,7 @@ below) or entered at the password prompt will be read correctly.
<programlisting>
username=<replaceable>value</replaceable>
password=<replaceable>value</replaceable>
- workgroup=<replaceable>value</replaceable>
+ domain=<replaceable>value</replaceable>
</programlisting>
<para>
diff --git a/docs-xml/manpages-3/pdbedit.8.xml b/docs-xml/manpages-3/pdbedit.8.xml
index 3daf0ef..9242d67 100644
--- a/docs-xml/manpages-3/pdbedit.8.xml
+++ b/docs-xml/manpages-3/pdbedit.8.xml
@@ -253,6 +253,16 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
</varlistentry>
<varlistentry>
+ <term>-K|--kickoff-time</term>
+ <listitem><para>This option is used to modify the kickoff
+ time for a certain user. Use "never" as argument to set the
+ kickoff time to unlimited.
+ </para>
+ <para>Example: <command>pdbedit -K never user</command></para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>-a</term>
<listitem><para>This option is used to add a user into the
database. This command needs a user name specified with
diff --git a/docs-xml/registry/Win7_Samba3DomainMember.reg b/docs-xml/registry/Win7_Samba3DomainMember.reg
new file mode 100644
index 0000000..b5de9e2
Binary files /dev/null and b/docs-xml/registry/Win7_Samba3DomainMember.reg differ
diff --git a/docs-xml/smbdotconf/base/enablecorefiles.xml b/docs-xml/smbdotconf/base/enablecorefiles.xml
new file mode 100644
index 0000000..8c8bacf
--- /dev/null
+++ b/docs-xml/smbdotconf/base/enablecorefiles.xml
@@ -0,0 +1,15 @@
+<samba:parameter name="enable core files"
+ context="G"
+ basic="1" advanced="1" developer="1"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+
+<description>
+ <para>This parameter specifies whether core dumps should be written
+ on internal exits. Normally set to <constant>yes</constant>.
+ You should never need to change this.
+ </para>
+</description>
+
+ <value type="default">yes</value>
+ <value type="example">no</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/filename/manglednames.xml b/docs-xml/smbdotconf/filename/manglednames.xml
index 90bbc58..a4ec0bf 100644
--- a/docs-xml/smbdotconf/filename/manglednames.xml
+++ b/docs-xml/smbdotconf/filename/manglednames.xml
@@ -10,7 +10,7 @@
<para>See the section on <smbconfoption name="name mangling"/> for
details on how to control the mangling process.</para>
- <para>If mangling is used then the mangling algorithm is as follows:</para>
+ <para>If mangling is used then the mangling method is as follows:</para>
<itemizedlist>
<listitem>
diff --git a/docs-xml/smbdotconf/ldap/ldappagesize.xml b/docs-xml/smbdotconf/ldap/ldappagesize.xml
new file mode 100644
index 0000000..bc09b98
--- /dev/null
+++ b/docs-xml/smbdotconf/ldap/ldappagesize.xml
@@ -0,0 +1,18 @@
+<samba:parameter name="ldap page size"
+ context="G"
+ type="integer"
+ advanced="1" developer="1"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+ <para>
+ This parameter specifies the number of entries per page.
+ </para>
+
+ <para>If the LDAP server supports paged results, clients can
+ request subsets of search results (pages) instead of the entire list.
+ This parameter specifies the size of these pages.
+ </para>
+</description>
+<value type="default">1024</value>
+<value type="example">512</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/locking/oplocks.xml b/docs-xml/smbdotconf/locking/oplocks.xml
index 0c6c269..a56e921 100644
--- a/docs-xml/smbdotconf/locking/oplocks.xml
+++ b/docs-xml/smbdotconf/locking/oplocks.xml
@@ -10,9 +10,7 @@
the speed of access to files on Samba servers. It allows the clients
to aggressively cache files locally and you may want to disable this
option for unreliable network environments (it is turned on by
- default in Windows NT Servers). For more information see the file
- <filename moreinfo="none">Speed.txt</filename> in the Samba
- <filename moreinfo="none">docs/</filename> directory.
+ default in Windows NT Servers).
</para>
<para>
diff --git a/docs-xml/smbdotconf/misc/cachedirectory.xml b/docs-xml/smbdotconf/misc/cachedirectory.xml
new file mode 100644
index 0000000..5216998
--- /dev/null
+++ b/docs-xml/smbdotconf/misc/cachedirectory.xml
@@ -0,0 +1,22 @@
+<samba:parameter name="cache directory"
+ context="G"
+ advanced="1" developer="1"
+ type="string"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+ <para>Usually, most of the TDB files are stored in the <parameter
+ moreinfo="none">lock directory</parameter>. Since Samba 3.4.0, it is
+ possible to differentiate between TDB files with persistent data and
+ TDB files with non-persistent data using the
+ <parameter moreinfo="none">state directory</parameter> and the
+ <parameter moreinfo="none">cache directory</parameter> options.
+ </para>
+
+ <para> This option specifies the directory where TDB files containing
+ non-persistent data will be stored.
+ </para>
+</description>
+
+<value type="default">${prefix}/var/locks</value>
+<value type="example">/var/run/samba/locks/cache</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/misc/directorynamecachesize.xml b/docs-xml/smbdotconf/misc/directorynamecachesize.xml
new file mode 100644
index 0000000..1064b7e
--- /dev/null
+++ b/docs-xml/smbdotconf/misc/directorynamecachesize.xml
@@ -0,0 +1,14 @@
+<samba:parameter name="directory name cache size"
+ context="S"
+ type="integer"
+ advanced="1"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+ <para>
+ This parameter specifies the the size of the directory name cache.
+ It will be needed to turn this off for *BSD systems.
+ </para>
+
+</description>
+<value type="default">100</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/misc/statedirectory.xml b/docs-xml/smbdotconf/misc/statedirectory.xml
new file mode 100644
index 0000000..f8cfcdf
--- /dev/null
+++ b/docs-xml/smbdotconf/misc/statedirectory.xml
@@ -0,0 +1,22 @@
+<samba:parameter name="state directory"
+ context="G"
+ advanced="1" developer="1"
+ type="string"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+ <para>Usually, most of the TDB files are stored in the
+ <parameter moreinfo="none">lock directory</parameter>. Since
+ Samba 3.4.0, it is possible to differentiate between TDB files
+ with persistent data and TDB files with non-persistent data using
+ the <parameter moreinfo="none">state directory</parameter> and the
+ <parameter moreinfo="none">cache directory</parameter> options.
+ </para>
+
+ <para> This option specifies the directory where TDB files containing
+ persistent data will be stored.
+ </para>
+</description>
+
+<value type="default">${prefix}/var/locks</value>
+<value type="example">/var/run/samba/locks/state</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/printing/enablespoolss.xml b/docs-xml/smbdotconf/printing/enablespoolss.xml
new file mode 100644
index 0000000..d3eb74c
--- /dev/null
+++ b/docs-xml/smbdotconf/printing/enablespoolss.xml
@@ -0,0 +1,10 @@
+<samba:parameter name="enable spoolss"
+ context="G"
+ type="boolean"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+ <para>Inverted synonym for <smbconfoption name="disable spoolss"/>.</para>
+</description>
+
+<value type="default">yes</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/tuning/aiowritebehind.xml b/docs-xml/smbdotconf/tuning/aiowritebehind.xml
new file mode 100644
index 0000000..c88cd97
--- /dev/null
+++ b/docs-xml/smbdotconf/tuning/aiowritebehind.xml
@@ -0,0 +1,23 @@
+<samba:parameter name="aio write behind"
+ context="S"
+ type="string"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+ <para>If Samba has been built with asynchronous I/O support,
+ Samba will not wait until write requests are finished before returning
+ the result to the client for files listed in this parameter.
+ Instead, Samba will immediately return that the write
+ request has been finished successfully, no matter if the
+ operation will succeed or not. This might speed up clients without
+ aio support, but is really dangerous, because data could be lost
+ and files could be damaged.
+ </para>
+ <para>
+ The syntax is identical to the <smbconfoption name="veto files"/>
+ parameter.
+ </para>
+</description>
+
+<value type="default"/>
+<value type="example">/*.tmp/</value>
+</samba:parameter>
diff --git a/lib/async_req/async_req.c b/lib/async_req/async_req.c
index 4dfe809..9024738 100644
--- a/lib/async_req/async_req.c
+++ b/lib/async_req/async_req.c
@@ -272,7 +272,7 @@ bool async_req_enqueue(struct async_req_queue *queue, struct tevent_context *ev,
}
bool _async_req_setup(TALLOC_CTX *mem_ctx, struct async_req **preq,
- void *pstate, size_t state_size, const char *typename)
+ void *pstate, size_t state_size, const char *_typename)
{
struct async_req *req;
void **ppstate = (void **)pstate;
@@ -287,7 +287,7 @@ bool _async_req_setup(TALLOC_CTX *mem_ctx, struct async_req **preq,
TALLOC_FREE(req);
return false;
}
- talloc_set_name_const(state, typename);
+ talloc_set_name_const(state, _typename);
req->private_data = state;
*preq = req;
diff --git a/lib/async_req/async_req.h b/lib/async_req/async_req.h
index fdec1b7..a06e824 100644
--- a/lib/async_req/async_req.h
+++ b/lib/async_req/async_req.h
@@ -149,7 +149,7 @@ bool async_req_enqueue(struct async_req_queue *queue,
void (*trigger)(struct async_req *req));
bool _async_req_setup(TALLOC_CTX *mem_ctx, struct async_req **preq,
- void *pstate, size_t state_size, const char *typename);
+ void *pstate, size_t state_size, const char *_typename);
#define async_req_setup(_mem_ctx, _preq, _pstate, type) \
_async_req_setup((_mem_ctx), (_preq), (_pstate), sizeof(type), #type)
diff --git a/lib/util/util.c b/lib/util/util.c
index 0148bdb..af682ac 100644
--- a/lib/util/util.c
+++ b/lib/util/util.c
@@ -702,11 +702,6 @@ _PUBLIC_ void rfc1738_unescape(char *buf)
{
char *p=buf;
- while ((p=strchr(p,'+')))
- *p = ' ';
-
- p = buf;
-
while (p && *p && (p=strchr(p,'%'))) {
int c1 = p[1];
int c2 = p[2];
diff --git a/librpc/gen_ndr/cli_echo.c b/librpc/gen_ndr/cli_echo.c
index ff369c7..48632a3 100644
--- a/librpc/gen_ndr/cli_echo.c
+++ b/librpc/gen_ndr/cli_echo.c
@@ -82,7 +82,7 @@ NTSTATUS rpccli_echo_EchoData(struct rpc_pipe_client *cli,
}
/* Return variables */
- memcpy(out_data, r.out.out_data, r.in.len * sizeof(*out_data));
+ memcpy(out_data, r.out.out_data, (r.in.len) * sizeof(*out_data));
/* Return result */
return NT_STATUS_OK;
@@ -162,7 +162,7 @@ NTSTATUS rpccli_echo_SourceData(struct rpc_pipe_client *cli,
}
/* Return variables */
- memcpy(data, r.out.data, r.in.len * sizeof(*data));
+ memcpy(data, r.out.data, (r.in.len) * sizeof(*data));
/* Return result */
return NT_STATUS_OK;
diff --git a/librpc/gen_ndr/cli_epmapper.c b/librpc/gen_ndr/cli_epmapper.c
index 0ccefa9..65621d3 100644
--- a/librpc/gen_ndr/cli_epmapper.c
+++ b/librpc/gen_ndr/cli_epmapper.c
@@ -135,7 +135,7 @@ NTSTATUS rpccli_epm_Lookup(struct rpc_pipe_client *cli,
/* Return variables */
*entry_handle = *r.out.entry_handle;
*num_ents = *r.out.num_ents;
- memcpy(entries, r.out.entries, r.in.max_ents * sizeof(*entries));
+ memcpy(entries, r.out.entries, (r.in.max_ents) * sizeof(*entries));
/* Return result */
return NT_STATUS_OK;
@@ -184,7 +184,7 @@ NTSTATUS rpccli_epm_Map(struct rpc_pipe_client *cli,
/* Return variables */
*entry_handle = *r.out.entry_handle;
*num_towers = *r.out.num_towers;
- memcpy(towers, r.out.towers, r.in.max_towers * sizeof(*towers));
+ memcpy(towers, r.out.towers, (r.in.max_towers) * sizeof(*towers));
/* Return result */
return NT_STATUS_OK;
diff --git a/librpc/gen_ndr/cli_eventlog.c b/librpc/gen_ndr/cli_eventlog.c
index b9cf39d..2480412 100644
--- a/librpc/gen_ndr/cli_eventlog.c
+++ b/librpc/gen_ndr/cli_eventlog.c
@@ -464,7 +464,7 @@ NTSTATUS rpccli_eventlog_ReadEventLogW(struct rpc_pipe_client *cli,
}
/* Return variables */
- memcpy(data, r.out.data, r.in.number_of_bytes * sizeof(*data));
+ memcpy(data, r.out.data, (r.in.number_of_bytes) * sizeof(*data));
*sent_size = *r.out.sent_size;
*real_size = *r.out.real_size;
@@ -941,7 +941,7 @@ NTSTATUS rpccli_eventlog_GetLogInformation(struct rpc_pipe_client *cli,
}
/* Return variables */
- memcpy(buffer, r.out.buffer, r.in.buf_size * sizeof(*buffer));
+ memcpy(buffer, r.out.buffer, (r.in.buf_size) * sizeof(*buffer));
*bytes_needed = *r.out.bytes_needed;
/* Return result */
diff --git a/librpc/gen_ndr/cli_ntsvcs.c b/librpc/gen_ndr/cli_ntsvcs.c
index 179368d..8f98278 100644
--- a/librpc/gen_ndr/cli_ntsvcs.c
+++ b/librpc/gen_ndr/cli_ntsvcs.c
@@ -461,7 +461,7 @@ NTSTATUS rpccli_PNP_GetDeviceList(struct rpc_pipe_client *cli,
}
/* Return variables */
- memcpy(buffer, r.out.buffer, *r.in.length * sizeof(*buffer));
+ memcpy(buffer, r.out.buffer, (*r.in.length) * sizeof(*buffer));
*length = *r.out.length;
/* Return result */
@@ -606,7 +606,7 @@ NTSTATUS rpccli_PNP_GetDeviceRegProp(struct rpc_pipe_client *cli,
/* Return variables */
*reg_data_type = *r.out.reg_data_type;
- memcpy(buffer, r.out.buffer, *r.in.buffer_size * sizeof(*buffer));
+ memcpy(buffer, r.out.buffer, (*r.in.buffer_size) * sizeof(*buffer));
*buffer_size = *r.out.buffer_size;
*needed = *r.out.needed;
diff --git a/librpc/gen_ndr/cli_spoolss.c b/librpc/gen_ndr/cli_spoolss.c
index 1e94a2a..10dd8b4 100644
--- a/librpc/gen_ndr/cli_spoolss.c
+++ b/librpc/gen_ndr/cli_spoolss.c
@@ -1144,7 +1144,7 @@ NTSTATUS rpccli_spoolss_ReadPrinter(struct rpc_pipe_client *cli,
}
/* Return variables */
- memcpy(data, r.out.data, r.in.data_size * sizeof(*data));
+ memcpy(data, r.out.data, (r.in.data_size) * sizeof(*data));
*_data_size = *r.out._data_size;
--
Samba Shared Repository
More information about the samba-cvs
mailing list