Rev 5347: merge from upstream in
http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/
Michael Adam
ma at sernet.de
Tue Apr 10 21:20:24 GMT 2007
At http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/
------------------------------------------------------------
revno: 5347
revision-id: ma at sernet.de-20070410212018-6a54e7de1e2cc21b
parent: ma at sernet.de-20070410211754-0c10dea4fd75e2ed
parent: metze at samba.org-20070410170757-9ky0kr0jt9elqesd
committer: Michael Adam <ma at sernet.de>
branch nick: SAMBA_3_0-registry.bzr
timestamp: Tue 2007-04-10 23:20:18 +0200
message:
merge from upstream
modified:
REVISION REVISION-20060530022625-68239662668b41c3
source/lib/replace/README readme-20060919015053-50coyc2ouwpsm77j-17
source/lib/replace/libreplace.m4 libreplace.m4-20060919015053-50coyc2ouwpsm77j-4
source/lib/replace/replace.c replace.c-20060919015053-50coyc2ouwpsm77j-15
source/lib/replace/test/testsuite.c testsuite.c-20060919015053-50coyc2ouwpsm77j-33
source/libads/sasl.c sasl.c-20060530022627-de2e2050d01ecfd2
source/modules/vfs_gpfs.c vfs_gpfs.c-20061109202948-faf4b3d9745o8b1q-1
source/modules/vfs_readahead.c vfs_readahead.c-20070406230344-ao2vumno0dhc4q95-1
source/smbd/quotas.c quotas.c-20060530022627-f2ef4e7853114181
------------------------------------------------------------
merged: metze at samba.org-20070410170757-9ky0kr0jt9elqesd
parent: metze at samba.org-20070410170627-m3486aijwj6n9ixx
committer: metze at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Tue 2007-04-10 12:07:57 -0500
message:
metze at samba.org (r22153) 2007-04-10 11:04:22 -0500 (Tue, 10 Apr 2007)
fix LDAP SASL "GSSAPI" bind against w2k3, this isn't critical
because we try "GSS-SPNEGO" first and all windows version support
that.
metze
------------------------------------------------------------
merged: metze at samba.org-20070410170627-m3486aijwj6n9ixx
parent: jerry at samba.org-20070410170455-qhsx1booie3brdea
committer: metze at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Tue 2007-04-10 12:06:27 -0500
message:
metze at samba.org (r22151) 2007-04-10 10:59:39 -0500 (Tue, 10 Apr 2007)
remove netgr functions from libreplace they're not used
in samba4 currently and samba3 has explicit configure checks for them.
should fix bug #4496
metze
------------------------------------------------------------
merged: jerry at samba.org-20070410170455-qhsx1booie3brdea
parent: jmcd at samba.org-20070410170304-2c1125l8y5z3kdu1
committer: jerry at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Tue 2007-04-10 12:04:55 -0500
message:
jerry at samba.org (r22149) 2007-04-10 10:41:23 -0500 (Tue, 10 Apr 2007)
BUG 4500: patch from Jorge Santos <jorge_a_santos at hotmail.com>
to fix compile bug ni quotas.c (typo calling unbecome_root()).
------------------------------------------------------------
merged: jmcd at samba.org-20070410170304-2c1125l8y5z3kdu1
parent: vlendec at samba.org-20070410110346-goj0dbrd1o0d47nu
committer: jmcd at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Tue 2007-04-10 12:03:04 -0500
message:
jmcd at samba.org (r22148) 2007-04-10 10:41:22 -0500 (Tue, 10 Apr 2007)
Fix gpfs module on posix-acl test. Adds gpfsacl_sys_set_fd (calls
_file). Thanks to Gomati Mohanan.
------------------------------------------------------------
merged: vlendec at samba.org-20070410110346-goj0dbrd1o0d47nu
parent: vlendec at samba.org-20070410110204-ckd3gjrvaaikm9c0
committer: vlendec at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Tue 2007-04-10 06:03:46 -0500
message:
vlendec at samba.org (r22147) 2007-04-10 02:36:58 -0500 (Tue, 10 Apr 2007)
Next try
------------------------------------------------------------
merged: vlendec at samba.org-20070410110204-ckd3gjrvaaikm9c0
parent: jra at samba.org-20070409230201-buciygamf58wvp0j
committer: vlendec at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Tue 2007-04-10 06:02:04 -0500
message:
vlendec at samba.org (r22146) 2007-04-10 02:33:14 -0500 (Tue, 10 Apr 2007)
Attempt to fix the build
=== modified file 'REVISION'
--- a/REVISION 2007-04-09 23:02:01 +0000
+++ b/REVISION 2007-04-10 17:07:57 +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: 22145
+Revision: 22153
Node Kind: directory
-Last Changed Author: jra
-Last Changed Rev: 22145
-Last Changed Date: 2007-04-09 16:01:46 -0500 (Mon, 09 Apr 2007)
+Last Changed Author: metze
+Last Changed Rev: 22153
+Last Changed Date: 2007-04-10 11:04:22 -0500 (Tue, 10 Apr 2007)
=== modified file 'source/lib/replace/README'
--- a/source/lib/replace/README 2007-02-16 21:19:52 +0000
+++ b/source/lib/replace/README 2007-04-10 17:06:27 +0000
@@ -12,7 +12,6 @@
strlcat
mktime
rename
-innetgr
initgroups
memmove
strdup
@@ -88,5 +87,4 @@
Prerequisites:
memset (for bzero)
syslog (for vsyslog)
-setnetgrent, getnetgrent, endnetgrent (for innetgr)
mktemp (for mkstemp and mkdtemp)
=== modified file 'source/lib/replace/libreplace.m4'
--- a/source/lib/replace/libreplace.m4 2007-02-16 21:19:52 +0000
+++ b/source/lib/replace/libreplace.m4 2007-04-10 17:06:27 +0000
@@ -150,7 +150,7 @@
AC_CHECK_FUNCS(seteuid setresuid setegid setresgid chroot bzero strerror)
AC_CHECK_FUNCS(vsyslog setlinebuf mktime ftruncate chsize rename)
-AC_CHECK_FUNCS(waitpid strlcpy strlcat innetgr initgroups memmove strdup)
+AC_CHECK_FUNCS(waitpid strlcpy strlcat initgroups memmove strdup)
AC_CHECK_FUNCS(pread pwrite strndup strcasestr strtok_r mkdtemp socketpair)
AC_HAVE_DECL(setresuid, [#include <unistd.h>])
AC_HAVE_DECL(setresgid, [#include <unistd.h>])
@@ -330,8 +330,7 @@
m4_include(timegm.m4)
m4_include(repdir.m4)
-AC_CHECK_FUNCS([syslog memset setnetgrent getnetgrent endnetgrent memcpy],,
- [AC_MSG_ERROR([Required function not found])])
+AC_CHECK_FUNCS([syslog memset memcpy],,[AC_MSG_ERROR([Required function not found])])
echo "LIBREPLACE_BROKEN_CHECKS: END"
]) dnl end AC_LIBREPLACE_BROKEN_CHECKS
=== modified file 'source/lib/replace/replace.c'
--- a/source/lib/replace/replace.c 2007-01-16 14:03:41 +0000
+++ b/source/lib/replace/replace.c 2007-04-10 17:06:27 +0000
@@ -154,33 +154,6 @@
#endif /* !HAVE_MKTIME */
-#ifndef HAVE_INNETGR
-#if defined(HAVE_SETNETGRENT) && defined(HAVE_GETNETGRENT) && defined(HAVE_ENDNETGRENT)
-/*
- * Search for a match in a netgroup. This replaces it on broken systems.
- */
-int rep_innetgr(const char *group, const char *host, const char *user,
- const char *dom)
-{
- char *hst, *usr, *dm;
-
- setnetgrent(group);
- while (getnetgrent(&hst, &usr, &dm)) {
- if (((host == 0) || (hst == 0) || !strcmp(host, hst)) &&
- ((user == 0) || (usr == 0) || !strcmp(user, usr)) &&
- ((dom == 0) || (dm == 0) || !strcmp(dom, dm))) {
- endnetgrent();
- return (1);
- }
- }
- endnetgrent();
- return (0);
-}
-#endif /* HAVE_SETNETGRENT HAVE_GETNETGRENT HAVE_ENDNETGRENT */
-#endif /* HAVE_INNETGR */
-
-
-
#ifndef HAVE_INITGROUPS
/****************************************************************************
some systems don't have an initgroups call
=== modified file 'source/lib/replace/test/testsuite.c'
--- a/source/lib/replace/test/testsuite.c 2007-01-16 14:05:09 +0000
+++ b/source/lib/replace/test/testsuite.c 2007-04-10 17:06:27 +0000
@@ -125,12 +125,6 @@
return true;
}
-static int test_innetgr(void)
-{
- /* FIXME */
- return true;
-}
-
static int test_initgroups(void)
{
/* FIXME */
@@ -426,7 +420,6 @@
ret &= test_strlcpy();
ret &= test_strlcat();
ret &= test_mktime();
- ret &= test_innetgr();
ret &= test_initgroups();
ret &= test_memmove();
ret &= test_strdup();
=== modified file 'source/libads/sasl.c'
--- a/source/libads/sasl.c 2007-04-05 17:01:51 +0000
+++ b/source/libads/sasl.c 2007-04-10 17:07:57 +0000
@@ -441,7 +441,8 @@
gss_release_buffer(&minor_status, &output_token);
- output_token.value = SMB_MALLOC(strlen(ads->config.bind_path) + 8);
+ output_token.length = 4;
+ output_token.value = SMB_MALLOC(output_token.length);
p = (uint8 *)output_token.value;
*p++ = 1; /* no sign & seal selection */
@@ -449,10 +450,14 @@
*p++ = max_msg_size>>16;
*p++ = max_msg_size>>8;
*p++ = max_msg_size;
- snprintf((char *)p, strlen(ads->config.bind_path)+4, "dn:%s", ads->config.bind_path);
- p += strlen((const char *)p);
-
- output_token.length = PTR_DIFF(p, output_token.value);
+ /*
+ * we used to add sprintf("dn:%s", ads->config.bind_path) here.
+ * but using ads->config.bind_path is the wrong! It should be
+ * the DN of the user object!
+ *
+ * w2k3 gives an error when we send an incorrect DN, but sending nothing
+ * is ok and matches the information flow used in GSS-SPNEGO.
+ */
gss_rc = gss_wrap(&minor_status, context_handle,0,GSS_C_QOP_DEFAULT,
&output_token, (int *)&conf_state,
=== modified file 'source/modules/vfs_gpfs.c'
--- a/source/modules/vfs_gpfs.c 2007-02-14 12:58:00 +0000
+++ b/source/modules/vfs_gpfs.c 2007-04-10 17:03:04 +0000
@@ -597,8 +597,7 @@
files_struct *fsp,
int fd, SMB_ACL_T theacl)
{
- errno = ENOTSUP;
- return -1;
+ return gpfsacl_sys_acl_set_file(handle, fsp->fsp_name, SMB_ACL_TYPE_ACCESS, theacl);
}
int gpfsacl_sys_acl_delete_def_file(vfs_handle_struct *handle,
=== modified file 'source/modules/vfs_readahead.c'
--- a/source/modules/vfs_readahead.c 2007-04-08 23:01:58 +0000
+++ b/source/modules/vfs_readahead.c 2007-04-10 11:03:46 +0000
@@ -101,12 +101,12 @@
(unsigned int)rhd->len,
err ));
#elif defined(HAVE_POSIX_FADVISE)
- int err = posix_fadvise(fromfd, offset, (off_t)rhd->len, POSIX_FADV_WILLNEED);
+ int err = posix_fadvise(fd, offset, (off_t)rhd->len, POSIX_FADV_WILLNEED);
DEBUG(10,("readahead_pread: posix_fadvise on fd %u, offset %llu, len %u returned %d\n",
(unsigned int)fd,
(unsigned long long)offset,
(unsigned int)rhd->len,
- (err ));
+ err ));
#else
if (!rhd->didmsg) {
DEBUG(0,("readahead_pread: no readahead on this platform\n"));
=== modified file 'source/smbd/quotas.c'
--- a/source/smbd/quotas.c 2007-04-06 05:01:25 +0000
+++ b/source/smbd/quotas.c 2007-04-10 17:04:55 +0000
@@ -662,7 +662,7 @@
BOOL retval;
DEBUG(5,("disk_quotas: looking for mountpath (NFS) \"%s\"\n", mnt.mnt_special));
retval = nfs_quotas(mnt.mnt_special, euser_id, bsize, dfree, dsize);
- unbecome();
+ unbecome_root();
return retval;
}
More information about the samba-cvs
mailing list