Rev 5305: merge from upstream in
http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/
Michael Adam
ma at sernet.de
Fri Mar 23 10:26:37 GMT 2007
At http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/
------------------------------------------------------------
revno: 5305
revision-id: ma at sernet.de-20070323102632-5cb2d33a5a418413
parent: ma at sernet.de-20070322230648-61daf69027f7fded
parent: jra at samba.org-20070322231625-uxwdv0hhhsrzggwg
committer: Michael Adam <ma at sernet.de>
branch nick: SAMBA_3_0-registry.bzr
timestamp: Fri 2007-03-23 11:26:32 +0100
message:
merge from upstream
modified:
REVISION REVISION-20060530022625-68239662668b41c3
source/configure.in configure.in-20060530022626-07e74bc1e326c82d
source/lib/replace/system/filesys.h filesys.h-20060919015053-50coyc2ouwpsm77j-46
source/libsmb/clientgen.c clientgen.c-20060530022627-3aad65ce54001b6b
source/libsmb/libsmbclient.c libsmbclient.c-20060530022627-e1c98e7d8c6048ca
source/nsswitch/pam_winbind.c pam_winbind.c-20060530022627-0278ec12ab28e3c8
source/nsswitch/winbind_nss_irix.c winbind_nss_irix.c-20060530022627-3d92f75f35c72cfc
source/smbd/msdfs.c msdfs.c-20060530024146-252992a3c60c990c
------------------------------------------------------------
merged: jra at samba.org-20070322231625-uxwdv0hhhsrzggwg
parent: vlendec at samba.org-20070322231455-bmy4kkonhe85i2ws
committer: jra at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Thu 2007-03-22 18:16:25 -0500
message:
jra at samba.org (r21942) 2007-03-22 17:15:35 -0500 (Thu, 22 Mar 2007)
Hoist by our own petard :-). Older smbclient binaries
were not able to connect to the rewritten dfs code as
they set the dfs flag bit but then send local paths.
Now that our dfs code is a *lot* more robust in
detecting this sort of braindamage we can just
call into it directly on getting a DFS flag
and let the parser sort it out without having
to check it's actually connecting to a dfs
enabled share (I'm proud of this code :-).
Jeremy.
------------------------------------------------------------
merged: vlendec at samba.org-20070322231455-bmy4kkonhe85i2ws
parent: jerry at samba.org-20070322231315-4hsik37ftqv743a1
committer: vlendec at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Thu 2007-03-22 18:14:55 -0500
message:
vlendec at samba.org (r21941) 2007-03-22 17:00:48 -0500 (Thu, 22 Mar 2007)
Attempt to fix bug 4460
------------------------------------------------------------
merged: jerry at samba.org-20070322231315-4hsik37ftqv743a1
parent: jra at samba.org-20070322231149-qi1crwy564viz9j0
committer: jerry at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Thu 2007-03-22 18:13:15 -0500
message:
jerry at samba.org (r21940) 2007-03-22 16:41:36 -0500 (Thu, 22 Mar 2007)
Sorry Volker, I have to revert your revert in r21935.
We can talk about this later if you still feel that strongly
but I need to fix the build for now.
------------------------------------------------------------
merged: jra at samba.org-20070322231149-qi1crwy564viz9j0
parent: vlendec at samba.org-20070322231020-tg6o2183vf2mgv5p
committer: jra at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Thu 2007-03-22 18:11:49 -0500
message:
jra at samba.org (r21939) 2007-03-22 14:41:17 -0500 (Thu, 22 Mar 2007)
Fix missing initialization that
broke the build farm. Thanks to
Metze for the heads up.
Jeremy.
------------------------------------------------------------
merged: vlendec at samba.org-20070322231020-tg6o2183vf2mgv5p
parent: metze at samba.org-20070322230835-d0mkdsiwxzgnp3cu
committer: vlendec at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Thu 2007-03-22 18:10:20 -0500
message:
vlendec at samba.org (r21935) 2007-03-22 13:36:09 -0500 (Thu, 22 Mar 2007)
Revert obviously not sufficiently tested code -- sorry for the pain. I am afraid I was basically off the net for the day
------------------------------------------------------------
merged: metze at samba.org-20070322230835-d0mkdsiwxzgnp3cu
parent: jerry at samba.org-20070322230611-bl2z4bv0fydt6hdu
committer: metze at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Thu 2007-03-22 18:08:35 -0500
message:
metze at samba.org (r21934) 2007-03-22 13:16:36 -0500 (Thu, 22 Mar 2007)
fix the build sorry
metze
------------------------------------------------------------
merged: jerry at samba.org-20070322230611-bl2z4bv0fydt6hdu
parent: metze at samba.org-20070322230328-lkttqqfkqx8g7mjf
committer: jerry at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Thu 2007-03-22 18:06:11 -0500
message:
jerry at samba.org (r21933) 2007-03-22 13:09:21 -0500 (Thu, 22 Mar 2007)
Change the write_sock() call in pam_winbind_request()
to not request a privileged pipe operation for everything
as this cannot be done from a process running under the
context of a user (e.g. screensaver).
Thanks to Danilo Almeida <dalmeida at centeris.com> for the help
in pointing out the change to write_sock().
------------------------------------------------------------
merged: metze at samba.org-20070322230328-lkttqqfkqx8g7mjf
parent: metze at samba.org-20070322230200-i3xg8pymun4x96le
committer: metze at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Thu 2007-03-22 18:03:28 -0500
message:
metze at samba.org (r21932) 2007-03-22 12:37:01 -0500 (Thu, 22 Mar 2007)
fix compiler warning.
maybe also for 3.0.25
metze
------------------------------------------------------------
merged: metze at samba.org-20070322230200-i3xg8pymun4x96le
parent: jra at samba.org-20070322050756-divqi2nud5ipdx8k
committer: metze at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Thu 2007-03-22 18:02:00 -0500
message:
metze at samba.org (r21931) 2007-03-22 12:35:34 -0500 (Thu, 22 Mar 2007)
include acl/libacl.h is present
I'm not sure if this should go into 3.0.25... it fixes a compiler warning about
a missing acl_get_perm() prototype
metze
=== modified file 'REVISION'
--- a/REVISION 2007-03-22 05:07:56 +0000
+++ b/REVISION 2007-03-22 23:16:25 +0000
@@ -2,9 +2,9 @@
URL: svn+ssh://svn.samba.org/home/svn/samba/branches/SAMBA_3_0
Repository Root: svn+ssh://svn.samba.org/home/svn/samba
Repository UUID: 0c0555d6-39d7-0310-84fc-f1cc0bd64818
-Revision: 21927
+Revision: 21942
Node Kind: directory
Last Changed Author: jra
-Last Changed Rev: 21927
-Last Changed Date: 2007-03-21 21:25:16 -0500 (Wed, 21 Mar 2007)
+Last Changed Rev: 21942
+Last Changed Date: 2007-03-22 17:15:35 -0500 (Thu, 22 Mar 2007)
=== modified file 'source/configure.in'
--- a/source/configure.in 2007-03-15 23:02:46 +0000
+++ b/source/configure.in 2007-03-22 23:02:00 +0000
@@ -918,7 +918,8 @@
AC_CHECK_HEADERS(nss.h nss_common.h nsswitch.h ns_api.h sys/security.h)
AC_CHECK_HEADERS(syscall.h sys/syscall.h)
-AC_CHECK_HEADERS(sys/acl.h sys/attributes.h attr/xattr.h sys/xattr.h sys/extattr.h sys/uio.h)
+AC_CHECK_HEADERS(sys/acl.h acl/libacl.h)
+AC_CHECK_HEADERS(sys/attributes.h attr/xattr.h sys/xattr.h sys/extattr.h sys/uio.h)
AC_CHECK_HEADERS(sys/ea.h sys/proplist.h)
AC_CHECK_HEADERS(sys/cdefs.h glob.h)
=== modified file 'source/lib/replace/system/filesys.h'
--- a/source/lib/replace/system/filesys.h 2006-09-19 01:51:33 +0000
+++ b/source/lib/replace/system/filesys.h 2007-03-22 23:08:35 +0000
@@ -41,6 +41,10 @@
#include <sys/acl.h>
#endif
+#ifdef HAVE_ACL_LIBACL_H
+#include <acl/libacl.h>
+#endif
+
#ifdef HAVE_SYS_FS_S5PARAM_H
#include <sys/fs/s5param.h>
#endif
=== modified file 'source/libsmb/clientgen.c'
--- a/source/libsmb/clientgen.c 2007-03-22 05:01:56 +0000
+++ b/source/libsmb/clientgen.c 2007-03-22 23:11:49 +0000
@@ -166,7 +166,7 @@
size_t len;
size_t nwritten=0;
ssize_t ret;
- char *buf_out;
+ char *buf_out = cli->outbuf;
/* fd == -1 causes segfaults -- Tom (tom at ninja.nl) */
if (cli->fd == -1) {
=== modified file 'source/libsmb/libsmbclient.c'
--- a/source/libsmb/libsmbclient.c 2007-03-09 00:15:08 +0000
+++ b/source/libsmb/libsmbclient.c 2007-03-22 23:03:28 +0000
@@ -500,7 +500,7 @@
smbc_check_server(SMBCCTX * context,
SMBCSRV * server)
{
- int size;
+ size_t size;
struct sockaddr addr;
/*
=== modified file 'source/nsswitch/pam_winbind.c'
--- a/source/nsswitch/pam_winbind.c 2007-03-19 23:07:50 +0000
+++ b/source/nsswitch/pam_winbind.c 2007-03-22 23:06:11 +0000
@@ -436,7 +436,7 @@
/* Fill in request and send down pipe */
init_request(request, req_type);
- if (write_sock(request, sizeof(*request), 0, 1) == -1) {
+ if (write_sock(request, sizeof(*request), 0, 0) == -1) {
_pam_log(pamh, ctrl, LOG_ERR, "pam_winbind_request: write to socket failed!");
close_sock();
return PAM_SERVICE_ERR;
=== modified file 'source/nsswitch/winbind_nss_irix.c'
--- a/source/nsswitch/winbind_nss_irix.c 2007-03-19 23:07:50 +0000
+++ b/source/nsswitch/winbind_nss_irix.c 2007-03-22 23:14:55 +0000
@@ -454,7 +454,7 @@
nsd_logprintf(NSD_LOG_MIN,
"send_next_request (winbind) %d, timeout = %d sec\n",
rq->f_cmd_data, timeout);
- status = winbindd_send_request((int)rq->f_cmd_data,request,0);
+ status = winbindd_send_request((int)rq->f_cmd_data,0,request);
SAFE_FREE(request);
if (status != NSS_STATUS_SUCCESS) {
=== modified file 'source/smbd/msdfs.c'
--- a/source/smbd/msdfs.c 2007-03-12 23:05:20 +0000
+++ b/source/smbd/msdfs.c 2007-03-22 23:16:25 +0000
@@ -1253,7 +1253,7 @@
{
NTSTATUS status = NT_STATUS_OK;
BOOL dummy;
- if (dfs_pathnames && lp_host_msdfs() && lp_msdfs_root(SNUM(conn))) {
+ if (dfs_pathnames) {
status = dfs_redirect(conn, name, False, &dummy);
}
return status;
@@ -1269,7 +1269,7 @@
NTSTATUS resolve_dfspath_wcard(connection_struct *conn, BOOL dfs_pathnames, pstring name, BOOL *ppath_contains_wcard)
{
NTSTATUS status = NT_STATUS_OK;
- if (dfs_pathnames && lp_host_msdfs() && lp_msdfs_root(SNUM(conn))) {
+ if (dfs_pathnames) {
status = dfs_redirect(conn, name, True, ppath_contains_wcard);
}
return status;
More information about the samba-cvs
mailing list