Build status as of Sat Aug 16 00:00:03 2008
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2008-08-15 00:00:39.0 + +++ /home/build/master/cache/broken_results.txt 2008-08-16 00:00:43.0 + @@ -1,4 +1,4 @@ -Build status as of Fri Aug 15 00:00:02 2008 +Build status as of Sat Aug 16 00:00:03 2008 Build counts: Tree Total Broken Panic @@ -6,18 +6,18 @@ ccache 31 9 0 ctdb 0 0 0 distcc 1 0 0 -ldb 32 31 0 +ldb 31 30 0 libreplace 31 11 0 -lorikeet-heimdal 27 20 0 -pidl 17 9 0 +lorikeet-heimdal 26 20 0 +pidl 18 9 0 ppp 10 0 0 rsync32 12 0 samba-docs 0 0 0 -samba-gtk7 7 0 +samba-gtk6 6 0 samba_3_X_devel 27 21 0 -samba_3_X_test 29 24 0 -samba_4_0_test 31 24 0 -smb-build31 5 0 +samba_3_X_test 28 24 0 +samba_4_0_test 30 24 0 +smb-build30 5 0 talloc 30 5 0 -tdb 32 12 0 +tdb 31 12 0
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha5-296-g88cf5d8
The branch, v4-0-test has been updated
via 88cf5d8b708d6247772b33128f0e212a4c2e9ba8 (commit)
via b10d4723891c39693100bfaaf1ac29adce9f7a86 (commit)
via 1f4bf8fbd5bfc9c58bb5668fe25586766605b268 (commit)
via eea4f597acf743fa783be3e5809e24aebc79f238 (commit)
via f9c15b817a24bed26a339479c53fc2f5cc5b36df (commit)
via f05a9fe46ff428e48be9a5af4a6769cd78712c11 (commit)
via ed4a6e780a3f57854338520e4608cfc8dce4ef3e (commit)
via dd07dcbc916236d80d9a7087860a6f504bbb09e8 (commit)
via 3bf8116531d4eb0cc25bc7bac70ae3c77642a5a3 (commit)
via 1304eda283b29fff8960633b1329c0a1611e1ca3 (commit)
via eafde5bee0a68fd4cf61ae64dfb24e4deb16b95a (commit)
via 837d0b3eb213ce6d0ce5345308d1b42ae2b08d67 (commit)
via 91fcaac68b215461a13c1b517f6cede29af5e55c (commit)
from 7361821b21ef78c564c41466783048606a0b6e98 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -
commit 88cf5d8b708d6247772b33128f0e212a4c2e9ba8
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Sat Aug 16 00:37:26 2008 +0200
configure: use AS_HELP_STRING for --with-disable-ext-lib
Michael
commit b10d4723891c39693100bfaaf1ac29adce9f7a86
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Sat Aug 16 00:35:52 2008 +0200
configure: use AS_HELP_STRING for --enable-developer
Michael
commit 1f4bf8fbd5bfc9c58bb5668fe25586766605b268
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Sat Aug 16 00:34:43 2008 +0200
configure: use AS_HELP_STRING for --enable-debug.
Michael
commit eea4f597acf743fa783be3e5809e24aebc79f238
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Sat Aug 16 00:33:04 2008 +0200
configure: use AS_HELP_STRING for --with-selftest-prefix.
Michael
commit f9c15b817a24bed26a339479c53fc2f5cc5b36df
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Sat Aug 16 00:31:23 2008 +0200
configure: use AS_HELP_STRING for --with-logfilebase.
Michael
commit f05a9fe46ff428e48be9a5af4a6769cd78712c11
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Sat Aug 16 00:30:02 2008 +0200
configure: use AS_HELP_STRING for --with-piddir
Michael
commit ed4a6e780a3f57854338520e4608cfc8dce4ef3e
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Sat Aug 16 00:28:36 2008 +0200
configure: use AS_HELP_STRING for --with-lockdir.
Michael
commit dd07dcbc916236d80d9a7087860a6f504bbb09e8
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Sat Aug 16 00:27:15 2008 +0200
configure: use AS_HELP_STRING for --ntp-signd-socket-dir.
Michael
commit 3bf8116531d4eb0cc25bc7bac70ae3c77642a5a3
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Sat Aug 16 00:25:42 2008 +0200
configure: use AS_HELP_STRING for --with-winbindd-privileged-socket-dir.
Michael
commit 1304eda283b29fff8960633b1329c0a1611e1ca3
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Sat Aug 16 00:25:09 2008 +0200
configure: use AS_HELP_STRING for --with-winbindd-socket-dir .
Michael
commit eafde5bee0a68fd4cf61ae64dfb24e4deb16b95a
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Sat Aug 16 00:13:34 2008 +0200
configure: use AS_HELP_STRING for --with-privatedir
Michael
commit 837d0b3eb213ce6d0ce5345308d1b42ae2b08d67
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Sat Aug 16 00:07:54 2008 +0200
configure: format help string for --with-fhs with AS_HELP_STRING().
Michael
commit 91fcaac68b215461a13c1b517f6cede29af5e55c
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Sat Aug 16 00:23:47 2008 +0200
configure: remove duplicate definition of --with-winbindd-socket-dir.
I think this should have gone with fa361354433fb9a5c09c84997a7c51f3052c294e.
Michael
---
Summary of changes:
source/build/m4/check_path.m4 | 40
1 files changed, 12 insertions(+), 28 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/build/m4/check_path.m4 b/source/build/m4/check_path.m4
index a209a4b..c45a803 100644
--- a/source/build/m4/check_path.m4
+++ b/source/build/m4/check_path.m4
@@ -24,7 +24,7 @@
winbindd_privileged_socket_dir="${localstatedir}/lib/winbindd_privileged"
ntp_signd_socket_dir="${localstatedir}/run/ntp_signd"
AC_ARG_WITH(fhs,
-[ --with-fhs Use FHS-compliant paths (default=no)],
+[AS_HELP_STRING([--with-fhs],[Use FHS-compliant paths (default=no)])],
lockdir="${localstatedir}/lib/samba"
piddir="${localstatedir}/run/samba"
logfilebase="${localstatedir}/log/samba"
@@ -41,7 +41,7 @@ AC_ARG_WITH(fhs,
#
# set private directory location
AC_ARG_WITH(privatedir,
-[ --with-privatedir=DIR Where to put sam.ldb and other private files
containing key material ($ac_default_prefix/private)],
+[AS_
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3728-ga2b9857
The branch, v3-3-test has been updated
via a2b985751fa6f02ac30c3cef3504a51676a43e92 (commit)
from ab46a73a88d334691c5a00311a02f9a2cbbec63a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit a2b985751fa6f02ac30c3cef3504a51676a43e92
Author: Herb Lewis <[EMAIL PROTECTED]>
Date: Fri Aug 15 15:30:38 2008 -0700
I think the problem with these functions is that lookup_usergroups
should never include the user SID.
The comment for the function in winbindd/winbindd_ads.c says
/* Lookup groups a user is a member of. */
The following patch makes the wbinfo calls return the correct data
before and after a login.
binfo --user-domgroups and --user-sids
---
Summary of changes:
source/lib/util_sid.c | 34 +-
source/winbindd/winbindd_util.c |2 +-
2 files changed, 18 insertions(+), 18 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/util_sid.c b/source/lib/util_sid.c
index 6b83f9c..53614ed 100644
--- a/source/lib/util_sid.c
+++ b/source/lib/util_sid.c
@@ -678,9 +678,7 @@ NTSTATUS sid_array_from_info3(TALLOC_CTX *mem_ctx,
int i;
if (include_user_group_rid) {
-
- if (!sid_compose(&sid, info3->base.domain_sid, info3->base.rid))
- {
+ if (!sid_compose(&sid, info3->base.domain_sid,
info3->base.rid)) {
DEBUG(3, ("could not compose user SID from rid 0x%x\n",
info3->base.rid));
return NT_STATUS_INVALID_PARAMETER;
@@ -691,25 +689,27 @@ NTSTATUS sid_array_from_info3(TALLOC_CTX *mem_ctx,
info3->base.rid));
return status;
}
+ }
- if (!sid_compose(&sid, info3->base.domain_sid,
info3->base.primary_gid))
- {
- DEBUG(3, ("could not compose group SID from rid 0x%x\n",
- info3->base.primary_gid));
- return NT_STATUS_INVALID_PARAMETER;
- }
- status = add_sid_to_array(mem_ctx, &sid, &sid_array, &num_sids);
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(3, ("could not append group SID from rid 0x%x\n",
- info3->base.rid));
- return status;
- }
+ if (!sid_compose(&sid, info3->base.domain_sid,
info3->base.primary_gid)) {
+ DEBUG(3, ("could not compose group SID from rid 0x%x\n",
+ info3->base.primary_gid));
+ return NT_STATUS_INVALID_PARAMETER;
+ }
+ status = add_sid_to_array(mem_ctx, &sid, &sid_array, &num_sids);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(3, ("could not append group SID from rid 0x%x\n",
+ info3->base.rid));
+ return status;
}
for (i = 0; i < info3->base.groups.count; i++) {
+ /* Don't add the primary group sid twice. */
+ if (info3->base.primary_gid == info3->base.groups.rids[i].rid) {
+ continue;
+ }
if (!sid_compose(&sid, info3->base.domain_sid,
-info3->base.groups.rids[i].rid))
- {
+info3->base.groups.rids[i].rid)) {
DEBUG(3, ("could not compose SID from additional group "
"rid 0x%x\n",
info3->base.groups.rids[i].rid));
return NT_STATUS_INVALID_PARAMETER;
diff --git a/source/winbindd/winbindd_util.c b/source/winbindd/winbindd_util.c
index f1da578..77b1778 100644
--- a/source/winbindd/winbindd_util.c
+++ b/source/winbindd/winbindd_util.c
@@ -1333,7 +1333,7 @@ NTSTATUS lookup_usergroups_cached(struct winbindd_domain
*domain,
status = sid_array_from_info3(mem_ctx, info3,
user_sids,
&num_groups,
- true, true);
+ false, true);
if (!NT_STATUS_IS_OK(status)) {
TALLOC_FREE(info3);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2918-gecf96a2
The branch, v3-2-test has been updated
via ecf96a26bfe18899133d68032b0cda00177d57d0 (commit)
from 402da4046160b01d873cba72033ed7cfc7e21387 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit ecf96a26bfe18899133d68032b0cda00177d57d0
Author: Herb Lewis <[EMAIL PROTECTED]>
Date: Fri Aug 15 15:30:40 2008 -0700
I think the problem with these functions is that lookup_usergroups
should never include the user SID.
The comment for the function in winbindd/winbindd_ads.c says
/* Lookup groups a user is a member of. */
The following patch makes the wbinfo calls return the correct data
before and after a login.
---
Summary of changes:
source/lib/util_sid.c | 34 +-
source/winbindd/winbindd_util.c |2 +-
2 files changed, 18 insertions(+), 18 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/util_sid.c b/source/lib/util_sid.c
index 6b83f9c..53614ed 100644
--- a/source/lib/util_sid.c
+++ b/source/lib/util_sid.c
@@ -678,9 +678,7 @@ NTSTATUS sid_array_from_info3(TALLOC_CTX *mem_ctx,
int i;
if (include_user_group_rid) {
-
- if (!sid_compose(&sid, info3->base.domain_sid, info3->base.rid))
- {
+ if (!sid_compose(&sid, info3->base.domain_sid,
info3->base.rid)) {
DEBUG(3, ("could not compose user SID from rid 0x%x\n",
info3->base.rid));
return NT_STATUS_INVALID_PARAMETER;
@@ -691,25 +689,27 @@ NTSTATUS sid_array_from_info3(TALLOC_CTX *mem_ctx,
info3->base.rid));
return status;
}
+ }
- if (!sid_compose(&sid, info3->base.domain_sid,
info3->base.primary_gid))
- {
- DEBUG(3, ("could not compose group SID from rid 0x%x\n",
- info3->base.primary_gid));
- return NT_STATUS_INVALID_PARAMETER;
- }
- status = add_sid_to_array(mem_ctx, &sid, &sid_array, &num_sids);
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(3, ("could not append group SID from rid 0x%x\n",
- info3->base.rid));
- return status;
- }
+ if (!sid_compose(&sid, info3->base.domain_sid,
info3->base.primary_gid)) {
+ DEBUG(3, ("could not compose group SID from rid 0x%x\n",
+ info3->base.primary_gid));
+ return NT_STATUS_INVALID_PARAMETER;
+ }
+ status = add_sid_to_array(mem_ctx, &sid, &sid_array, &num_sids);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(3, ("could not append group SID from rid 0x%x\n",
+ info3->base.rid));
+ return status;
}
for (i = 0; i < info3->base.groups.count; i++) {
+ /* Don't add the primary group sid twice. */
+ if (info3->base.primary_gid == info3->base.groups.rids[i].rid) {
+ continue;
+ }
if (!sid_compose(&sid, info3->base.domain_sid,
-info3->base.groups.rids[i].rid))
- {
+info3->base.groups.rids[i].rid)) {
DEBUG(3, ("could not compose SID from additional group "
"rid 0x%x\n",
info3->base.groups.rids[i].rid));
return NT_STATUS_INVALID_PARAMETER;
diff --git a/source/winbindd/winbindd_util.c b/source/winbindd/winbindd_util.c
index a35ba7b..9b626d1 100644
--- a/source/winbindd/winbindd_util.c
+++ b/source/winbindd/winbindd_util.c
@@ -1299,7 +1299,7 @@ NTSTATUS lookup_usergroups_cached(struct winbindd_domain
*domain,
status = sid_array_from_info3(mem_ctx, info3,
user_sids,
&num_groups,
- true, true);
+ false, true);
if (!NT_STATUS_IS_OK(status)) {
TALLOC_FREE(info3);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-3749-g7849938
The branch, v3-devel has been updated
via 7849938906a9c859805cbaeca66fae9d3c515aad (commit)
from 03de8c1955a85f2e3e9f947309e09023138a1591 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -
commit 7849938906a9c859805cbaeca66fae9d3c515aad
Author: Herb Lewis <[EMAIL PROTECTED]>
Date: Fri Aug 15 15:28:23 2008 -0700
I think the problem with these functions is that lookup_usergroups
should never include the user SID.
The comment for the function in winbindd/winbindd_ads.c says
/* Lookup groups a user is a member of. */
The following patch makes the wbinfo calls return the correct data
before and after a login.
wbinfo --user-domgroups and --user-sids
---
Summary of changes:
source/lib/util_sid.c | 34 +-
source/winbindd/winbindd_util.c |2 +-
2 files changed, 18 insertions(+), 18 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/util_sid.c b/source/lib/util_sid.c
index 6b83f9c..53614ed 100644
--- a/source/lib/util_sid.c
+++ b/source/lib/util_sid.c
@@ -678,9 +678,7 @@ NTSTATUS sid_array_from_info3(TALLOC_CTX *mem_ctx,
int i;
if (include_user_group_rid) {
-
- if (!sid_compose(&sid, info3->base.domain_sid, info3->base.rid))
- {
+ if (!sid_compose(&sid, info3->base.domain_sid,
info3->base.rid)) {
DEBUG(3, ("could not compose user SID from rid 0x%x\n",
info3->base.rid));
return NT_STATUS_INVALID_PARAMETER;
@@ -691,25 +689,27 @@ NTSTATUS sid_array_from_info3(TALLOC_CTX *mem_ctx,
info3->base.rid));
return status;
}
+ }
- if (!sid_compose(&sid, info3->base.domain_sid,
info3->base.primary_gid))
- {
- DEBUG(3, ("could not compose group SID from rid 0x%x\n",
- info3->base.primary_gid));
- return NT_STATUS_INVALID_PARAMETER;
- }
- status = add_sid_to_array(mem_ctx, &sid, &sid_array, &num_sids);
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(3, ("could not append group SID from rid 0x%x\n",
- info3->base.rid));
- return status;
- }
+ if (!sid_compose(&sid, info3->base.domain_sid,
info3->base.primary_gid)) {
+ DEBUG(3, ("could not compose group SID from rid 0x%x\n",
+ info3->base.primary_gid));
+ return NT_STATUS_INVALID_PARAMETER;
+ }
+ status = add_sid_to_array(mem_ctx, &sid, &sid_array, &num_sids);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(3, ("could not append group SID from rid 0x%x\n",
+ info3->base.rid));
+ return status;
}
for (i = 0; i < info3->base.groups.count; i++) {
+ /* Don't add the primary group sid twice. */
+ if (info3->base.primary_gid == info3->base.groups.rids[i].rid) {
+ continue;
+ }
if (!sid_compose(&sid, info3->base.domain_sid,
-info3->base.groups.rids[i].rid))
- {
+info3->base.groups.rids[i].rid)) {
DEBUG(3, ("could not compose SID from additional group "
"rid 0x%x\n",
info3->base.groups.rids[i].rid));
return NT_STATUS_INVALID_PARAMETER;
diff --git a/source/winbindd/winbindd_util.c b/source/winbindd/winbindd_util.c
index f1da578..77b1778 100644
--- a/source/winbindd/winbindd_util.c
+++ b/source/winbindd/winbindd_util.c
@@ -1333,7 +1333,7 @@ NTSTATUS lookup_usergroups_cached(struct winbindd_domain
*domain,
status = sid_array_from_info3(mem_ctx, info3,
user_sids,
&num_groups,
- true, true);
+ false, true);
if (!NT_STATUS_IS_OK(status)) {
TALLOC_FREE(info3);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3727-gab46a73
The branch, v3-3-test has been updated via ab46a73a88d334691c5a00311a02f9a2cbbec63a (commit) from 8b44a19c6cf2bc74fcfa4fbc6199e50acd47e0d7 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit ab46a73a88d334691c5a00311a02f9a2cbbec63a Author: Michael Adam <[EMAIL PROTECTED]> Date: Fri Aug 15 23:17:48 2008 +0200 build: fix a typo in the installlibtalloc rule. The symlink liballoc.so -> libtalloc.so.1 would have been created unconditionally, independent of the existence of libtalloc.so.1. Michael (cherry picked from commit 04974818bda75c4315ad09b623e5df55c87dbc87) --- Summary of changes: source/Makefile.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/Makefile.in b/source/Makefile.in index b965262..938d711 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -1599,7 +1599,7 @@ installlibtalloc:: installdirs libtalloc @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR) -$(INSTALLLIBCMD_SH) $(LIBTALLOC_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR) @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)` - -if test -e $(LIBTALLOC_SHARD_TARGET_SONAME) ; then \ + -if test -e $(LIBTALLOC_SHARED_TARGET_SONAME) ; then \ ln -s -f `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` \ $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)` ; \ fi -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2917-g402da40
The branch, v3-2-test has been updated via 402da4046160b01d873cba72033ed7cfc7e21387 (commit) from 41d440c3198752281556699cc9744b490b9b0a5e (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 402da4046160b01d873cba72033ed7cfc7e21387 Author: Michael Adam <[EMAIL PROTECTED]> Date: Fri Aug 15 23:17:48 2008 +0200 build: fix a typo in the installlibtalloc rule. The symlink liballoc.so -> libtalloc.so.1 would have been created unconditionally, independent of the existence of libtalloc.so.1. Michael (cherry picked from commit 04974818bda75c4315ad09b623e5df55c87dbc87) --- Summary of changes: source/Makefile.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/Makefile.in b/source/Makefile.in index 8df9d66..327cc3f 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -1575,7 +1575,7 @@ installlibtalloc:: installdirs libtalloc @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR) -$(INSTALLLIBCMD_SH) $(LIBTALLOC_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR) @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)` - -if test -e $(LIBTALLOC_SHARD_TARGET_SONAME) ; then \ + -if test -e $(LIBTALLOC_SHARED_TARGET_SONAME) ; then \ ln -s -f `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` \ $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)` ; \ fi -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-3748-g03de8c1
The branch, v3-devel has been updated
via 03de8c1955a85f2e3e9f947309e09023138a1591 (commit)
via 256977cf05cb4c4073ece1389a7e4939b18f5f13 (commit)
via c1d53b7c767275b39dc8ecfcd5b6129ee2cabb6d (commit)
from 81030e49ce344260d279a3112b13a21ce3520748 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -
commit 03de8c1955a85f2e3e9f947309e09023138a1591
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Fri Aug 15 15:55:17 2008 +0200
configure: use libdir=${prefix}/lib and modules=${libdir}/samba as default
with-fhs.
This is what one actually wants:
Shared/static libs in /usr/lib, shared modules and so on in /usr/lib/samba.
Michael
commit 256977cf05cb4c4073ece1389a7e4939b18f5f13
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Fri Aug 15 14:38:41 2008 +0200
configure: use ${libdir} instead of \${LIBDIR}.
Now after removing --with-libdir, the value of ${libdir} won't change
anymore at that stage, so there is no need to have the variable expansion
deferred to "make".
Michael
commit c1d53b7c767275b39dc8ecfcd5b6129ee2cabb6d
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Fri Aug 15 14:35:46 2008 +0200
configure: remove the --with-libdir parameter.
This is redundant: use the autoconf-provided --libdir instead.
This will also make the new distinction between libdir and modulesdir
more visible.
Michael
---
Summary of changes:
source/m4/check_path.m4 | 26 +-
1 files changed, 5 insertions(+), 21 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/m4/check_path.m4 b/source/m4/check_path.m4
index c39efc6..7aa8c21 100644
--- a/source/m4/check_path.m4
+++ b/source/m4/check_path.m4
@@ -22,9 +22,9 @@ test "${mandir}" || mandir="\${prefix}/man"
logfilebase="\${VARDIR}"
privatedir="\${prefix}/private"
test "${libdir}" || libdir="\${prefix}/lib"
-modulesdir="\${LIBDIR}"
-pammodulesdir="\${LIBDIR}/security"
-configdir="\${LIBDIR}"
+modulesdir="${libdir}"
+pammodulesdir="${libdir}/security"
+configdir="${libdir}"
swatdir="\${prefix}/swat"
codepagedir="\${MODULESDIR}"
statedir="\${LOCKDIR}"
@@ -39,8 +39,8 @@ AC_ARG_WITH(fhs,
mandir="\${prefix}/share/man"
logfilebase="\${VARDIR}/log/samba"
privatedir="\${CONFIGDIR}/private"
-test "${libdir}" || libdir="\${prefix}/lib/samba"
-modulesdir="\${LIBDIR}"
+test "${libdir}" || libdir="\${prefix}/lib"
+modulesdir="${libdir}/samba"
configdir="\${sysconfdir}/samba"
swatdir="\${DATADIR}/samba/swat"
codepagedir="\${MODULESDIR}"
@@ -177,22 +177,6 @@ AC_ARG_WITH(ctdb,
esac])
#
-# set lib directory location
-AC_ARG_WITH(libdir,
-[AS_HELP_STRING([--with-libdir=DIR], [Where to put libdir ($libdir)])],
-[ case "$withval" in
- yes|no)
- #
- # Just in case anybody does it
- #
-AC_MSG_WARN([--with-libdir without argument - will use default])
- ;;
- * )
-libdir="$withval"
-;;
- esac])
-
-#
# set shared modules (internal lib) directory location
AC_ARG_WITH(modulesdir,
[AS_HELP_STRING([--with-modulesdir=DIR], [Where to put shared modules
($libdir)])],
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-3745-g81030e4
The branch, v3-devel has been updated via 81030e49ce344260d279a3112b13a21ce3520748 (commit) via bb19634138cfd1f527c44e16a44aa21ebee50c1c (commit) via 3346dd40832e8d61edfe4c56dce6fe85031f20f1 (commit) via 22fb3ef1bb4abb33b49d275f9a5d85a1924c22ea (commit) via 5ef9da6f4f04b07804b389902862fae0fbbfed13 (commit) via bcb868e4340a856c4009450479628088a8a1628c (commit) via 34309f097f5c7321930bf6c2ea2447de1008130c (commit) via b17d1ff646e22c3e979224d119b283fc3af780a8 (commit) from 85a781fa0248fcd0cefcc4de25b3dea3e37d5844 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel - Log - commit 81030e49ce344260d279a3112b13a21ce3520748 Author: Michael Adam <[EMAIL PROTECTED]> Date: Fri Aug 15 00:45:57 2008 +0200 popt: add support for setting MODULESDIR via popt_common_dynconfig. Michael commit bb19634138cfd1f527c44e16a44aa21ebee50c1c Author: Michael Adam <[EMAIL PROTECTED]> Date: Fri Aug 15 00:50:56 2008 +0200 svcctl: use MODULESDIR instead of LIBDIR for the svcctl script directory. Michael commit 3346dd40832e8d61edfe4c56dce6fe85031f20f1 Author: Michael Adam <[EMAIL PROTECTED]> Date: Fri Aug 15 00:49:19 2008 +0200 libgpo: use MODULESDIR instead of LIBDIR for the group policy extensions. Michael commit 22fb3ef1bb4abb33b49d275f9a5d85a1924c22ea Author: Michael Adam <[EMAIL PROTECTED]> Date: Fri Aug 15 00:47:30 2008 +0200 Use module_path() instead of lib_path() for loading shared modules. Michael commit 5ef9da6f4f04b07804b389902862fae0fbbfed13 Author: Michael Adam <[EMAIL PROTECTED]> Date: Fri Aug 15 00:44:14 2008 +0200 Add modules_path() to construct paths to files in MODULESDIR. Michael commit bcb868e4340a856c4009450479628088a8a1628c Author: Michael Adam <[EMAIL PROTECTED]> Date: Fri Aug 15 00:46:46 2008 +0200 buildoptions: output MODULESDIR. Michael commit 34309f097f5c7321930bf6c2ea2447de1008130c Author: Michael Adam <[EMAIL PROTECTED]> Date: Fri Aug 15 00:43:31 2008 +0200 dynconfig: add support for MODULESDIR. Michael commit b17d1ff646e22c3e979224d119b283fc3af780a8 Author: Michael Adam <[EMAIL PROTECTED]> Date: Fri Aug 15 00:36:49 2008 +0200 configure: Add --with-modulesdir to accompany --with-libdir. This starts the seplitting of libdir in to libdir and modulesdir. Our shared libs should go into libdir, the internal shared modules, codepages, and other stuff that was originally in libdir, should go into modulesdir. The idea behind this is, that in a typical installation, the shared (and static) libraries (as libtalloc, libsmbclient, libwbclient and others) should be put into /usr/lib, while the e.g. the vfs modules should reside in /usr/lib/samba. This is meant to ease the work of packagers and reduce the needs for manual interaction and workarounds. Michael --- Summary of changes: source/Makefile.in | 21 - source/dynconfig.c |1 + source/include/dynconfig.h |4 source/include/proto.h |1 + source/lib/module.c |2 +- source/lib/popt_common.c | 10 ++ source/lib/util.c| 13 + source/libgpo/gpext/gpext.c |2 +- source/m4/check_path.m4 | 23 +-- source/script/mkbuildoptions.awk |1 + source/services/services_db.c|6 +++--- source/services/svc_rcinit.c |6 +++--- 12 files changed, 71 insertions(+), 19 deletions(-) Changeset truncated at 500 lines: diff --git a/source/Makefile.in b/source/Makefile.in index 3ac09f3..d92ecec 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -99,17 +99,18 @@ BINDIR = @bindir@ SBINDIR = @sbindir@ ROOTSBINDIR = @rootsbindir@ LIBDIR = @libdir@ +MODULESDIR = @modulesdir@ [EMAIL PROTECTED]@ PAMMODULESDIR = @pammodulesdir@ -VFSLIBDIR = $(LIBDIR)/vfs -PDBLIBDIR = $(LIBDIR)/pdb -RPCLIBDIR = $(LIBDIR)/rpc -IDMAPLIBDIR = $(LIBDIR)/idmap -NSSINFOLIBDIR = $(LIBDIR)/nss_info -CHARSETLIBDIR = $(LIBDIR)/charset -AUTHLIBDIR = $(LIBDIR)/auth -CONFIGLIBDIR = $(LIBDIR)/config -GPEXTLIBDIR = $(LIBDIR)/gpext +VFSLIBDIR = $(MODULESDIR)/vfs +PDBLIBDIR = $(MODULESDIR)/pdb +RPCLIBDIR = $(MODULESDIR)/rpc +IDMAPLIBDIR = $(MODULESDIR)/idmap +NSSINFOLIBDIR = $(MODULESDIR)/nss_info +CHARSETLIBDIR = $(MODULESDIR)/charset +AUTHLIBDIR = $(MODULESDIR)/auth +CONFIGLIBDIR = $(MODULESDIR)/config +GPEXTLIBDIR = $(MODULESDIR)/gpext CONFIGDIR = @configdir@ VARDIR = @localstatedir@ MANDIR = @mandir@ @@ -166,6 +167,7 @@ PATH_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" \ -DLOCKDIR=\"$(LOCKDIR)\" \ -DPIDDIR=\"$(PIDDIR)\" \ -DLIBDIR=\"$(LIBDIR)\" \ + -DMODULESDIR=\"$(MODULESDI
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-3737-g85a781f
The branch, v3-devel has been updated
via 85a781fa0248fcd0cefcc4de25b3dea3e37d5844 (commit)
via f30b70b2c3a49bc962848039953a565a040b563d (commit)
via 4fb69fe1eeebc466944f3daacfacec60ad043b0c (commit)
from a823733b91958adf938214113e6875315c6ae5b2 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -
commit 85a781fa0248fcd0cefcc4de25b3dea3e37d5844
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Fri Aug 15 00:58:47 2008 +0200
dynconfig: remove commented-out old stuff from dynconfig.c and dynconfig.h
Michael
commit f30b70b2c3a49bc962848039953a565a040b563d
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Thu Aug 14 23:44:06 2008 +0200
dynconfig: remove unused prototypes.
set_dyn_STATEDIR, is_default_dyn_STATEDIR,
set_dyn_CACHEDIR, is_default_dyn_CACHEDIR
are neither used nor implemented.
Michael
commit 4fb69fe1eeebc466944f3daacfacec60ad043b0c
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Thu Aug 14 23:14:42 2008 +0200
proto.h: remove prototypes from dynconfig.c
These are also in dynconfig.h and were originally added
by "make proto" by accident.
Michael
---
Summary of changes:
source/dynconfig.c | 216
source/include/dynconfig.h | 25 +
source/include/proto.h | 25 -
3 files changed, 5 insertions(+), 261 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/dynconfig.c b/source/dynconfig.c
index 57008ec..241a659 100644
--- a/source/dynconfig.c
+++ b/source/dynconfig.c
@@ -40,12 +40,6 @@
* table? There's kind of a chicken-and-egg situation there...
**/
-#if 0
-static char const *dyn_SBINDIR = SBINDIR;
-static char const *dyn_BINDIR = BINDIR;
-static char const *dyn_SWATDIR = SWATDIR;
-#endif
-
#define DEFINE_DYN_CONFIG_PARAM(name) \
static char *dyn_##name; \
\
@@ -85,216 +79,6 @@ DEFINE_DYN_CONFIG_PARAM(PIDDIR)
DEFINE_DYN_CONFIG_PARAM(SMB_PASSWD_FILE)
DEFINE_DYN_CONFIG_PARAM(PRIVATE_DIR)
-#if 0
-static char *dyn_CONFIGFILE; /**< Location of smb.conf file. **/
-
-const char *get_dyn_CONFIGFILE(void)
-{
- if (dyn_CONFIGFILE == NULL) {
- return CONFIGFILE;
- }
- return dyn_CONFIGFILE;
-}
-
-const char *set_dyn_CONFIGFILE(const char *newpath)
-{
- if (dyn_CONFIGFILE) {
- SAFE_FREE(dyn_CONFIGFILE);
- }
- dyn_CONFIGFILE = SMB_STRDUP(newpath);
- return dyn_CONFIGFILE;
-}
-
-/** Log file directory. **/
-static char *dyn_LOGFILEBASE;
-
-const char *get_dyn_LOGFILEBASE(void)
-{
- if (dyn_LOGFILEBASE == NULL) {
- return LOGFILEBASE;
- }
- return dyn_LOGFILEBASE;
-}
-
-const char *set_dyn_LOGFILEBASE(const char *newpath)
-{
- if (dyn_LOGFILEBASE) {
- SAFE_FREE(dyn_LOGFILEBASE);
- }
- dyn_LOGFILEBASE = SMB_STRDUP(newpath);
- return dyn_LOGFILEBASE;
-}
-
-/** Statically configured LanMan hosts. **/
-static char *dyn_LMHOSTSFILE;
-
-const char *get_dyn_LMHOSTSFILE(void)
-{
- if (dyn_LMHOSTSFILE == NULL) {
- return LMHOSTSFILE;
- }
- return dyn_LMHOSTSFILE;
-}
-
-const char *set_dyn_LMHOSTSFILE(const char *newpath)
-{
- if (dyn_LMHOSTSFILE) {
- SAFE_FREE(dyn_LMHOSTSFILE);
- }
- dyn_LMHOSTSFILE = SMB_STRDUP(newpath);
- return dyn_LMHOSTSFILE;
-}
-
-/**
- * @brief Samba data directory.
- *
- * @sa data_path() to get the path to a file inside the CODEPAGEDIR.
- **/
-static char *dyn_CODEPAGEDIR;
-
-const char *get_dyn_CODEPAGEDIR(void)
-{
- if (dyn_CODEPAGEDIR == NULL) {
- return CODEPAGEDIR;
- }
- return dyn_CODEPAGEDIR;
-}
-
-const char *set_dyn_CODEPAGEDIR(const char *newpath)
-{
- if (dyn_CODEPAGEDIR) {
- SAFE_FREE(dyn_CODEPAGEDIR);
- }
- dyn_CODEPAGEDIR = SMB_STRDUP(newpath);
- return dyn_CODEPAGEDIR;
-}
-
-/**
- * @brief Samba library directory.
- *
- * @sa lib_path() to get the path to a file inside the LIBDIR.
- **/
-static char *dyn_LIBDIR;
-
-const char *get_dyn_LIBDIR(void)
-{
- if (dyn_LIBDIR == NULL) {
- return LIBDIR;
- }
- return dyn_CODEPAGEDIR;
-}
-
-const char *set_dyn_LIBDIR(const char *newpath)
-{
- if (dyn_LIBDIR) {
- SAFE_FREE(dyn_LIBDIR);
- }
- dyn_LIBDIR = SMB_STRDUP(newpath);
- return dyn_LIBDIR;
-}
-
-static char *dyn_SHLIBEXT;
-
-const char *get_dyn_SHLIBEXT(void)
-{
- if (dyn_SHLIBEXT == NULL) {
- return SHLIBEXT;
- }
- return dyn_SHLIBEXT;
-}
-
-const char *set_dyn_SHLIBEXT(const char *newpath)
-{
- if (dyn_SHLIBEXT) {
- SAFE_FREE(dyn_SHLIBEXT);
- }
- dyn_SHLIBEXT = SMB_STRDUP(newpath);
- return dyn_SHLIBEXT;
-}
-
-/**
- * @brie
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-3734-ga823733
The branch, v3-devel has been updated via a823733b91958adf938214113e6875315c6ae5b2 (commit) from 04974818bda75c4315ad09b623e5df55c87dbc87 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel - Log - commit a823733b91958adf938214113e6875315c6ae5b2 Author: Michael Adam <[EMAIL PROTECTED]> Date: Thu Aug 14 23:18:28 2008 +0200 Makefile: print codepagedir in "make showlayout". Michael --- Summary of changes: source/Makefile.in |1 + 1 files changed, 1 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source/Makefile.in b/source/Makefile.in index 938d711..3ac09f3 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -2548,6 +2548,7 @@ showlayout:: @echo " lockdir: $(LOCKDIR)" @echo " piddir: $(PIDDIR)" @echo " swatdir: $(SWATDIR)" + @echo " codepagedir: $(CODEPAGEDIR)" uninstall:: uninstallman uninstallservers uninstallbin @UNINSTALL_CIFSMOUNT@ @UNINSTALL_CIFSUPCALL@ uninstallscripts uninstalldat uninstallswat uninstallmodules uninstalllibs @UNINSTALL_PAM_MODULES@ -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-3733-g0497481
The branch, v3-devel has been updated via 04974818bda75c4315ad09b623e5df55c87dbc87 (commit) from cb925dec85cfc4cfc194c3ff76dbeba2bd2178d7 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel - Log - commit 04974818bda75c4315ad09b623e5df55c87dbc87 Author: Michael Adam <[EMAIL PROTECTED]> Date: Fri Aug 15 23:17:48 2008 +0200 build: fix a typo in the installlibtalloc rule. The symlink liballoc.so -> libtalloc.so.1 would have been created unconditionally, independent of the existence of libtalloc.so.1. Michael --- Summary of changes: source/Makefile.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/Makefile.in b/source/Makefile.in index b965262..938d711 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -1599,7 +1599,7 @@ installlibtalloc:: installdirs libtalloc @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR) -$(INSTALLLIBCMD_SH) $(LIBTALLOC_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR) @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)` - -if test -e $(LIBTALLOC_SHARD_TARGET_SONAME) ; then \ + -if test -e $(LIBTALLOC_SHARED_TARGET_SONAME) ; then \ ln -s -f `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` \ $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)` ; \ fi -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha5-283-g7361821
The branch, v4-0-test has been updated
via 7361821b21ef78c564c41466783048606a0b6e98 (commit)
via fa03d750e4577a610dc410d45d49789110b1b4f1 (commit)
via e85abe7db21eec47adecae8243a25f145aa7ec9a (commit)
via 7ad0d8dd4dab6119ca6f94b64b35c8f975a27d0a (commit)
via 30da1b534f00ba6ef6cf86cba603732bc6e1ad43 (commit)
from b4b14b748e6babc93faee23fe8f5c03ec2d25cbb (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -
commit 7361821b21ef78c564c41466783048606a0b6e98
Author: Andrew Bartlett <[EMAIL PROTECTED]>
Date: Fri Aug 15 21:20:05 2008 +1000
Fix the build, after the ad2oLschema changes.
commit fa03d750e4577a610dc410d45d49789110b1b4f1
Merge: e85abe7db21eec47adecae8243a25f145aa7ec9a
b4b14b748e6babc93faee23fe8f5c03ec2d25cbb
Author: Andrew Bartlett <[EMAIL PROTECTED]>
Date: Fri Aug 15 21:16:40 2008 +1000
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into
4-0-abartlet
commit e85abe7db21eec47adecae8243a25f145aa7ec9a
Merge: 7ad0d8dd4dab6119ca6f94b64b35c8f975a27d0a
9246924effd4d0b08ca1ef87e45ad510020df93e
Author: Andrew Bartlett <[EMAIL PROTECTED]>
Date: Wed Aug 13 09:47:18 2008 +1000
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into
4-0-abartlet
commit 7ad0d8dd4dab6119ca6f94b64b35c8f975a27d0a
Merge: 30da1b534f00ba6ef6cf86cba603732bc6e1ad43
54b873e49ff363609632fa2862208bf6b4c1b6ed
Author: Andrew Bartlett <[EMAIL PROTECTED]>
Date: Tue Aug 12 17:46:48 2008 +1000
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into
4-0-abartlet
commit 30da1b534f00ba6ef6cf86cba603732bc6e1ad43
Author: Andrew Bartlett <[EMAIL PROTECTED]>
Date: Mon Aug 11 11:45:45 2008 +1000
Only allow trust accounts access to the NTP signing service.
---
Summary of changes:
source/ntp_signd/ntp_signd.c | 12 +---
source/utils/oLschema2ldif.c |5 +++--
2 files changed, 12 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/ntp_signd/ntp_signd.c b/source/ntp_signd/ntp_signd.c
index c1ac7db..546743e 100644
--- a/source/ntp_signd/ntp_signd.c
+++ b/source/ntp_signd/ntp_signd.c
@@ -123,7 +123,7 @@ static NTSTATUS ntp_signd_recv(void *private, DATA_BLOB
wrapped_input)
struct signed_reply signed_reply;
enum ndr_err_code ndr_err;
struct ldb_result *res;
- const char *attrs[] = { "unicodePwd", "userAccountControl", NULL };
+ const char *attrs[] = { "unicodePwd", "userAccountControl", "cn", NULL
};
struct MD5Context ctx;
struct samr_Password *nt_hash;
uint32_t user_account_control;
@@ -168,7 +168,7 @@ static NTSTATUS ntp_signd_recv(void *private, DATA_BLOB
wrapped_input)
ret = ldb_search_exp_fmt(ntp_signdconn->ntp_signd->samdb, tmp_ctx,
&res,
samdb_base_dn(ntp_signdconn->ntp_signd->samdb),
-LDB_SCOPE_SUBTREE, attrs,
"(&(objectSid=%s)(objectClass=computer))",
+LDB_SCOPE_SUBTREE, attrs,
"(&(objectSid=%s)(objectClass=user))",
dom_sid_string(tmp_ctx, sid));
if (ret != LDB_SUCCESS) {
DEBUG(2, ("Failed to search for SID %s in SAM for NTP signing:
%s\n", dom_sid_string(tmp_ctx, sid),
@@ -188,7 +188,13 @@ static NTSTATUS ntp_signd_recv(void *private, DATA_BLOB
wrapped_input)
user_account_control = ldb_msg_find_attr_as_uint(res->msgs[0],
"userAccountControl", 0);
if (user_account_control & UF_ACCOUNTDISABLE) {
- DEBUG(1, ("Account for SID [%s] is disabled\n",
dom_sid_string(tmp_ctx, sid)));
+ DEBUG(1, ("Account %s for SID [%s] is disabled\n",
ldb_dn_get_linearized(res->msgs[0]->dn), dom_sid_string(tmp_ctx, sid)));
+ talloc_free(tmp_ctx);
+ return NT_STATUS_ACCESS_DENIED;
+ }
+
+ if (!(user_account_control &
(UF_INTERDOMAIN_TRUST_ACCOUNT|UF_SERVER_TRUST_ACCOUNT|UF_WORKSTATION_TRUST_ACCOUNT)))
{
+ DEBUG(1, ("Account %s for SID [%s] is not a trust account\n",
ldb_dn_get_linearized(res->msgs[0]->dn), dom_sid_string(tmp_ctx, sid)));
talloc_free(tmp_ctx);
return NT_STATUS_ACCESS_DENIED;
}
diff --git a/source/utils/oLschema2ldif.c b/source/utils/oLschema2ldif.c
index b501b75..d045b08 100644
--- a/source/utils/oLschema2ldif.c
+++ b/source/utils/oLschema2ldif.c
@@ -31,9 +31,10 @@
* Author: Simo Sorce
*/
+#include "includes.h"
#include "ldb_includes.h"
#include "tools/cmdline.h"
-#include "utils/schema_convert.h"
+#include "dsdb/samdb/samdb.h"
#define SCHEMA_UNKNOWN 0
#define SCHEMA_NAME 1
@@ -432,7 +433,7 @@ static struct ldb_message *process_entry(TALLOC_CTX
*mem_ctx, const char *entry)
case SCHEMA_SYNTAX:
{
-
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2916-g41d440c
The branch, v3-2-test has been updated via 41d440c3198752281556699cc9744b490b9b0a5e (commit) from 40e58351472689dbefb02e185d958bee5ca83937 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 41d440c3198752281556699cc9744b490b9b0a5e Author: Derrell Lipman <[EMAIL PROTECTED]> Date: Wed Jul 16 09:47:06 2008 -0400 Static libsmbclient library needs to include all objects LIBSMBCLIENT_OBJ0 contains only the libsmb/libsmb_*.o files. We need the more inclusive set of object files defined by LIBSMBCLIENT_OBJ1. Derrell (cherry picked from commit 6c33c620072d641fc19ca0224c16af75f6cd7e9e) --- Summary of changes: source/Makefile.in |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source/Makefile.in b/source/Makefile.in index cf0c98a..8df9d66 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -1900,9 +1900,9 @@ $(LIBSMBCLIENT_SHARED_TARGET): $(LIBSMBCLIENT_SHARED_TARGET_SONAME) @rm -f $@ @ln -s `basename $(LIBSMBCLIENT_SHARED_TARGET_SONAME)` $@ -$(LIBSMBCLIENT_STATIC_TARGET): $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ0) +$(LIBSMBCLIENT_STATIC_TARGET): $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ1) @echo Linking non-shared library $@ - @-$(AR) -rc $@ $(LIBSMBCLIENT_OBJ0) + @-$(AR) -rc $@ $(LIBSMBCLIENT_OBJ1) libsmbclient: $(LIBSMBCLIENT) -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha5-278-gb4b14b7
The branch, v4-0-test has been updated via b4b14b748e6babc93faee23fe8f5c03ec2d25cbb (commit) via c7c32ec7b42bdf0f7b669644516438c71b364e60 (commit) via e3591a6a35ddb60398a03a4fa0545cc6158946ef (commit) via 7d2a890a7077e446e45527847f78bba84d22bc4c (commit) via e711f7d26a632ec93c1e2a3db52c37e1c0de4214 (commit) from d548f5dee5980eae0aea25f1314238eb4f963568 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test - Log - commit b4b14b748e6babc93faee23fe8f5c03ec2d25cbb Merge: c7c32ec7b42bdf0f7b669644516438c71b364e60 d548f5dee5980eae0aea25f1314238eb4f963568 Author: Andrew Bartlett <[EMAIL PROTECTED]> Date: Fri Aug 15 20:41:50 2008 +1000 Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet commit c7c32ec7b42bdf0f7b669644516438c71b364e60 Author: Andrew Bartlett <[EMAIL PROTECTED]> Date: Fri Aug 15 20:40:57 2008 +1000 Generate the subSchema in cn=Aggregate This reads the schema from the in-memory structure, when the magic attributes are requested. The code is a modified version of that used in the ad2oLschema tool (now shared). The schema_fsmo module handles the insertion of the generated result. As such, this commit also removes these entries from the setup/schema.ldif Metze's previous stub of this functionality is also removed. Andrew Bartlett commit e3591a6a35ddb60398a03a4fa0545cc6158946ef Author: Andrew Bartlett <[EMAIL PROTECTED]> Date: Fri Aug 15 13:18:48 2008 +1000 Rework generation of the objectClass and attributeType lines. Now that these are subroutines, we can factor them out into a file the CN=Aggregate schema code can also use. Andrew Bartlett commit 7d2a890a7077e446e45527847f78bba84d22bc4c Author: Andrew Bartlett <[EMAIL PROTECTED]> Date: Fri Aug 15 12:08:10 2008 +1000 Paramaterise the seperator in ad2OLschema This will allow me to add a new mode, with the CN=Aggregate schema format automatically generated. Andrew Bartlett commit e711f7d26a632ec93c1e2a3db52c37e1c0de4214 Author: Andrew Bartlett <[EMAIL PROTECTED]> Date: Fri Aug 15 09:46:51 2008 +1000 Don't segfault in RPC-ATSVC. --- Summary of changes: source/dsdb/config.mk |3 +- source/dsdb/samdb/ldb_modules/schema_fsmo.c | 206 ++- source/dsdb/schema/schema.h | 14 + source/dsdb/schema/schema_constructed.c | 186 - source/dsdb/schema/schema_convert.c | 160 source/dsdb/schema/schema_convert.h | 10 + source/dsdb/schema/schema_description.c | 316 +++ source/dsdb/schema/schema_init.c| 97 +++-- source/lib/ldb/tests/python/ldap.py | 30 ++ source/setup/schema.ldif| 549 --- source/torture/rpc/atsvc.c |4 +- source/utils/ad2oLschema.c | 255 - source/utils/config.mk |6 +- source/utils/schema_convert.c | 173 - source/utils/schema_convert.h | 10 - testprogs/ejs/minschema.js | 41 +-- 16 files changed, 862 insertions(+), 1198 deletions(-) delete mode 100644 source/dsdb/schema/schema_constructed.c create mode 100644 source/dsdb/schema/schema_convert.c create mode 100644 source/dsdb/schema/schema_convert.h create mode 100644 source/dsdb/schema/schema_description.c delete mode 100644 source/utils/schema_convert.c delete mode 100644 source/utils/schema_convert.h Changeset truncated at 500 lines: diff --git a/source/dsdb/config.mk b/source/dsdb/config.mk index 7b700fd..d430c3f 100644 --- a/source/dsdb/config.mk +++ b/source/dsdb/config.mk @@ -35,7 +35,8 @@ PRIVATE_DEPENDENCIES = SAMDB_COMMON NDR_DRSUAPI NDR_DRSBLOBS SAMDB_SCHEMA_OBJ_FILES = $(addprefix $(dsdbsrcdir)/schema/, \ schema_init.o \ schema_syntax.o \ - schema_constructed.o) + schema_description.o \ + schema_convert.o) $(eval $(call proto_header_template,$(dsdbsrcdir)/schema/proto.h,$(SAMDB_SCHEMA_OBJ_FILES:.o=.c))) # PUBLIC_HEADERS += dsdb/schema/schema.h diff --git a/source/dsdb/samdb/ldb_modules/schema_fsmo.c b/source/dsdb/samdb/ldb_modules/schema_fsmo.c index 87ada85..706b7b1 100644 --- a/source/dsdb/samdb/ldb_modules/schema_fsmo.c +++ b/source/dsdb/samdb/ldb_modules/schema_fsmo.c @@ -32,6 +32,40 @@ #include "lib/util/dlinklist.h" #include "param/param.h" +static int generate_objectClasses(struct ldb_context *ldb, struct ldb_message *msg, + const struct dsdb_schema *schema); +static int generate_attributeTypes(struct ldb_context *ldb, struct ldb_message *msg, + const struc
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2915-g40e5835
The branch, v3-2-test has been updated via 40e58351472689dbefb02e185d958bee5ca83937 (commit) from c01f10709b50f26a9513f9a83975c187d9958ecb (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 40e58351472689dbefb02e185d958bee5ca83937 Author: Michael Adam <[EMAIL PROTECTED]> Date: Fri Jul 11 15:35:24 2008 +0200 build: fix build of libaddns shared lib : it needs socket_wrapper. Michael (cherry picked from commit 58bc04b31b15c36505c5ecb2d8373e9033972390) --- Summary of changes: source/Makefile.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/Makefile.in b/source/Makefile.in index 5ed8aae..cf0c98a 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -345,7 +345,7 @@ KRBCLIENT_OBJ = libads/kerberos.o libads/ads_status.o LIBADDNS_OBJ0 = libaddns/dnsrecord.o libaddns/dnsutils.o libaddns/dnssock.o \ libaddns/dnsgss.o libaddns/dnsmarshall.o -LIBADDNS_OBJ = $(LIBADDNS_OBJ0) @LIBTALLOC_STATIC@ +LIBADDNS_OBJ = $(LIBADDNS_OBJ0) $(SOCKET_WRAPPER_OBJ) @LIBTALLOC_STATIC@ LIBGPO_OBJ0 = libgpo/gpo_ldap.o libgpo/gpo_ini.o libgpo/gpo_util.o \ libgpo/gpo_fetch.o libgpo/gpo_filesync.o libgpo/gpo_sec.o -- Samba Shared Repository
svn commit: samba-web r1216 - in trunk/devel: .
Author: kseeger Date: 2008-08-15 09:01:13 + (Fri, 15 Aug 2008) New Revision: 1216 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=1216 Log: Mark v3-0-stable as deprecated Modified: trunk/devel/index.html Changeset: Modified: trunk/devel/index.html === --- trunk/devel/index.html 2008-08-13 18:46:59 UTC (rev 1215) +++ trunk/devel/index.html 2008-08-15 09:01:13 UTC (rev 1216) @@ -81,7 +81,7 @@ v3-0-stable - This is the current branch for 3.0.x production releases. + This branch is not used any longer. v4-0-test
[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-1-39-g51872b7
The branch, v3-2-stable has been updated via 51872b7607d70da804f6cc9f1292c54e980f50e1 (commit) from 14acfb8f4af0f58de71618b5cfc4579edbfea9c7 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable - Log - commit 51872b7607d70da804f6cc9f1292c54e980f50e1 Author: Karolin Seeger <[EMAIL PROTECTED]> Date: Fri Aug 15 09:45:31 2008 +0200 WHATSNEW: Add release date, add hint on printing timeouts. Karolin (cherry picked from commit c01f10709b50f26a9513f9a83975c187d9958ecb) --- Summary of changes: WHATSNEW.txt |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index b8bc728..5d30dbd 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,6 +1,6 @@ == Release Notes for Samba 3.2.2 - + August, 18 2008 == This is a bug fix release of the Samba 3.2 series. @@ -11,6 +11,7 @@ Major bug fixes included in Samba 3.2.2 are: tdb files and to overflowing partitions as a consequence on systems running an nmbd daemon. o Fix freezing Windows Explorer on WinXP while browsing Samba shares. +This one led to timeouts during printing as well. o Fix assigning of primary group memberships when authenticating via Winbind. -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2914-gc01f107
The branch, v3-2-test has been updated via c01f10709b50f26a9513f9a83975c187d9958ecb (commit) from 4f958f09a75f5215044e680cc86edb3eca1c51be (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit c01f10709b50f26a9513f9a83975c187d9958ecb Author: Karolin Seeger <[EMAIL PROTECTED]> Date: Fri Aug 15 09:45:31 2008 +0200 WHATSNEW: Add release date, add hint on printing timeouts. Karolin --- Summary of changes: WHATSNEW.txt |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index b8bc728..5d30dbd 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,6 +1,6 @@ == Release Notes for Samba 3.2.2 - + August, 18 2008 == This is a bug fix release of the Samba 3.2 series. @@ -11,6 +11,7 @@ Major bug fixes included in Samba 3.2.2 are: tdb files and to overflowing partitions as a consequence on systems running an nmbd daemon. o Fix freezing Windows Explorer on WinXP while browsing Samba shares. +This one led to timeouts during printing as well. o Fix assigning of primary group memberships when authenticating via Winbind. -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-1-38-g14acfb8
The branch, v3-2-stable has been updated
via 14acfb8f4af0f58de71618b5cfc4579edbfea9c7 (commit)
via 44e49a59c37cb65c0a7e596b1bf676a664c1e4a2 (commit)
via 3bb258764a6199603b66f1b6876cc0a23d332b40 (commit)
from 086f97a6c7c1d96c6067695c8d0b675d21d61b84 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable
- Log -
commit 14acfb8f4af0f58de71618b5cfc4579edbfea9c7
Author: Karolin Seeger <[EMAIL PROTECTED]>
Date: Fri Aug 15 09:13:32 2008 +0200
WHATSNEW: Update changes since 3.2.1.
Karolin
(cherry picked from commit 4f958f09a75f5215044e680cc86edb3eca1c51be)
commit 44e49a59c37cb65c0a7e596b1bf676a664c1e4a2
Author: Jeremy Allison <[EMAIL PROTECTED]>
Date: Thu Aug 14 21:53:55 2008 -0700
Fix show-stopper for 3.2. Smbd depends on group SID
position zero being the primary group sid. Authenicating
via winbindd call returned a non-sorted sid list. This
fixes is for both a winbindd call and a pac list from
an info3 struct. Without this we mess up the
primary group associated with created files. Found by
Herb.
Jeremy.
(cherry picked from commit 5cfa78d6e45477cb952d3b12cc914635842d6251)
commit 3bb258764a6199603b66f1b6876cc0a23d332b40
Author: Jeremy Allison <[EMAIL PROTECTED]>
Date: Thu Aug 14 11:00:47 2008 -0700
Fix bug #5692 - Core dump in full_audit.so.
There were some function mismatches in the various GET_NT_ACL modules (some
places the fsp parameter has not been removed).
Jeremy.
(cherry picked from commit 12b4ed7c3c10a6a29d108f6a83d961bf19751ca7)
---
Summary of changes:
WHATSNEW.txt|6 +-
examples/VFS/skel_opaque.c |2 +-
source/auth/auth_util.c | 34 ++
source/modules/vfs_aixacl2.c|2 +-
source/modules/vfs_catia.c |2 +-
source/modules/vfs_full_audit.c |5 ++---
6 files changed, 44 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 012a1fe..b8bc728 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -10,8 +10,9 @@ Major bug fixes included in Samba 3.2.2 are:
o Fix removal of dead records in tdb files. This can lead to very large
tdb files and to overflowing partitions as a consequence on systems
running an nmbd daemon.
-
o Fix freezing Windows Explorer on WinXP while browsing Samba shares.
+ o Fix assigning of primary group memberships when authenticating via
+Winbind.
##
@@ -33,7 +34,10 @@ o Jeremy Allison <[EMAIL PROTECTED]>
* BUG 5675: Fix smbspool program assuming Kerberos authentication by
mistake.
* BUG 5686: Fix segfaults in libsmbclient.
+* BUG 5692: Fix coredump in full_audit.so.
* Fix coverity ID 594 (resource leak on error path).
+* Fix assigning of primary group memberships when authenticating via
+ Winbind.
* Several build fixes.
diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index eb49f35..ee9ae1d 100644
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -307,7 +307,7 @@ static size_t skel_fget_nt_acl(vfs_handle_struct *handle,
files_struct *fsp,
return 0;
}
-static size_t skel_get_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
+static size_t skel_get_nt_acl(vfs_handle_struct *handle,
const char *name, uint32 security_info, SEC_DESC **ppdesc)
{
errno = ENOSYS;
diff --git a/source/auth/auth_util.c b/source/auth/auth_util.c
index 2024526..a183afb 100644
--- a/source/auth/auth_util.c
+++ b/source/auth/auth_util.c
@@ -27,6 +27,34 @@
#define DBGC_CLASS DBGC_AUTH
/
+ Ensure primary group SID is always at position 0 in a
+ auth_serversupplied_info struct.
+/
+
+static void sort_sid_array_for_smbd(auth_serversupplied_info *result,
+ const DOM_SID *pgroup_sid)
+{
+ unsigned int i;
+
+ if (!result->sids) {
+ return;
+ }
+
+ if (sid_compare(&result->sids[0], pgroup_sid)==0) {
+ return;
+ }
+
+ for (i = 1; i < result->num_sids; i++) {
+ if (sid_compare(pgroup_sid,
+ &result->sids[i]) == 0) {
+ sid_copy(&result->sids[i], &result->sids[0]);
+ sid_copy(&result->sids[0], pgroup_sid);
+ return;
+ }
+ }
+}
+
+/
Create a UNIX user on demand.
/
@@ -1679,6 +1707,9 @@ NTST
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2913-g4f958f0
The branch, v3-2-test has been updated via 4f958f09a75f5215044e680cc86edb3eca1c51be (commit) from 5cfa78d6e45477cb952d3b12cc914635842d6251 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 4f958f09a75f5215044e680cc86edb3eca1c51be Author: Karolin Seeger <[EMAIL PROTECTED]> Date: Fri Aug 15 09:13:32 2008 +0200 WHATSNEW: Update changes since 3.2.1. Karolin --- Summary of changes: WHATSNEW.txt |6 +- 1 files changed, 5 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 012a1fe..b8bc728 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -10,8 +10,9 @@ Major bug fixes included in Samba 3.2.2 are: o Fix removal of dead records in tdb files. This can lead to very large tdb files and to overflowing partitions as a consequence on systems running an nmbd daemon. - o Fix freezing Windows Explorer on WinXP while browsing Samba shares. + o Fix assigning of primary group memberships when authenticating via +Winbind. ## @@ -33,7 +34,10 @@ o Jeremy Allison <[EMAIL PROTECTED]> * BUG 5675: Fix smbspool program assuming Kerberos authentication by mistake. * BUG 5686: Fix segfaults in libsmbclient. +* BUG 5692: Fix coredump in full_audit.so. * Fix coverity ID 594 (resource leak on error path). +* Fix assigning of primary group memberships when authenticating via + Winbind. * Several build fixes. -- Samba Shared Repository
