Rev 5343: Merge from upstream. in
http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/
Michael Adam
ma at sernet.de
Tue Apr 10 10:34:53 GMT 2007
At http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/
------------------------------------------------------------
revno: 5343
revision-id: ma at sernet.de-20070410103443-471e39ea62339c7b
parent: ma at sernet.de-20070405202817-bd78d74d5cb04968
parent: jra at samba.org-20070409230201-buciygamf58wvp0j
committer: Michael Adam <ma at sernet.de>
branch nick: SAMBA_3_0-registry.bzr
timestamp: Tue 2007-04-10 12:34:43 +0200
message:
Merge from upstream.
(Resolving conflicts due to checkin of net conf stuff by Volker,
svn revision r22135)
removed:
packaging/RedHat-9/ RedHat9-20060530085229-ee98aca1fee0c927
packaging/RedHat-9/README README-20060530085229-63e665a7e40cc921
packaging/RedHat-9/filter-requires-samba_rh8.sh filterrequiressamba_rh8.sh-20060530085229-8c0964a3469366a4
packaging/RedHat-9/filter-requires-samba_rh9.sh filterrequiressamba_rh9.sh-20060530085229-55af90118c4ecc93
packaging/RedHat-9/makerpms.sh.tmpl makerpms.sh.tmpl-20060530085229-e9bd0c0568062817
packaging/RedHat-9/samba.log samba.log-20060530085229-860e4045f988fae2
packaging/RedHat-9/samba.pamd samba.pamd-20060530085229-f3e9c7bdf105ea1a
packaging/RedHat-9/samba.pamd.stack samba.pamd.stack-20060530085229-6ce38263e54e2fec
packaging/RedHat-9/samba.spec.tmpl samba.spec.tmpl-20060530085229-5bbd173114a6206a
packaging/RedHat-9/samba.xinetd samba.xinetd-20060530085229-25a412d43417c829
packaging/RedHat-9/smb.conf smb.conf-20060530085229-cca2f66c5b8e05c9
packaging/RedHat-9/smb.init smb.init-20060530085229-6875123ec64c4343
packaging/RedHat-9/smbprint smbprint-20060530085229-f4ed2908b6904509
packaging/RedHat-9/smbusers smbusers-20060530085229-0646ad7578bdca5d
packaging/RedHat-9/winbind.init winbind.init-20060530085229-9e60008c11e5615c
added:
source/auth/token_util.c token_util.c-20070409110214-hxmlg8kreyeuci30-1
source/modules/vfs_readahead.c vfs_readahead.c-20070406230344-ao2vumno0dhc4q95-1
source/registry/reg_frontend_hilvl.c reg_frontend_hilvl.c-20070409110215-i69vagpr9ngxf5ez-1
source/utils/net_conf.c net_conf.c-20070409110216-64p0zt0mes4j6yoe-1
renamed:
source/registry/reg_frontend_hilvl.c => source/registry/reg_frontend_hilvl.c.moved reg_frontend_hilvl.c-20070228112523-ixvv3vyvzo4tfz32-1
source/utils/net_conf.c => source/utils/net_conf.c.moved net_conf.c-20070228210606-uywdn1acd043wgvt-1
modified:
REVISION REVISION-20060530022625-68239662668b41c3
examples/libsmbclient/Makefile Makefile-20060530022627-a84d9f91545769c3
source/Makefile.in Makefile.in-20060530022626-b16dac2328ebe703
source/configure.in configure.in-20060530022626-07e74bc1e326c82d
source/include/includes.h includes.h-20060530022627-d1a059a99c05e8be
source/include/rpc_ds.h rpc_ds.h-20060530022627-9397a335314fbce1
source/include/smb.h smb.h-20060530022627-6c2e6fe4eb631e83
source/lib/debug.c debug.c-20060530022627-f23cb2ef8f91a8a6
source/lib/fault.c fault.c-20060530022627-d2883d4c08c20703
source/lib/messages.c messages.c-20060530022627-fcc341b253a85c20
source/lib/pidfile.c pidfile.c-20060530022627-e34be6997a5993a0
source/lib/util_sec.c util_sec.c-20060530022627-fcd5fae5b94d5667
source/libads/ldap.c ldap.c-20060530022627-07f10a20cc50f671
source/libsmb/cliconnect.c cliconnect.c-20060530022627-fb16a3a9bd86c44d
source/modules/vfs_default.c vfs_default.c-20060711181345-e2d073492cc4cc5d
source/nsswitch/idmap.c idmap.c-20061212152801-ke1ub3n5v1jjf8gy-1
source/nsswitch/idmap_ad.c idmap_ad.c-20061212152802-3w9k6jbk4ef61xmv-1
source/nsswitch/idmap_cache.c idmap_cache.c-20061212152803-7ux8tgbe0zeiy4lo-1
source/passdb/lookup_sid.c lookup_sid.c-20060530022627-e709356ee81bdcb1
source/passdb/passdb.c passdb.c-20060530022627-6eeb9667474b279d
source/passdb/secrets.c secrets.c-20060530022627-871f686af94b25c8
source/rpc_parse/parse_ds.c parse_ds.c-20060530022627-a8683047fabf08f5
source/rpc_server/srv_lsa_ds.c srv_lsa_ds.c-20060530022627-914b19c3d099135e
source/rpc_server/srv_lsa_ds_nt.c srv_lsa_ds_nt.c-20060530022627-3c78091d53c3d4f2
source/smbd/nttrans.c nttrans.c-20060530022627-b483806ef6e0e97d
source/smbd/process.c process.c-20060530022627-8fe40017fe0e41ff
source/smbd/quotas.c quotas.c-20060530022627-f2ef4e7853114181
source/smbd/reply.c reply.c-20060530022627-92de20342694c043
source/smbd/sesssetup.c sesssetup.c-20060530022627-0a6efae905e1529e
source/smbd/vfs.c vfs.c-20060530022627-5b12e4d484bb4e8c
------------------------------------------------------------
merged: jra at samba.org-20070409230201-buciygamf58wvp0j
parent: vlendec at samba.org-20070409110219-33rovazfsitz3f1h
committer: jra at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Mon 2007-04-09 18:02:01 -0500
message:
jra at samba.org (r22145) 2007-04-09 16:01:46 -0500 (Mon, 09 Apr 2007)
Fix bug #4494 - reported by Kevin Jamieson <bugzilla at kevinjamieson.com>.
If returning a mapped UNIX error from sendfile, don't call chain_reply.
Jeremy.
------------------------------------------------------------
merged: vlendec at samba.org-20070409110219-33rovazfsitz3f1h
parent: jra at samba.org-20070408230158-9yfnhh842jkfbpvs
committer: vlendec at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Mon 2007-04-09 06:02:19 -0500
message:
vlendec at samba.org (r22135) 2007-04-09 05:38:55 -0500 (Mon, 09 Apr 2007)
Check in most of Michael Adam's net conf utility. A good share of this patch
is moving functions around to fix some linker dependencies for the registry.
Michael, I've renamed your auth_utils2.c to token_utils.c.
Thanks!
Volker
------------------------------------------------------------
merged: jra at samba.org-20070408230158-9yfnhh842jkfbpvs
parent: derrell at samba.org-20070408170215-v5sxlqk6w525gy4t
committer: jra at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Sun 2007-04-08 18:01:58 -0500
message:
jra at samba.org (r22132) 2007-04-08 14:41:47 -0500 (Sun, 08 Apr 2007)
I hate inefficiency. Don't call conv_str_size()
on every pread/sendfile call, initialize these
variables in an allocated struct at connection
time and just refer to them directly.
Jeremy.
------------------------------------------------------------
merged: derrell at samba.org-20070408170215-v5sxlqk6w525gy4t
parent: jra at samba.org-20070408050410-i5jdqtmdo1gyjkbr
committer: derrell at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Sun 2007-04-08 12:02:15 -0500
message:
derrell at samba.org (r22130) 2007-04-08 11:41:24 -0500 (Sun, 08 Apr 2007)
- Ensure that the libsmbclient example programs link with the libsmbclient
library that's part of the current tree, not with whatever happens to have
been previously installed.
------------------------------------------------------------
merged: jra at samba.org-20070408050410-i5jdqtmdo1gyjkbr
parent: jra at samba.org-20070408050217-2q7vt9kuqpr1lo6q
committer: jra at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Sun 2007-04-08 00:04:10 -0500
message:
jra at samba.org (r22129) 2007-04-07 23:54:44 -0500 (Sat, 07 Apr 2007)
Fix the nttrans create extended response for pipes
and files (tested with Win32 code). Bug #4404 should
now be dead :-).
Jeremy.
------------------------------------------------------------
merged: jra at samba.org-20070408050217-2q7vt9kuqpr1lo6q
parent: jpeach at samba.org-20070407230324-p47zim9ot1du6udl
committer: jra at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Sun 2007-04-08 00:02:17 -0500
message:
jra at samba.org (r22128) 2007-04-07 19:47:49 -0500 (Sat, 07 Apr 2007)
Fix the pipe open response with EXTENDED_RESPONSE_REQUIRED
set. Only the NTTrans create left to fix for csc.
Jeremy.
------------------------------------------------------------
merged: jpeach at samba.org-20070407230324-p47zim9ot1du6udl
parent: vlendec at samba.org-20070407230156-k16aq5nx29k3x9is
committer: jpeach at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Sat 2007-04-07 18:03:24 -0500
message:
jpeach at samba.org (r22127) 2007-04-07 16:13:29 -0500 (Sat, 07 Apr 2007)
Wrap the AC_TRY_RUN detection for Linux getgrouplist in an
AC_CACHE_CHECK, so it can be cross-compiled.
------------------------------------------------------------
merged: vlendec at samba.org-20070407230156-k16aq5nx29k3x9is
parent: vlendec at samba.org-20070407170157-goqqawwhnb3bz38s
committer: vlendec at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Sat 2007-04-07 18:01:56 -0500
message:
vlendec at samba.org (r22126) 2007-04-07 14:35:13 -0500 (Sat, 07 Apr 2007)
Fix a bogus uninitialized variable warning
------------------------------------------------------------
merged: vlendec at samba.org-20070407170157-goqqawwhnb3bz38s
parent: jra at samba.org-20070407110511-nh59zi1hjotmdq9z
committer: vlendec at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Sat 2007-04-07 12:01:57 -0500
message:
vlendec at samba.org (r22125) 2007-04-07 08:22:49 -0500 (Sat, 07 Apr 2007)
Fix a warning
------------------------------------------------------------
merged: jra at samba.org-20070407110511-nh59zi1hjotmdq9z
parent: jra at samba.org-20070407110339-kpdd3dis58toi90j
committer: jra at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Sat 2007-04-07 06:05:11 -0500
message:
jra at samba.org (r22124) 2007-04-07 01:59:32 -0500 (Sat, 07 Apr 2007)
Wow - NTCreateX sets the word count to 42, but returns 50 on
the wire. Strange.... But now we're returning Windows compatible
extended info. Next to fix the pipe returns and NTTrans Creates.
Jeremy.
------------------------------------------------------------
merged: jra at samba.org-20070407110339-kpdd3dis58toi90j
parent: jra at samba.org-20070407110152-x8tp47tj2vyi8urh
committer: jra at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Sat 2007-04-07 06:03:39 -0500
message:
jra at samba.org (r22123) 2007-04-07 01:38:45 -0500 (Sat, 07 Apr 2007)
Try and fix the csc (#4404) bug by supporting the extended
response to NTCreateX - need to fix this also for
pipe open and NTTransCreate as well so this isn't
finished.
Jeremy.
------------------------------------------------------------
merged: jra at samba.org-20070407110152-x8tp47tj2vyi8urh
parent: jra at samba.org-20070406231752-zp70825nkj9go4mm
committer: jra at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Sat 2007-04-07 06:01:52 -0500
message:
jra at samba.org (r22122) 2007-04-07 00:49:24 -0500 (Sat, 07 Apr 2007)
Start to fix csc issue with Vista. Make smbd support
the extended 7 word response for tconX rather than the
3 word one we supported previously.
Jeremy.
------------------------------------------------------------
merged: jra at samba.org-20070406231752-zp70825nkj9go4mm
parent: jra at samba.org-20070406231615-p7vs8s5knij7onvc
committer: jra at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Fri 2007-04-06 18:17:52 -0500
message:
jra at samba.org (r22113) 2007-04-06 17:08:44 -0500 (Fri, 06 Apr 2007)
Fix core dump when configfile in same directory.
From Steven Danneman <steven.danneman at isilon.com>.
Jeremy.
------------------------------------------------------------
merged: jra at samba.org-20070406231615-p7vs8s5knij7onvc
parent: jra at samba.org-20070406231447-wxmv0o66kmrdwx2y
committer: jra at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Fri 2007-04-06 18:16:15 -0500
message:
jra at samba.org (r22112) 2007-04-06 16:55:44 -0500 (Fri, 06 Apr 2007)
Fix memleak pointed out by Steven Danneman <steven.danneman at isilon.com>.
Jeremy.
------------------------------------------------------------
merged: jra at samba.org-20070406231447-wxmv0o66kmrdwx2y
parent: jerry at samba.org-20070406231304-io1z90gs64a16bs5
committer: jra at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Fri 2007-04-06 18:14:47 -0500
message:
jra at samba.org (r22111) 2007-04-06 16:12:44 -0500 (Fri, 06 Apr 2007)
Allow readahead params to use size suffixes as K,M, etc.
Jeremy.
------------------------------------------------------------
merged: jerry at samba.org-20070406231304-io1z90gs64a16bs5
parent: idra at samba.org-20070406231138-qrb3uj814k37uid3
committer: jerry at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Fri 2007-04-06 18:13:04 -0500
message:
jerry at samba.org (r22110) 2007-04-06 16:05:55 -0500 (Fri, 06 Apr 2007)
------------------------------------------------------------
merged: idra at samba.org-20070406231138-qrb3uj814k37uid3
parent: jra at samba.org-20070406231010-y2hk9bqh0cckkq36
committer: idra at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Fri 2007-04-06 18:11:38 -0500
message:
idra at samba.org (r22109) 2007-04-06 14:55:45 -0500 (Fri, 06 Apr 2007)
Readonly is automatically set in the generic init code, let's just log the fact there
and remove the specific, but redundant, code in idmap_ad.c
------------------------------------------------------------
merged: jra at samba.org-20070406231010-y2hk9bqh0cckkq36
parent: jpeach at samba.org-20070406230829-o7oktsfzdwv0lzkd
committer: jra at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Fri 2007-04-06 18:10:10 -0500
message:
jra at samba.org (r22108) 2007-04-06 14:38:35 -0500 (Fri, 06 Apr 2007)
Fix from <don.mccall at hp.com> to try and fix the HPUX builds.
Jeremy.
------------------------------------------------------------
merged: jpeach at samba.org-20070406230829-o7oktsfzdwv0lzkd
parent: jra at samba.org-20070406230602-9nz1dbgoiq3uuhp7
committer: jpeach at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Fri 2007-04-06 18:08:29 -0500
message:
jpeach at samba.org (r22107) 2007-04-06 14:17:15 -0500 (Fri, 06 Apr 2007)
Fix typo.
------------------------------------------------------------
merged: jra at samba.org-20070406230602-9nz1dbgoiq3uuhp7
parent: jra at samba.org-20070406230347-zbckbkutbyvrom4b
committer: jra at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Fri 2007-04-06 18:06:02 -0500
message:
jra at samba.org (r22106) 2007-04-06 14:09:53 -0500 (Fri, 06 Apr 2007)
Fix the module name - it's vfs_readahead not vfs_linux_readahead.
Jeremy.
------------------------------------------------------------
merged: jra at samba.org-20070406230347-zbckbkutbyvrom4b
parent: jerry at samba.org-20070406230202-0o04y5ewr6523llu
committer: jra at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Fri 2007-04-06 18:03:47 -0500
message:
jra at samba.org (r22105) 2007-04-06 13:56:47 -0500 (Fri, 06 Apr 2007)
Added vfs_readahead module that appears to do wonderful things
for copying files from Samba when using Windows Vista Windows
explorer.... :-). By default if you add this I can go on my
I turn sendfile on).
Jeremy.
------------------------------------------------------------
merged: jerry at samba.org-20070406230202-0o04y5ewr6523llu
parent: lmuelle at samba.org-20070406170744-rmj02jfjcjkraekq
committer: jerry at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Fri 2007-04-06 18:02:02 -0500
message:
jerry at samba.org (r22104) 2007-04-06 13:52:30 -0500 (Fri, 06 Apr 2007)
BUG 4439: Fix the object picket on x64 WIndopws XP/2003.
Enable the DsRoleGetPrimaryDomainInfo() server code.
Tested by Win2000/XP/2003/Vista (x86) and WinXP (x64)
------------------------------------------------------------
merged: lmuelle at samba.org-20070406170744-rmj02jfjcjkraekq
parent: lmuelle at samba.org-20070406170624-3bxsvfowl5er3uhk
committer: lmuelle at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Fri 2007-04-06 12:07:44 -0500
message:
lmuelle at samba.org (r22103) 2007-04-06 11:42:37 -0500 (Fri, 06 Apr 2007)
No code change. This is a spring time end of line clesnup checkin.
------------------------------------------------------------
merged: lmuelle at samba.org-20070406170624-3bxsvfowl5er3uhk
parent: jerry at samba.org-20070406170421-9yyo6ajeh3rsiz00
committer: lmuelle at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Fri 2007-04-06 12:06:24 -0500
message:
lmuelle at samba.org (r22102) 2007-04-06 11:27:28 -0500 (Fri, 06 Apr 2007)
Remove obsoleted SHLIBS_PROGS from {Makefile,configure}.in.
As NSS_MODULES is added to the all rule the resulting set of binaries
are the same.
------------------------------------------------------------
merged: jerry at samba.org-20070406170421-9yyo6ajeh3rsiz00
parent: lmuelle at samba.org-20070406170247-xywrr14ssmxk9bd4
committer: jerry at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Fri 2007-04-06 12:04:21 -0500
message:
jerry at samba.org (r22101) 2007-04-06 11:23:55 -0500 (Fri, 06 Apr 2007)
remove RedHat 9 packaging files after annoncement on the samba ml
------------------------------------------------------------
merged: lmuelle at samba.org-20070406170247-xywrr14ssmxk9bd4
parent: jra at samba.org-20070406050229-z9bao8t47mv8wc9t
committer: lmuelle at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Fri 2007-04-06 12:02:47 -0500
message:
lmuelle at samba.org (r22099) 2007-04-06 10:39:34 -0500 (Fri, 06 Apr 2007)
Revert parts of revision 22056 as proto_exists is not required by
------------------------------------------------------------
merged: jra at samba.org-20070406050229-z9bao8t47mv8wc9t
parent: jra at samba.org-20070406050125-ykybfjhr8ft307wx
committer: jra at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Fri 2007-04-06 00:02:29 -0500
message:
jra at samba.org (r22097) 2007-04-05 20:09:19 -0500 (Thu, 05 Apr 2007)
Add detection for linux readahead() syscall.
Jeremy.
------------------------------------------------------------
merged: jra at samba.org-20070406050125-ykybfjhr8ft307wx
parent: jerry at samba.org-20070405230221-7ktze1dee20334k6
committer: jra at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Fri 2007-04-06 00:01:25 -0500
message:
jra at samba.org (r22096) 2007-04-05 18:56:10 -0500 (Thu, 05 Apr 2007)
become_root_uid_only() is unneeded - it's only used in
messages.c. Refactor to use become_root() instead and
make it local to messages.c
Jeremy.
------------------------------------------------------------
merged: jerry at samba.org-20070405230221-7ktze1dee20334k6
parent: jpeach at samba.org-20070405230126-ynbynltka33hjtmu
committer: jerry at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Thu 2007-04-05 18:02:21 -0500
message:
jerry at samba.org (r22095) 2007-04-05 14:56:08 -0500 (Thu, 05 Apr 2007)
BUG 4484: Add more checks to set %a for Vista clients (based on absence of native OS and Lanman strings in the session setup request)
------------------------------------------------------------
merged: jpeach at samba.org-20070405230126-ynbynltka33hjtmu
parent: metze at samba.org-20070405170237-t2gytdk0fu5gw3rc
committer: jpeach at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Thu 2007-04-05 18:01:26 -0500
message:
jpeach at samba.org (r22094) 2007-04-05 14:49:29 -0500 (Thu, 05 Apr 2007)
Clarify that SMB_VFS_LOCK should not be used to get lock status.
Diff too large for email (5611 lines, the limit is 1000).
More information about the samba-cvs
mailing list