Rev 5293: merge from upstream in
http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/
Michael Adam
ma at sernet.de
Tue Mar 20 15:27:10 GMT 2007
At http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/
------------------------------------------------------------
revno: 5293
revision-id: ma at sernet.de-20070320152704-aaf42e1b9a7b1f4f
parent: ma at sernet.de-20070320152051-87cfd94a35b0d6b4
parent: ab at samba.org-20070320110156-vu2wo42qnbkak37f
committer: Michael Adam <ma at sernet.de>
branch nick: SAMBA_3_0-registry.bzr
timestamp: Tue 2007-03-20 16:27:04 +0100
message:
merge from upstream
added:
source/smbd/seal.c seal.c-20070320050326-brtwj05flzzelvyk-1
modified:
REVISION REVISION-20060530022625-68239662668b41c3
source/Makefile.in Makefile.in-20060530022626-b16dac2328ebe703
source/auth/auth_winbind.c auth_winbind.c-20060530022627-09c165124490559d
source/include/client.h client.h-20060530022627-f51e99ba840436e5
source/include/includes.h includes.h-20060530022627-d1a059a99c05e8be
source/include/nt_printing.h nt_printing.h-20060530022627-f5bb62efe0a9d4af
source/lib/dummysmbd.c dummysmbd.c-20060530022627-0881298f6c26bb01
source/lib/util_sock.c util_sock.c-20060530022627-30f22f2d8b038b4b
source/libsmb/clientgen.c clientgen.c-20060530022627-3aad65ce54001b6b
source/libsmb/smb_seal.c smb_seal.c-20070317050048-jthijp4m79ic4h3q-1
source/modules/nfs4_acls.c nfs4_acls.c-20060919014541-p8h6pru3wr0qvdka-1
source/modules/vfs_full_audit.c vfs_full_audit.c-20060530024110-460abfb36ee47358
source/nsswitch/idmap.c idmap.c-20061212152801-ke1ub3n5v1jjf8gy-1
source/nsswitch/pam_winbind.c pam_winbind.c-20060530022627-0278ec12ab28e3c8
source/nsswitch/wb_common.c wb_common.c-20060530022627-fd2c8495f15615ad
source/nsswitch/winbind_client.h winbind_client.h-20060530022627-d5b7fdf46493f021
source/nsswitch/winbind_nss_irix.c winbind_nss_irix.c-20060530022627-3d92f75f35c72cfc
source/nsswitch/winbindd_util.c winbindd_util.c-20060530022627-e014c9e53147dffe
source/param/loadparm.c loadparm.c-20060530022627-1efa1edb3eb0e897
source/passdb/pdb_interface.c pdb_interface.c-20060530022627-3c8946ee9faabfaa
source/printing/nt_printing.c nt_printing.c-20060530022627-6f18c47e6548d98a
source/smbd/blocking.c blocking.c-20060530022627-b43dcc35e2ddb440
source/smbd/process.c process.c-20060530022627-8fe40017fe0e41ff
source/smbd/server.c server.c-20060530022627-212a418ec1144979
source/smbd/sesssetup.c sesssetup.c-20060530022627-0a6efae905e1529e
source/smbd/trans2.c trans2.c-20060530022627-7ce34cd85c3f02f5
------------------------------------------------------------
merged: ab at samba.org-20070320110156-vu2wo42qnbkak37f
parent: jerry at samba.org-20070320050632-kkdgohuvo0p03vxm
committer: ab at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Tue 2007-03-20 06:01:56 -0500
message:
ab at samba.org (r21885) 2007-03-20 03:17:27 -0500 (Tue, 20 Mar 2007)
Chown logic should be activated only if nfs4:chown=yes
------------------------------------------------------------
merged: jerry at samba.org-20070320050632-kkdgohuvo0p03vxm
parent: jra at samba.org-20070320050507-d6iobbch3gn5jf8w
committer: jerry at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Tue 2007-03-20 00:06:32 -0500
message:
jerry at samba.org (r21884) 2007-03-19 21:43:20 -0500 (Mon, 19 Mar 2007)
* Blacklist BUILTIN and MACHINE domains from the
idmap domains as these should only be handled by the
winbindd_passdb.c backend
* Allow the alloc init to fail for backwards compatible
configurations like
idmap backend = ad
idmap uid = 1000-100000
....
* Remove the deprecated flags from idmap backend, et. al.
These are mutually exclusive with the new configuration
options (idmap domains). Logging annoying messages
about deprecated parameters is confusing. So we'll try
this apprpach for now.
------------------------------------------------------------
merged: jra at samba.org-20070320050507-d6iobbch3gn5jf8w
parent: jra at samba.org-20070320050329-2inqezx9dn9d6gke
committer: jra at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Tue 2007-03-20 00:05:07 -0500
message:
jra at samba.org (r21883) 2007-03-19 21:20:16 -0500 (Mon, 19 Mar 2007)
Try and fix the build by removing the prototypes for
functions that take a gss context handle in includes.h
Jeremy.
------------------------------------------------------------
merged: jra at samba.org-20070320050329-2inqezx9dn9d6gke
parent: jpeach at samba.org-20070320050158-3rk6d52bgqavwvf8
committer: jra at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Tue 2007-03-20 00:03:29 -0500
message:
jra at samba.org (r21882) 2007-03-19 20:17:47 -0500 (Mon, 19 Mar 2007)
The server part of the code has to use an AUTH_NTLMSSP struct,
not just an NTLMSSP - grr. This complicates the re-use of
common client and server code but I think I've got it right.
Not turned on of valgrinded yet, but you can see it start
to take shape !
Jeremy.
------------------------------------------------------------
merged: jpeach at samba.org-20070320050158-3rk6d52bgqavwvf8
parent: jra at samba.org-20070319231309-syijb6srifeh18l0
committer: jpeach at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Tue 2007-03-20 00:01:58 -0500
message:
jpeach at samba.org (r21881) 2007-03-19 19:13:42 -0500 (Mon, 19 Mar 2007)
Make sure we are very specific when testing whether a backand can handle a
particular SID. Make sure that the passdb backend will accept the same set
range of local SIDs that the idmap system sends it.
Simo, Jerry - this is a 3_0_25 candidate. Can you please review?
------------------------------------------------------------
merged: jra at samba.org-20070319231309-syijb6srifeh18l0
parent: vlendec at samba.org-20070319231013-jz070o2mcgpg1o3h
committer: jra at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Mon 2007-03-19 18:13:09 -0500
message:
jra at samba.org (r21880) 2007-03-19 17:45:35 -0500 (Mon, 19 Mar 2007)
Make client and server calls into encryption code symetrical,
depending on encryption context pointer.
Jeremy.
------------------------------------------------------------
merged: vlendec at samba.org-20070319231013-jz070o2mcgpg1o3h
parent: vlendec at samba.org-20070319230750-5su8bjp6098c5xx7
committer: vlendec at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Mon 2007-03-19 18:10:13 -0500
message:
vlendec at samba.org (r21879) 2007-03-19 16:52:27 -0500 (Mon, 19 Mar 2007)
Move process_blocking_lock_queue to a timed event.
The idea is that we have blocking.c:brl_timeout as a timed
event that is present whenever we do have a blocking lock
pending. It fires brl_timeout_fn() which calls
process_blocking_lock_queue().
Whenever we make changes to blocking_lock_queue, we trigger
a recalc_brl_timeout() which sets a new brl_timout event if
necessary. This makes the call to
blocking_locks_timeout_ms() in setup_select_timeout()
unnecessary, this is implicitly done in
event_add_to_select_args() from the timed events.
Volker
------------------------------------------------------------
merged: vlendec at samba.org-20070319230750-5su8bjp6098c5xx7
parent: jra at samba.org-20070319230631-y3kiso5lmf33s6o3
committer: vlendec at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Mon 2007-03-19 18:07:50 -0500
message:
vlendec at samba.org (r21878) 2007-03-19 16:04:56 -0500 (Mon, 19 Mar 2007)
Fix a bug with smbd serving a windows terminal server: If winbind decides smbd
to be idle it might happen that smbd needs to do a winbind operation (for
example sid2name) as non-root. This then fails to get the privileged
pipe. When later on on the same connection another authentication request
comes in, we try to do the CRAP auth via the non-privileged pipe.
This adds a winbindd_priv_request_response() request that kills the existing
winbind pipe connection if it's not privileged.
Volker
------------------------------------------------------------
merged: jra at samba.org-20070319230631-y3kiso5lmf33s6o3
parent: jra at samba.org-20070319230431-z9db4d3bhj3ucji5
committer: jra at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Mon 2007-03-19 18:06:31 -0500
message:
jra at samba.org (r21877) 2007-03-19 16:03:30 -0500 (Mon, 19 Mar 2007)
Missed one line.
Jeremy.
------------------------------------------------------------
merged: jra at samba.org-20070319230431-z9db4d3bhj3ucji5
parent: jerry at samba.org-20070319230302-ee9sx1gmrred9tmi
committer: jra at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Mon 2007-03-19 18:04:31 -0500
message:
jra at samba.org (r21876) 2007-03-19 15:39:58 -0500 (Mon, 19 Mar 2007)
Start adding in the seal implementation - prototype code
for the server side enc. (doesn't break anything).
I'll keep updating this until I've got NTLM seal working
on both client and server, then add in the gss level
seal.
Jeremy.
------------------------------------------------------------
merged: jerry at samba.org-20070319230302-ee9sx1gmrred9tmi
parent: jra at samba.org-20070319230146-vkodc2yb3prurqc0
committer: jerry at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Mon 2007-03-19 18:03:02 -0500
message:
jerry at samba.org (r21875) 2007-03-19 12:45:13 -0500 (Mon, 19 Mar 2007)
BUG 3275: Patch from Andy Polyakov <appro at fy.chalmers.se>
Relax check for i386 header checks in the PE header of printer
driver files. Thus allowing uploading of x64 print drivers
from 64bit Windows clients.
------------------------------------------------------------
merged: jra at samba.org-20070319230146-vkodc2yb3prurqc0
parent: vlendec at samba.org-20070319170307-0jvgmug7174bd1e1
committer: jra at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Mon 2007-03-19 18:01:46 -0500
message:
jra at samba.org (r21874) 2007-03-19 12:02:15 -0500 (Mon, 19 Mar 2007)
Fix missing notify function. Thanks to Thomas Bork <tombork at web.de>
for pointing this out !
Jeremy.
------------------------------------------------------------
merged: vlendec at samba.org-20070319170307-0jvgmug7174bd1e1
parent: vlendec at samba.org-20070319170143-vjusx64vabvvsdpg
committer: vlendec at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Mon 2007-03-19 12:03:07 -0500
message:
vlendec at samba.org (r21873) 2007-03-19 07:54:39 -0500 (Mon, 19 Mar 2007)
This is winbindd_pam.c, not pam_winbind.c :-)
------------------------------------------------------------
merged: vlendec at samba.org-20070319170143-vjusx64vabvvsdpg
parent: vlendec at samba.org-20070318170151-w37lib8lucvmdrm8
committer: vlendec at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Mon 2007-03-19 12:01:43 -0500
message:
vlendec at samba.org (r21872) 2007-03-19 07:51:13 -0500 (Mon, 19 Mar 2007)
Fix a debug message
Diff too large for email (1558 lines, the limit is 1000).
More information about the samba-cvs
mailing list