[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3422-gc415b6a
The branch, v3-2-test has been updated via c415b6a48dae2809d5d60b0af23eb7781f1146db (commit) from 1c3313dea793a7eea72afb990da125f6c2a8444c (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit c415b6a48dae2809d5d60b0af23eb7781f1146db Author: Karolin Seeger Date: Tue Feb 3 09:48:40 2009 +0100 WHATSNEW: Update changes since 3.2.7. Karolin --- Summary of changes: WHATSNEW.txt |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 699caa7..a492967 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -132,6 +132,8 @@ o Stefan Metzmacher o Lars Müller * Tweak with pam defines of older Linux versions. +* Adjust regex to match variable names including underscores. +* Conditional install of the cifs.upcall man page. o Tim Prouty -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-7-161-g3fbd714
The branch, v3-2-stable has been updated via 3fbd714a688abc21a088ebbe0dd1716a6eb1b522 (commit) via 21aac4a0cd90ae631246c2eb741b2d2abc5252f9 (commit) via e9b429d0e2f378bf7486078bf1291c4dcc464a5e (commit) via 8c8503ab8d3df532f6e4e036e0481570f714530e (commit) from 600fe29cf3581e70373f33798bc07939d32b96e8 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable - Log - commit 3fbd714a688abc21a088ebbe0dd1716a6eb1b522 Author: Karolin Seeger Date: Tue Feb 3 09:48:40 2009 +0100 WHATSNEW: Update changes since 3.2.7. Karolin (cherry picked from commit c415b6a48dae2809d5d60b0af23eb7781f1146db) commit 21aac4a0cd90ae631246c2eb741b2d2abc5252f9 Author: Lars Müller Date: Mon Feb 2 21:38:38 2009 +0100 Adjust regex to match variable names including underscores This is required to get the CIFSUPCALL_PROGS setting extracted from config.log. (cherry picked from commit 1c3313dea793a7eea72afb990da125f6c2a8444c) commit e9b429d0e2f378bf7486078bf1291c4dcc464a5e Author: Lars Müller Date: Mon Feb 2 21:12:52 2009 +0100 Conditional install of the cifs.upcall man page Only install the cifs.upcall man page if CIFSUPCALL_PROGS was set while configure. (cherry picked from commit b44b29e5d9047f79202fa8fb3ca0eb86b2a98090) commit 8c8503ab8d3df532f6e4e036e0481570f714530e Author: Karolin Seeger Date: Mon Feb 2 11:46:39 2009 +0100 docs: Describe "service" in man mount.cifs. This fixes bug #5346. Thanks to the Debian Samba package maintainers for reporting and providing a patch! Karolin (cherry picked from commit 73f4fc1f802f31459b70dba4777d142d00fcdd92) (cherry picked from commit ab4768452811e67f6606253b5a79101184f777d0) (cherry picked from commit 876b0b001976226a7c1887570c08178d72842a48) --- Summary of changes: WHATSNEW.txt |2 ++ docs-xml/manpages-3/mount.cifs.8.xml | 11 +++ source/script/installman.sh |3 ++- 3 files changed, 11 insertions(+), 5 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 699caa7..a492967 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -132,6 +132,8 @@ o Stefan Metzmacher o Lars Müller * Tweak with pam defines of older Linux versions. +* Adjust regex to match variable names including underscores. +* Conditional install of the cifs.upcall man page. o Tim Prouty diff --git a/docs-xml/manpages-3/mount.cifs.8.xml b/docs-xml/manpages-3/mount.cifs.8.xml index 54fbc13..00711e0 100644 --- a/docs-xml/manpages-3/mount.cifs.8.xml +++ b/docs-xml/manpages-3/mount.cifs.8.xml @@ -43,10 +43,13 @@ by the popular Open Source server Samba. - The mount.cifs utility attaches the UNC name (exported network resource) to - the local directory mount-point. It is possible to set the mode for mount.cifs to -setuid root to allow non-root users to mount shares to directories for which they -have write permission. + The mount.cifs utility attaches the UNC name (exported network resource) + specified as service (using //server/share syntax, + where "server" is the server name or IP address and "share" is the name + of the share) to the local directory mount-point. + It is possible to set the mode for mount.cifs to setuid root to allow + non-root users to mount shares to directories for which they + have write permission. diff --git a/source/script/installman.sh b/source/script/installman.sh index 869ce6e..c13c119 100755 --- a/source/script/installman.sh +++ b/source/script/installman.sh @@ -20,7 +20,7 @@ fi # Get the configured feature set test -f "${SRCDIR}/config.log" && \ - eval `grep "^[[:alnum:]]*=.*" "${SRCDIR}/config.log"` + eval `grep "^[[:alnum:]_]*=.*" "${SRCDIR}/config.log"` for lang in $langs; do if [ "X$lang" = XC ]; then @@ -48,6 +48,7 @@ for lang in $langs; do # Check if this man page if required by the configured feature set case "${MP_BASENAME}" in + cifs.upcall.8) test -z "${CIFSUPCALL_PROGS}" && continue ;; smbsh.1) test -z "${SMBWRAPPER}" && continue ;; *) ;; esac -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-417-g810b670
The branch, master has been updated via 810b670b754f1f1f547c94c1b9bcff40154e7bb2 (commit) from 553818add80818909268557665e2760a16f2d8a0 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 810b670b754f1f1f547c94c1b9bcff40154e7bb2 Author: Volker Lendecke Date: Tue Feb 3 10:21:51 2009 +0100 Fix Coverity ID 870 --- Summary of changes: source3/libsmb/cliconnect.c |4 1 files changed, 4 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index 60b1a60..a39e035 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -1229,6 +1229,10 @@ struct async_req *cli_tcon_andx_send(TALLOC_CTX *mem_ctx, */ passlen = clistr_push(cli, pword, pass, sizeof(pword), STR_TERMINATE); + if (passlen == -1) { + DEBUG(1, ("clistr_push(pword) failed\n")); + goto access_denied; + } } else { if (passlen) { memcpy(pword, pass, passlen); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-418-ge6bb55c
The branch, master has been updated via e6bb55c3d5b491ab9e6d568e6ce7594695e53322 (commit) from 810b670b754f1f1f547c94c1b9bcff40154e7bb2 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit e6bb55c3d5b491ab9e6d568e6ce7594695e53322 Author: Stefan Metzmacher Date: Tue Feb 3 02:31:47 2009 +0100 lib/tdb: don't generate a static library for the samba4 build We also don't do this for talloc and ldb. metze --- Summary of changes: lib/tdb/config.mk |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/tdb/config.mk b/lib/tdb/config.mk index 90c9ba2..38b03b9 100644 --- a/lib/tdb/config.mk +++ b/lib/tdb/config.mk @@ -1,7 +1,7 @@ # Start SUBSYSTEM LIBTDB [LIBRARY::LIBTDB] -OUTPUT_TYPE = STATIC_LIBRARY +OUTPUT_TYPE = MERGED_OBJ CFLAGS = -I$(tdbsrcdir)/include # # End SUBSYSTEM ldb -- Samba Shared Repository
[SCM] SAMBA-CTDB repository - branch v3-2-ctdb updated - build_3.2.7_ctdb.54-32-g462760c
The branch, v3-2-ctdb has been updated via 462760c412aa86c57600ca7c87a28ed4de1ab60a (commit) from fa7a49f9298c0044419947d2863aedb64e398811 (commit) http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-2-ctdb - Log - commit 462760c412aa86c57600ca7c87a28ed4de1ab60a Author: Michael Adam Date: Wed Jan 28 13:34:34 2009 +0100 vfs_gpfs_prefetch: correctly return -1 on error condition in smbd_gpfs_fcntl() Michael --- Summary of changes: source/modules/vfs_gpfs_prefetch.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/modules/vfs_gpfs_prefetch.c b/source/modules/vfs_gpfs_prefetch.c index 77f265f..308ac10 100644 --- a/source/modules/vfs_gpfs_prefetch.c +++ b/source/modules/vfs_gpfs_prefetch.c @@ -41,7 +41,7 @@ static int smbd_gpfs_fcntl(int fd, void *arg) if (libgpfs_handle == NULL) { DEBUG(10, ("sys_dlopen for libgpfs failed: %s\n", strerror(errno))); - return; + return -1; } gpfs_fcntl_fn = sys_dlsym(libgpfs_handle, "gpfs_fcntl"); -- SAMBA-CTDB repository
[SCM] SAMBA-CTDB repository - branch v3-2-ctdb updated - build_3.2.7_ctdb.54-35-gfc122aa
The branch, v3-2-ctdb has been updated via fc122aa276bce379b492e5bdf52ab3e03bc3737f (commit) via 0d81cebfa2d5fa75869e2634f13f9b4db0b1c118 (commit) via 4a388381fce3f78e998db88b0b00bb7e042bca0b (commit) from 462760c412aa86c57600ca7c87a28ed4de1ab60a (commit) http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-2-ctdb - Log - commit fc122aa276bce379b492e5bdf52ab3e03bc3737f Author: Michael Adam Date: Wed Jan 21 11:03:34 2009 +0100 packaging(RHEL-CTDB): extend makespec.sh to extract VENDOR_PATCH from version.h Michael commit 0d81cebfa2d5fa75869e2634f13f9b4db0b1c118 Author: Michael Adam Date: Wed Jan 21 10:24:31 2009 +0100 packaging(RHEL-CTDB): The former release number has basically moved into VERSION Michael commit 4a388381fce3f78e998db88b0b00bb7e042bca0b Author: Michael Adam Date: Wed Jan 21 10:21:31 2009 +0100 VERSION: add vendor suffix ("ctdb") and vendor patch level Michael --- Summary of changes: packaging/RHEL-CTDB/makespec.sh |4 packaging/RHEL-CTDB/samba.spec.tmpl |2 +- source/VERSION |4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/packaging/RHEL-CTDB/makespec.sh b/packaging/RHEL-CTDB/makespec.sh index ae58db0..62f0969 100755 --- a/packaging/RHEL-CTDB/makespec.sh +++ b/packaging/RHEL-CTDB/makespec.sh @@ -26,6 +26,10 @@ vendor_version=`grep SAMBA_VERSION_VENDOR_SUFFIX ${VERSION_H} | awk '{print $3}' if test "x${vendor_version}" != "x" ; then VERSION="${VERSION}-${vendor_version}" fi +vendor_patch=`grep SAMBA_VERSION_VENDOR_PATCH ${VERSION_H} | awk '{print $3}'` +if test "x${vendor_patch}" != "x" ; then + VERSION="${VERSION}-${vendor_patch}" +fi VERSION=`echo ${VERSION} | sed 's/-/_/g'` VERSION=`echo ${VERSION} | sed 's/\"//g'` echo "VERSION: ${VERSION}" diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl index 86d54da..2c29110 100644 --- a/packaging/RHEL-CTDB/samba.spec.tmpl +++ b/packaging/RHEL-CTDB/samba.spec.tmpl @@ -6,7 +6,7 @@ Vendor: Samba Team Packager: Samba Team Name: samba Version: PVERSION -Release: ctdb.55 +Release: 1 Epoch:0 License: GNU GPL version 3 Group: System Environment/Daemons diff --git a/source/VERSION b/source/VERSION index 6a7c8fc..bdcb7de 100644 --- a/source/VERSION +++ b/source/VERSION @@ -95,5 +95,5 @@ SAMBA_VERSION_IS_GIT_SNAPSHOT= # e.g. SAMBA_VERSION_VENDOR_SUFFIX=vendor_version()# # -> "CVS 3.0.0rc2-VendorVersion"# -SAMBA_VERSION_VENDOR_SUFFIX= -SAMBA_VERSION_VENDOR_PATCH= +SAMBA_VERSION_VENDOR_SUFFIX="ctdb" +SAMBA_VERSION_VENDOR_PATCH=55 -- SAMBA-CTDB repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-419-gfda8aba
The branch, master has been updated via fda8abac17892e51c2d5fcdc1f405477bef320ed (commit) from e6bb55c3d5b491ab9e6d568e6ce7594695e53322 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit fda8abac17892e51c2d5fcdc1f405477bef320ed Author: Volker Lendecke Date: Tue Feb 3 14:41:49 2009 +0100 s3: Fix 'net rpc join' for users with the SeMachineAccountPrivilege. --- Summary of changes: source3/libnet/libnet_join.c |7 +-- source3/utils/net_rpc_join.c |7 +-- 2 files changed, 10 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c index b33800f..20f7b97 100644 --- a/source3/libnet/libnet_join.c +++ b/source3/libnet/libnet_join.c @@ -790,7 +790,8 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx, status = rpccli_samr_Connect2(pipe_hnd, mem_ctx, pipe_hnd->desthost, - SEC_RIGHTS_MAXIMUM_ALLOWED, + SAMR_ACCESS_ENUM_DOMAINS + | SAMR_ACCESS_OPEN_DOMAIN, &sam_pol); if (!NT_STATUS_IS_OK(status)) { goto done; @@ -798,7 +799,9 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx, status = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx, &sam_pol, - SEC_RIGHTS_MAXIMUM_ALLOWED, + SAMR_DOMAIN_ACCESS_LOOKUP_INFO_1 + | SAMR_DOMAIN_ACCESS_CREATE_USER + | SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT, r->out.domain_sid, &domain_pol); if (!NT_STATUS_IS_OK(status)) { diff --git a/source3/utils/net_rpc_join.c b/source3/utils/net_rpc_join.c index 5651676..0c363d3 100644 --- a/source3/utils/net_rpc_join.c +++ b/source3/utils/net_rpc_join.c @@ -243,14 +243,17 @@ int net_rpc_join_newstyle(struct net_context *c, int argc, const char **argv) CHECK_RPC_ERR(rpccli_samr_Connect2(pipe_hnd, mem_ctx, pipe_hnd->desthost, - SEC_RIGHTS_MAXIMUM_ALLOWED, + SAMR_ACCESS_ENUM_DOMAINS + | SAMR_ACCESS_OPEN_DOMAIN, &sam_pol), "could not connect to SAM database"); CHECK_RPC_ERR(rpccli_samr_OpenDomain(pipe_hnd, mem_ctx, &sam_pol, -SEC_RIGHTS_MAXIMUM_ALLOWED, +SAMR_DOMAIN_ACCESS_LOOKUP_INFO_1 +| SAMR_DOMAIN_ACCESS_CREATE_USER +| SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT, domain_sid, &domain_pol), "could not open domain"); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-420-g20a1cb1
The branch, master has been updated via 20a1cb15699c781651593c68685ece91c03e6a18 (commit) from fda8abac17892e51c2d5fcdc1f405477bef320ed (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 20a1cb15699c781651593c68685ece91c03e6a18 Author: Stefan Metzmacher Date: Tue Feb 3 15:02:14 2009 +0100 s3:test: try to find why creating BUILTIN\Administrators doesn't work in the build-farm metze --- Summary of changes: source3/script/tests/selftest.sh |8 +--- 1 files changed, 5 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh index c02e0ee..af01d0f 100755 --- a/source3/script/tests/selftest.sh +++ b/source3/script/tests/selftest.sh @@ -346,9 +346,11 @@ START=`date` MAKE_TEST_BINARY="" MAKE_TEST_BINARY="bin/net" - printf "%s" "creating BUILTIN\\Administrators..." - bin/net -s $SERVERCONFFILE sam createbuiltingroup \ - Administrators > /dev/null 2>&1 || exit 1 + printf "%s\n" "creating BUILTIN\\Administrators..." + bin/net -s $SERVERCONFFILE sam createbuiltingroup Administrators || { + echo "FAILED: $?" + exit 1 + } echo "DONE" MAKE_TEST_BINARY="" -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-424-g329b877
The branch, master has been updated via 329b8775f56c8a89f02646e11ba27a33080f48b1 (commit) via b0ea17973400cd15c3fb23c8deb4f9c37b42035a (commit) via 3367812df604bb1d01f59ee2750427426164c519 (commit) via 1318fe8c60cf3e6a12dfaf5933d7750d73cb3878 (commit) from 20a1cb15699c781651593c68685ece91c03e6a18 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 329b8775f56c8a89f02646e11ba27a33080f48b1 Author: Günther Deschner Date: Tue Feb 3 15:31:28 2009 +0100 s3-net: fix warning message for keytab usage. Guenther commit b0ea17973400cd15c3fb23c8deb4f9c37b42035a Author: Günther Deschner Date: Tue Feb 3 14:15:40 2009 +0100 s3-kerberos: use KRB5_KT_KEY compat macro. Guenther commit 3367812df604bb1d01f59ee2750427426164c519 Author: Günther Deschner Date: Tue Feb 3 14:53:58 2009 +0100 s3-kerberos: fix ads_dedicated_keytab_verify_ticket with heimdal. Guenther commit 1318fe8c60cf3e6a12dfaf5933d7750d73cb3878 Author: Günther Deschner Date: Tue Feb 3 14:51:12 2009 +0100 Revert "fix for commit d96248a9b46 which broke Heimdal builds" This does not build. This reverts commit af736923a541df1a37afeb72b8a5652932c4c69c. --- Summary of changes: source3/libads/kerberos_verify.c | 25 ++--- source3/utils/net_ads.c |4 ++-- 2 files changed, 12 insertions(+), 17 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/libads/kerberos_verify.c b/source3/libads/kerberos_verify.c index ec897ad..b903b2a 100644 --- a/source3/libads/kerberos_verify.c +++ b/source3/libads/kerberos_verify.c @@ -45,6 +45,8 @@ static bool ads_dedicated_keytab_verify_ticket(krb5_context context, krb5_ticket *dec_ticket = NULL; krb5_data packet; + krb5_kvno kvno = 0; + krb5_enctype enctype; *pp_tkt = NULL; *keyblock = NULL; @@ -62,7 +64,6 @@ static bool ads_dedicated_keytab_verify_ticket(krb5_context context, packet.length = ticket->length; packet.data = (char *)ticket->data; - *pp_tkt = NULL; ret = krb5_rd_req(context, &auth_context, &packet, NULL, keytab, NULL, &dec_ticket); @@ -71,29 +72,23 @@ static bool ads_dedicated_keytab_verify_ticket(krb5_context context, goto out; } - /* Get the key for checking the pac signature */ #ifdef HAVE_ETYPE_IN_ENCRYPTEDDATA /* Heimdal */ - ret = krb5_kt_get_entry(context, keytab, dec_ticket->server, - dec_ticket.enc_part.kvno, dec_ticket.enc_part.etype, - &kt_entry); + enctype = dec_ticket->ticket.key.keytype; #else /* MIT */ - ret = krb5_kt_get_entry(context, keytab, dec_ticket->server, - dec_ticket->enc_part.kvno, dec_ticket->enc_part.enctype, - &kt_entry); + enctype = dec_ticket->enc_part.enctype; + kvno= dec_ticket->enc_part.kvno; #endif + + /* Get the key for checking the pac signature */ + ret = krb5_kt_get_entry(context, keytab, dec_ticket->server, + kvno, enctype, &kt_entry); if (ret) { DEBUG(0, ("krb5_kt_get_entry failed (%s)\n", error_message(ret))); goto out; } -#ifdef HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK /* Heimdal */ - ret = krb5_copy_keyblock(context, &kt_entry.keyblock, keyblock); -#elif defined(HAVE_KRB5_KEYTAB_ENTRY_KEY) /* MIT */ - ret = krb5_copy_keyblock(context, &kt_entry.key, keyblock); -#else -#error UNKNOWN_KRB5_KEYTAB_ENTRY_FORMAT -#endif + ret = krb5_copy_keyblock(context, KRB5_KT_KEY(&kt_entry), keyblock); smb_krb5_kt_free_entry(context, &kt_entry); if (ret) { diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c index 03786e2..86fb9f6 100644 --- a/source3/utils/net_ads.c +++ b/source3/utils/net_ads.c @@ -2242,8 +2242,8 @@ int net_ads_keytab(struct net_context *c, int argc, const char **argv) }; if (!USE_KERBEROS_KEYTAB) { - d_printf("\nWarning: \"kerberos method\" must be set to a \ - keytab method to use keytab functions.\n"); + d_printf("\nWarning: \"kerberos method\" must be set to a " + "keytab method to use keytab functions.\n"); } return net_run_function(c, argc, argv, "net ads keytab", func); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-428-gb949466
The branch, master has been updated via b94946697dc1d2915f6330f3a02cca7d69bc7cff (commit) via 4976777e3b0f3d8c18182a822937f62c082027c7 (commit) via 8fb6b18bac436d4babdafc4d8b97de70881c1238 (commit) from 35f1e02ca4c31214e85b7c25d8f695eb035871d7 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit b94946697dc1d2915f6330f3a02cca7d69bc7cff Author: Günther Deschner Date: Mon Feb 2 13:38:38 2009 +0100 s3-eventlog: pass down talloc context to parse_logentry(). Guenther commit 4976777e3b0f3d8c18182a822937f62c082027c7 Author: Günther Deschner Date: Mon Feb 2 14:00:01 2009 +0100 s3-eventlog: make logname in elog_open_tdb const. Guenther commit 8fb6b18bac436d4babdafc4d8b97de70881c1238 Author: Günther Deschner Date: Thu Jan 22 19:46:14 2009 +0100 s3-eventlog: allow to open eventlog tdbs readonly. Guenther --- Summary of changes: source3/include/proto.h |4 ++-- source3/rpc_server/srv_eventlog_lib.c | 26 -- source3/rpc_server/srv_eventlog_nt.c |6 +++--- source3/utils/eventlogadm.c |5 +++-- 4 files changed, 24 insertions(+), 17 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/proto.h b/source3/include/proto.h index dfe42db..19d131c 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -6258,11 +6258,11 @@ char *elog_tdbname(TALLOC_CTX *ctx, const char *name ); int elog_tdb_size( TDB_CONTEXT * tdb, int *MaxSize, int *Retention ); bool prune_eventlog( TDB_CONTEXT * tdb ); bool can_write_to_eventlog( TDB_CONTEXT * tdb, int32 needed ); -ELOG_TDB *elog_open_tdb( char *logname, bool force_clear ); +ELOG_TDB *elog_open_tdb( const char *logname, bool force_clear, bool read_only ); int elog_close_tdb( ELOG_TDB *etdb, bool force_close ); int write_eventlog_tdb( TDB_CONTEXT * the_tdb, Eventlog_entry * ee ); void fixup_eventlog_entry( Eventlog_entry * ee ); -bool parse_logentry( char *line, Eventlog_entry * entry, bool * eor ); +bool parse_logentry( TALLOC_CTX *mem_ctx, char *line, Eventlog_entry * entry, bool * eor ); /* The following definitions come from rpc_server/srv_eventlog_nt.c */ diff --git a/source3/rpc_server/srv_eventlog_lib.c b/source3/rpc_server/srv_eventlog_lib.c index 8cbb319..2890dc9 100644 --- a/source3/rpc_server/srv_eventlog_lib.c +++ b/source3/rpc_server/srv_eventlog_lib.c @@ -312,7 +312,7 @@ bool can_write_to_eventlog( TDB_CONTEXT * tdb, int32_t needed ) /*** ***/ -ELOG_TDB *elog_open_tdb( char *logname, bool force_clear ) +ELOG_TDB *elog_open_tdb( const char *logname, bool force_clear, bool read_only ) { TDB_CONTEXT *tdb = NULL; uint32_t vers_id; @@ -322,6 +322,13 @@ ELOG_TDB *elog_open_tdb( char *logname, bool force_clear ) char *eventlogdir; TALLOC_CTX *ctx = talloc_tos(); + /* check for invalid options */ + + if (force_clear && read_only) { + DEBUG(1,("elog_open_tdb: Invalid flags\n")); + return NULL; + } + /* first see if we have an open context */ for ( ptr=open_elog_list; ptr; ptr=ptr->next ) { @@ -363,7 +370,7 @@ ELOG_TDB *elog_open_tdb( char *logname, bool force_clear ) if ( !force_clear ) { - tdb = tdb_open_log( tdbpath, 0, TDB_DEFAULT, O_RDWR , 0 ); + tdb = tdb_open_log( tdbpath, 0, TDB_DEFAULT, read_only ? O_RDONLY : O_RDWR , 0 ); if ( tdb ) { vers_id = tdb_fetch_int32( tdb, EVT_VERSION ); @@ -587,9 +594,8 @@ void fixup_eventlog_entry( Eventlog_entry * ee ) going in. / -bool parse_logentry( char *line, Eventlog_entry * entry, bool * eor ) +bool parse_logentry( TALLOC_CTX *mem_ctx, char *line, Eventlog_entry * entry, bool * eor ) { - TALLOC_CTX *ctx = talloc_tos(); char *start = NULL, *stop = NULL; start = line; @@ -660,7 +666,7 @@ bool parse_logentry( char *line, Eventlog_entry * entry, bool * eor ) while ( isspace( stop[0] ) ) { stop++; } - entry->data_record.source_name_len = rpcstr_push_talloc(ctx, + entry->data_record.source_name_len = rpcstr_push_talloc(mem_ctx, &entry->data_record.source_name, stop); if (entry->data_record.source_name_len == (uint32_t)-1 || @@ -672,7 +678,7 @@ bool parse_logentry( char *line, Eventlog_entry * entry, bool * eor ) while ( isspace( stop[0] ) ) { stop++; } -
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-433-g63bb31e
The branch, master has been updated via 63bb31e11812264aa377abdd4c256c46dde236b0 (commit) via c53e3bfa7d1854494cb144b099eded8860f92e2a (commit) via cf3be5ce7a7f318cfb84baba4d1fc56ddd8f5497 (commit) via 1c627c22324fbb83de4c602cdbdd658ab53cde54 (commit) via 268f87df61dbf2625d33c149607db046f60dd5fd (commit) from b94946697dc1d2915f6330f3a02cca7d69bc7cff (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 63bb31e11812264aa377abdd4c256c46dde236b0 Author: Günther Deschner Date: Thu Jan 22 20:14:28 2009 +0100 s3-docs: add documentation for dump option of eventlogadm. Guenther commit c53e3bfa7d1854494cb144b099eded8860f92e2a Author: Günther Deschner Date: Thu Jan 22 20:11:19 2009 +0100 s3-eventlogadm: add command to dump stored tdb entries. Guenther commit cf3be5ce7a7f318cfb84baba4d1fc56ddd8f5497 Author: Günther Deschner Date: Thu Jan 15 20:28:30 2009 +0100 s3-eventlog: add evlog_pull_record_tdb function. Guenther commit 1c627c22324fbb83de4c602cdbdd658ab53cde54 Author: Günther Deschner Date: Tue Feb 3 15:55:46 2009 +0100 s3: re-run make samba3-idl. Guenther commit 268f87df61dbf2625d33c149607db046f60dd5fd Author: Günther Deschner Date: Thu Jan 15 15:32:18 2009 +0100 eventlog: add eventlog_Record_tdb to support the traditional s3 on-disc format. Guenther --- Summary of changes: docs-xml/manpages-3/eventlogadm.8.xml | 26 + librpc/gen_ndr/eventlog.h | 29 ++ librpc/gen_ndr/ndr_eventlog.c | 174 + librpc/gen_ndr/ndr_eventlog.h |3 + librpc/idl/eventlog.idl | 32 ++ source3/Makefile.in |4 +- source3/include/proto.h |3 + source3/rpc_server/srv_eventlog_lib.c | 55 ++ source3/utils/eventlogadm.c | 53 ++ 9 files changed, 378 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages-3/eventlogadm.8.xml b/docs-xml/manpages-3/eventlogadm.8.xml index 51a066f..fa514de 100644 --- a/docs-xml/manpages-3/eventlogadm.8.xml +++ b/docs-xml/manpages-3/eventlogadm.8.xml @@ -40,6 +40,18 @@ + + eventlogadm + -d + -h + -o + dump + EVENTLOG + RECORD_NUMBER + + + + @@ -97,6 +109,20 @@ + + -o + write + EVENTLOG + RECORD_NUMBER + + + The -o dump reads event log + records from a EVENTLOG tdb and dumps them to standard + output on screen. + + + + -h Print usage information. diff --git a/librpc/gen_ndr/eventlog.h b/librpc/gen_ndr/eventlog.h index 8dc0d0d..0c998a8 100644 --- a/librpc/gen_ndr/eventlog.h +++ b/librpc/gen_ndr/eventlog.h @@ -65,6 +65,35 @@ struct eventlog_Record { uint32_t size2;/* [value(size)] */ }/* [public,flag(LIBNDR_FLAG_NOALIGN)] */; +struct eventlog_Record_tdb { + uint32_t size; + const char *reserved;/* [value("eLfL"),charset(DOS)] */ + uint32_t record_number; + time_t time_generated; + time_t time_written; + uint32_t event_id; + enum eventlogEventTypes event_type; + uint16_t num_of_strings;/* [range(0,256)] */ + uint16_t event_category; + uint16_t reserved_flags; + uint32_t closing_record_number; + uint32_t stringoffset; + uint32_t sid_length;/* [value(sid.length)] */ + uint32_t sid_offset; + uint32_t data_length;/* [value(data.length)] */ + uint32_t data_offset; + uint32_t source_name_len;/* [value(2*strlen_m_term(source_name))] */ + const char * source_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */ + uint32_t computer_name_len;/* [value(2*strlen_m_term(computer_name))] */ + const char * computer_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */ + uint32_t sid_padding; + DATA_BLOB sid; + uint32_t strings_len;/* [value(2*ndr_size_string_array(strings,num_of_strings,LIBNDR_FLAG_STR_NULLTERM))] */ + const char * *strings;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */ + DATA_BLOB data; + uint32_t padding; +}/* [public,flag(LIBNDR_FLAG_NOALIGN|LIBNDR_PRINT_ARRAY_HEX)] */; + struct EVENTLOG_FULL_INFORMATION { uint32_t full; }; diff --git a/librpc/gen_ndr/ndr_eventlog.c b/librpc/gen_ndr/ndr_eventlog.c index 938f0db..a43b343 100644 --- a/librpc/gen_ndr/ndr_eventlog.c +++ b/librpc/gen_ndr/ndr_eventlog.c @@ -287,6 +287,180 @@ _PUBLIC_ void
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-440-g8b408f7
The branch, master has been updated via 8b408f781970b3f2b310389f9ae73ad0c5e42881 (commit) via 7c72853b50b14653fe3c62fde3bf653b45c755f8 (commit) via a5f9816263b67d87a62bb7e18aa10a7b0ba44794 (commit) via 388da7ca97b86aef9e344c2259d0d910dd0659d5 (commit) via e2aab39e560dc395fe8aba53ffd6fc42b025aa36 (commit) via adc9d105cdce4500d16f86b39401ae3aa3b0cacd (commit) via c3ab29265546a56377a22ddc67701871ea41262c (commit) from 63bb31e11812264aa377abdd4c256c46dde236b0 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 8b408f781970b3f2b310389f9ae73ad0c5e42881 Author: Stefan Metzmacher Date: Tue Feb 3 16:23:13 2009 +0100 s4:selftest: avoid hardcoded pathes in blackbox tests metze commit 7c72853b50b14653fe3c62fde3bf653b45c755f8 Author: Stefan Metzmacher Date: Tue Feb 3 16:21:54 2009 +0100 s4:selftest: don't use hardcoded pathes metze commit a5f9816263b67d87a62bb7e18aa10a7b0ba44794 Author: Stefan Metzmacher Date: Tue Feb 3 16:20:24 2009 +0100 selftest: don't use hardcoded path to nmblookup in Samba4.pm metze commit 388da7ca97b86aef9e344c2259d0d910dd0659d5 Author: Stefan Metzmacher Date: Tue Feb 3 16:19:46 2009 +0100 selftest: export BUILDDIR, BUILDDIR_ABS and EXEEXT metze commit e2aab39e560dc395fe8aba53ffd6fc42b025aa36 Author: Stefan Metzmacher Date: Tue Feb 3 16:16:17 2009 +0100 s4:lib/ldb: call ldb utils always via $VALGRIND ldbfoo$EXEEXT in the tests metze commit adc9d105cdce4500d16f86b39401ae3aa3b0cacd Author: Stefan Metzmacher Date: Tue Feb 3 16:10:52 2009 +0100 merged-build: link in LIBREPLACE into samba4 code as in the native build metze commit c3ab29265546a56377a22ddc67701871ea41262c Author: Stefan Metzmacher Date: Tue Feb 3 02:32:57 2009 +0100 merged-build: force non-shared build for samba4 This should fix 'make test4'. metze --- Summary of changes: nsswitch/tests/test_wbinfo.sh |4 +- selftest/selftest.pl |4 ++ selftest/target/Samba4.pm | 25 +- source3/configure.in |3 + source3/samba4-templates.mk|8 ++-- source3/samba4.m4 | 18 +++ source4/client/tests/test_cifsdd.sh|4 +- source4/client/tests/test_smbclient.sh |4 +- source4/lib/ldb/tests/test-extended.sh |6 +- source4/lib/ldb/tests/test-generic.sh | 68 ++-- source4/lib/ldb/tests/test-tdb-features.sh | 34 +++--- source4/lib/ldb/tests/test-tdb.sh |4 +- source4/librpc/tests/test_ndrdump.sh |4 +- source4/selftest/tests.sh | 36 +++--- source4/torture/tests/test_gentest.sh |4 +- source4/torture/tests/test_locktest.sh |4 +- source4/torture/tests/test_masktest.sh |4 +- source4/utils/tests/test_net.sh|7 ++- source4/utils/tests/test_nmblookup.sh | 15 --- testprogs/blackbox/test_kinit.sh | 22 + testprogs/blackbox/test_ldb.sh | 45 ++- 21 files changed, 179 insertions(+), 144 deletions(-) Changeset truncated at 500 lines: diff --git a/nsswitch/tests/test_wbinfo.sh b/nsswitch/tests/test_wbinfo.sh index 84876e3..2e94c24 100755 --- a/nsswitch/tests/test_wbinfo.sh +++ b/nsswitch/tests/test_wbinfo.sh @@ -14,8 +14,8 @@ TARGET=$4 shift 4 failed=0 -samba4bindir=`dirname $0`/../../source4/bin -wbinfo=$samba4bindir/wbinfo +samba4bindir="$BUILDDIR/bin" +wbinfo="$samba4bindir/wbinfo$EXEEXT" . `dirname $0`/../../testprogs/blackbox/subunit.sh diff --git a/selftest/selftest.pl b/selftest/selftest.pl index f6561cc..0be2e78 100755 --- a/selftest/selftest.pl +++ b/selftest/selftest.pl @@ -394,6 +394,7 @@ mkdir($prefix, 0777) unless -d $prefix; my $prefix_abs = abs_path($prefix); my $srcdir_abs = abs_path($srcdir); +my $builddir_abs = abs_path($builddir); die("using an empty absolute prefix isn't allowed") unless $prefix_abs ne ""; die("using '/' as absolute prefix isn't allowed") unless $prefix_abs ne "/"; @@ -403,6 +404,9 @@ $ENV{KRB5CCNAME} = "$prefix/krb5ticket"; $ENV{PREFIX_ABS} = $prefix_abs; $ENV{SRCDIR} = $srcdir; $ENV{SRCDIR_ABS} = $srcdir_abs; +$ENV{BUILDDIR} = $builddir; +$ENV{BUILDDIR_ABS} = $builddir_abs; +$ENV{EXEEXT} = $exeext; if (defined($ENV{RUN_FROM_BUILD_FARM}) and ($ENV{RUN_FROM_BUILD_FARM} eq "yes")) { diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index 5ca1a6a..0f7d317 100644 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -159,18 +159,19 @@ sub wait_for_start($$) # This will return quickly when things are up, but be slow if we # need to wait
[SCM] SAMBA-CTDB repository - branch v3-2-ctdb updated - build_3.2.7_ctdb.54-37-ga9a506b
The branch, v3-2-ctdb has been updated via a9a506b6640986548e2ae8540b7ae93960d6ece5 (commit) via f5cd88a25f360e6609dc5abe24247fab78af6854 (commit) from fc122aa276bce379b492e5bdf52ab3e03bc3737f (commit) http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-2-ctdb - Log - commit a9a506b6640986548e2ae8540b7ae93960d6ece5 Author: Michael Adam Date: Wed Jan 21 09:49:12 2009 +0100 packaging(RHEL-CTDB): makerpms.sh: build winbind-32bit libs in the 64bit build Michael commit f5cd88a25f360e6609dc5abe24247fab78af6854 Author: Michael Adam Date: Tue Jan 20 19:47:28 2009 +0100 packaging(RHEL-CTDB): Build winbind-32bit package in the 64bit build Michael --- Summary of changes: packaging/RHEL-CTDB/makerpms.sh | 17 +++--- packaging/RHEL-CTDB/samba.spec.tmpl | 103 --- 2 files changed, 105 insertions(+), 15 deletions(-) Changeset truncated at 500 lines: diff --git a/packaging/RHEL-CTDB/makerpms.sh b/packaging/RHEL-CTDB/makerpms.sh index 50fa96c..8da9078 100755 --- a/packaging/RHEL-CTDB/makerpms.sh +++ b/packaging/RHEL-CTDB/makerpms.sh @@ -88,19 +88,20 @@ cp -p ${SPECFILE} ${RPMSPECDIR} popd ## -## Build +## some symlink fixes for building 32bit compat libs ## -echo "$(basename $0): Getting Ready to build release package" -pushd ${RPMSPECDIR} -${RPM} -ba $EXTRA_OPTIONS $SPECFILE -if [ "x$?" = "x0" ] && [ `arch` = "x86_64" ]; then -echo "Building 32 bit winbind libs" -# hi ho, a hacking we will go ... +if [ `arch` = "x86_64" ]; then ln -sf /lib/libcom_err.so.2 /lib/libcom_err.so ln -sf /lib/libuuid.so.1 /lib/libuuid.so -${RPM} -ba --rebuild --target=i386 $SPECFILE fi +## +## Build +## +echo "$(basename $0): Getting Ready to build release package" + +pushd ${RPMSPECDIR} +${RPM} -ba $EXTRA_OPTIONS $SPECFILE popd echo "$(basename $0): Done." diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl index 2c29110..6d053c6 100644 --- a/packaging/RHEL-CTDB/samba.spec.tmpl +++ b/packaging/RHEL-CTDB/samba.spec.tmpl @@ -93,7 +93,7 @@ The samba-swat package includes the new SWAT (Samba Web Administration Tool), for remotely managing Samba's smb.conf file using your favorite Web browser. -%ifarch i386 i486 i586 i686 ppc s390 +%ifarch x86_64 ppc64 %package winbind-32bit Summary:Samba winbind compatibility package for 32bit apps on 64bit archs Group: Applications/System @@ -144,6 +144,80 @@ export CC ## always run autogen.sh ./autogen.sh + +## +## build the files for the winbind-32bit compat package +## and copy them to a safe location +## +%ifarch x86_64 ppc64 + +# a directory to store the 32bit compatibility modules for later install +%define _32bit_tmp_dir %{_tmppath}/%{name}-%{version}-32bit + +CC_SAVE="$CC" +CC="$CC -m32" + +CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -m32" ./configure \ + --prefix=%{_prefix} \ + --localstatedir=/var \ +--with-configdir=%{_sysconfdir}/samba \ +--with-libdir=/usr/lib/samba \ + --with-pammodulesdir=/lib/security \ +--with-lockdir=/var/lib/samba \ +--with-logfilebase=/var/log/samba \ +--with-mandir=%{_mandir} \ +--with-piddir=/var/run \ + --with-privatedir=%{_sysconfdir}/samba \ + --disable-cups \ +--with-acl-support \ + --with-ads \ +--with-automount \ +--with-fhs \ + --with-pam_smbpass \ + --with-libsmbclient \ + --with-libsmbsharemodes \ +--without-smbwrapper \ + --with-pam \ + --with-quotas \ + --with-syslog \ + --with-utmp \ + --with-cluster-support \ + --with-ctdb=/usr/include \ + --without-ldb \ + --without-dnsupdate \ + --with-aio-support + +make showlayout + +make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -m32" proto + +## check for gcc 3.4 or later +CC_VERSION=`${CC} --version | head -1 | awk '{print $3}'` +CC_MAJOR=`echo ${CC_VERSION} | cut -d. -f 1` +CC_MINOR=`echo ${CC_VERSION} | cut -d. -f 2` +if [ ${CC_MAJOR} -ge 3 ]; then +if [ ${CC_MAJOR} -gt 3 -o ${CC_MINOR} -ge 4 ]; then +make pch +fi +fi + +make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -m32" %{?_smp_mflags} \ + nss_modules pam_modules + +rm -rf %{_32bit_tmp_dir} +mkdir %{_32bit_tmp_dir} + +mv nsswitch/libnss_winbind.so %{_32bit_tmp_dir}/ +mv bin/pam_winbind.so %{_32bit_tmp_dir}/ +mv bin/libtalloc.so* %{_32bit_tmp_dir}/ +mv bin/libtdb.so* %{_32bit_tmp_dir}/ + +make clean + +CC="$CC_SAVE" + +%endif + CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \ --prefix=%{_prefix} \ --localstatedir=/var \ @@ -210,6 +284,7 @@ mkdir -p $RPM_BUILD_ROOT%{_initrddir} mkdir -p $RPM_BUILD_ROOT{%{_libarchdir},%{_includedir}} mkdir -p $RPM_BUILD_ROOT%{_libarchdir}/samba/{auth,charset,
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4902-g5994c90
The branch, v3-3-test has been updated via 5994c90ff8754b64a3a6658e28bd94f6a91a441b (commit) from c5462c8b43435763783185a03029903efe3b0c11 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit 5994c90ff8754b64a3a6658e28bd94f6a91a441b Author: Volker Lendecke Date: Tue Feb 3 14:41:49 2009 +0100 s3: Fix 'net rpc join' for users with the SeMachineAccountPrivilege. This used to be commit fda8abac in master. --- Summary of changes: source/libnet/libnet_join.c |7 +-- source/utils/net_rpc_join.c |7 +-- 2 files changed, 10 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/source/libnet/libnet_join.c b/source/libnet/libnet_join.c index b8d903c..488996c 100644 --- a/source/libnet/libnet_join.c +++ b/source/libnet/libnet_join.c @@ -790,7 +790,8 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx, status = rpccli_samr_Connect2(pipe_hnd, mem_ctx, pipe_hnd->desthost, - SEC_RIGHTS_MAXIMUM_ALLOWED, + SAMR_ACCESS_ENUM_DOMAINS + | SAMR_ACCESS_OPEN_DOMAIN, &sam_pol); if (!NT_STATUS_IS_OK(status)) { goto done; @@ -798,7 +799,9 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx, status = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx, &sam_pol, - SEC_RIGHTS_MAXIMUM_ALLOWED, + SAMR_DOMAIN_ACCESS_LOOKUP_INFO_1 + | SAMR_DOMAIN_ACCESS_CREATE_USER + | SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT, r->out.domain_sid, &domain_pol); if (!NT_STATUS_IS_OK(status)) { diff --git a/source/utils/net_rpc_join.c b/source/utils/net_rpc_join.c index d8641bf..dfab65c 100644 --- a/source/utils/net_rpc_join.c +++ b/source/utils/net_rpc_join.c @@ -243,14 +243,17 @@ int net_rpc_join_newstyle(struct net_context *c, int argc, const char **argv) CHECK_RPC_ERR(rpccli_samr_Connect2(pipe_hnd, mem_ctx, pipe_hnd->desthost, - SEC_RIGHTS_MAXIMUM_ALLOWED, + SAMR_ACCESS_ENUM_DOMAINS + | SAMR_ACCESS_OPEN_DOMAIN, &sam_pol), "could not connect to SAM database"); CHECK_RPC_ERR(rpccli_samr_OpenDomain(pipe_hnd, mem_ctx, &sam_pol, -SEC_RIGHTS_MAXIMUM_ALLOWED, +SAMR_DOMAIN_ACCESS_LOOKUP_INFO_1 +| SAMR_DOMAIN_ACCESS_CREATE_USER +| SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT, domain_sid, &domain_pol), "could not open domain"); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3424-g8ddb30c
The branch, v3-2-test has been updated via 8ddb30ca90d31624ba86cd731f573aedad43face (commit) via 11c966b7bc30b17de1bb360f405f6cb956dd5c83 (commit) from c415b6a48dae2809d5d60b0af23eb7781f1146db (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 8ddb30ca90d31624ba86cd731f573aedad43face Author: Volker Lendecke Date: Tue Feb 3 14:41:49 2009 +0100 s3: Fix 'net rpc join' for users with the SeMachineAccountPrivilege. This used to be commit fda8abac in master. commit 11c966b7bc30b17de1bb360f405f6cb956dd5c83 Author: Karolin Seeger Date: Tue Feb 3 14:49:08 2009 +0100 WHATSNEW: Update changes since 3.2.7. Karolin --- Summary of changes: WHATSNEW.txt|1 + source/libnet/libnet_join.c |7 +-- source/utils/net_rpc_join.c |7 +-- 3 files changed, 11 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index a492967..47fd5b0 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -104,6 +104,7 @@ o Volker Lendecke * Fix an ancient uninitialized variable read. * Fix a bad memleak in vfs_full_audit. * Fix several valgrind errors. +* Fix 'net rpc join' for users with the SeMachineAccountPrivilege. o Herb Lewis diff --git a/source/libnet/libnet_join.c b/source/libnet/libnet_join.c index e7302b4..c13ac9b 100644 --- a/source/libnet/libnet_join.c +++ b/source/libnet/libnet_join.c @@ -761,7 +761,8 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx, status = rpccli_samr_Connect2(pipe_hnd, mem_ctx, pipe_hnd->cli->desthost, - SEC_RIGHTS_MAXIMUM_ALLOWED, + SAMR_ACCESS_ENUM_DOMAINS + | SAMR_ACCESS_OPEN_DOMAIN, &sam_pol); if (!NT_STATUS_IS_OK(status)) { goto done; @@ -769,7 +770,9 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx, status = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx, &sam_pol, - SEC_RIGHTS_MAXIMUM_ALLOWED, + SAMR_DOMAIN_ACCESS_LOOKUP_INFO_1 + | SAMR_DOMAIN_ACCESS_CREATE_USER + | SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT, r->out.domain_sid, &domain_pol); if (!NT_STATUS_IS_OK(status)) { diff --git a/source/utils/net_rpc_join.c b/source/utils/net_rpc_join.c index b9d7d59..0e8f47b 100644 --- a/source/utils/net_rpc_join.c +++ b/source/utils/net_rpc_join.c @@ -239,14 +239,17 @@ int net_rpc_join_newstyle(int argc, const char **argv) CHECK_RPC_ERR(rpccli_samr_Connect2(pipe_hnd, mem_ctx, pipe_hnd->cli->desthost, - SEC_RIGHTS_MAXIMUM_ALLOWED, + SAMR_ACCESS_ENUM_DOMAINS + | SAMR_ACCESS_OPEN_DOMAIN, &sam_pol), "could not connect to SAM database"); CHECK_RPC_ERR(rpccli_samr_OpenDomain(pipe_hnd, mem_ctx, &sam_pol, -SEC_RIGHTS_MAXIMUM_ALLOWED, +SAMR_DOMAIN_ACCESS_LOOKUP_INFO_1 +| SAMR_DOMAIN_ACCESS_CREATE_USER +| SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT, domain_sid, &domain_pol), "could not open domain"); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-7-163-gf39371e
The branch, v3-2-stable has been updated via f39371e3acc476397898a30f3bf3dac9d34fbb53 (commit) via 565bbfc5446c73de3f08ced5be07442f2732d6ce (commit) from 3fbd714a688abc21a088ebbe0dd1716a6eb1b522 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable - Log - commit f39371e3acc476397898a30f3bf3dac9d34fbb53 Author: Volker Lendecke Date: Tue Feb 3 14:41:49 2009 +0100 s3: Fix 'net rpc join' for users with the SeMachineAccountPrivilege. This used to be commit fda8abac in master. (cherry picked from commit 8ddb30ca90d31624ba86cd731f573aedad43face) commit 565bbfc5446c73de3f08ced5be07442f2732d6ce Author: Karolin Seeger Date: Tue Feb 3 14:49:08 2009 +0100 WHATSNEW: Update changes since 3.2.7. Karolin (cherry picked from commit 11c966b7bc30b17de1bb360f405f6cb956dd5c83) --- Summary of changes: WHATSNEW.txt|1 + source/libnet/libnet_join.c |7 +-- source/utils/net_rpc_join.c |7 +-- 3 files changed, 11 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index a492967..47fd5b0 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -104,6 +104,7 @@ o Volker Lendecke * Fix an ancient uninitialized variable read. * Fix a bad memleak in vfs_full_audit. * Fix several valgrind errors. +* Fix 'net rpc join' for users with the SeMachineAccountPrivilege. o Herb Lewis diff --git a/source/libnet/libnet_join.c b/source/libnet/libnet_join.c index e7302b4..c13ac9b 100644 --- a/source/libnet/libnet_join.c +++ b/source/libnet/libnet_join.c @@ -761,7 +761,8 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx, status = rpccli_samr_Connect2(pipe_hnd, mem_ctx, pipe_hnd->cli->desthost, - SEC_RIGHTS_MAXIMUM_ALLOWED, + SAMR_ACCESS_ENUM_DOMAINS + | SAMR_ACCESS_OPEN_DOMAIN, &sam_pol); if (!NT_STATUS_IS_OK(status)) { goto done; @@ -769,7 +770,9 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx, status = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx, &sam_pol, - SEC_RIGHTS_MAXIMUM_ALLOWED, + SAMR_DOMAIN_ACCESS_LOOKUP_INFO_1 + | SAMR_DOMAIN_ACCESS_CREATE_USER + | SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT, r->out.domain_sid, &domain_pol); if (!NT_STATUS_IS_OK(status)) { diff --git a/source/utils/net_rpc_join.c b/source/utils/net_rpc_join.c index b9d7d59..0e8f47b 100644 --- a/source/utils/net_rpc_join.c +++ b/source/utils/net_rpc_join.c @@ -239,14 +239,17 @@ int net_rpc_join_newstyle(int argc, const char **argv) CHECK_RPC_ERR(rpccli_samr_Connect2(pipe_hnd, mem_ctx, pipe_hnd->cli->desthost, - SEC_RIGHTS_MAXIMUM_ALLOWED, + SAMR_ACCESS_ENUM_DOMAINS + | SAMR_ACCESS_OPEN_DOMAIN, &sam_pol), "could not connect to SAM database"); CHECK_RPC_ERR(rpccli_samr_OpenDomain(pipe_hnd, mem_ctx, &sam_pol, -SEC_RIGHTS_MAXIMUM_ALLOWED, +SAMR_DOMAIN_ACCESS_LOOKUP_INFO_1 +| SAMR_DOMAIN_ACCESS_CREATE_USER +| SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT, domain_sid, &domain_pol), "could not open domain"); -- Samba Shared Repository
[SCM] Samba Shared Repository - annotated tag release-3-2-8 created - release-3-2-8
The annotated tag, release-3-2-8 has been created at 9233db57ce51ef058f72062fb5d1e0aee6dfdd41 (tag) tagging f39371e3acc476397898a30f3bf3dac9d34fbb53 (commit) replaces release-3-2-7 tagged by Karolin Seeger on Tue Feb 3 17:23:30 2009 +0100 - Log - tag release-3-2-8 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iD8DBQBJiG+fbzORW2Vot+oRApyuAKCLyLkRtiat1v4Qd4S+xUmESIZq3wCfarut UkXywoiQrBjRBM2kHJKO3aU= =QlzD -END PGP SIGNATURE- Andreas Schneider (4): Fix a segfault if ? is there but the options are NULL. This is the case if SMBC_parse_path is called by SMBC_stat_ctx. Avoid flooding of syslog with failing pam_putenv messages. Document default of the printing config variable. Use talloc_tos() instead of the talloc NULL context. Andrew Tridgell (1): keep compatibility with v3-0-ctdb name for fileid:mapping option Björn Jacke (8): correct the description of the "ldap timeout" parameter give configure check "sub-second timestamps without struct timespec" a chance to succeed rather cosmetic fix for failed birthtime configure checks add configure check for AIX style sub-second resolution support add missing semicolons add configure check for Tru64 sub-second timestamp resolution add Tru64 sub-second resolution timestamp support fix build with external dns_sd libraries Bo Yang (6): clean event context after child is forked. Don't set child->requests to NULL in parent after fork Backport of the clean event context after fork and Fix null pointer refrence in event context in backport from v3-3-test Don't send message to any other child in child process. Fix bug in get_dc_name_via_netlogon(), null pointer refrence. Derrell Lipman (3): Treat file names in POSIX-like case-sensitive fashion by default [Bug 6022] smbc_urlencode and smbc_urldecode were not exported Determine case sensitivity based on file system attributes. Gerald (Jerry) Carter (1): Fix "allow trusted domain" so it disables trusted domains. Günther Deschner (3): s3-eventlog: fix buffer allocation in eventlog read call. s3-eventlog: fix various invalid memcpy in read_package_entry(). s3-docs: fix typo in eventlogadm manpage. Herb Lewis (1): don't return 0 on error - bad for scripts Jeff Layton (1): mount.cifs: allow mounts to ipv6 capable servers Jelmer Vernooij (4): Make the make output a bit less chatty. Add test target in Makefile. Use double colon targets. Depend on latexfigures files directly as using a rule in between causes problems. Jeremy Allison (29): Revert "Final part of fix for bug #5953 - smbclient crashes: cli_list_new segmentation fault (with NASBASIC server)." Fix bug #5979 - Level 2 oplocks being granted improperly, Fix bug #5980 - Race condition when granting level2 oplocks can cause break notify to be missed. Fix bug #5986 - Editing a stream is broken (rename problems). Fix bug #5990 - strict allocate should be checked before ftruncate Fix bug #6009 - Setting "min receivefile size = 1" breaks writes. Attempt to fix crash seen with new CUPS async printcap loading code. Fix the build (event context init was different). Fix bug #6017, - magic script does not work. based on a patch from mo...@samba.gr.jp. Fix bug #6016 - Alternate Data Streams / Extended Attributes seem to conflict. Fix race condition in alarm lock processing noticed by Richard Sharpe . Remove "strict allocate = partial" code that got accidentally committed. Fix bug #6021 - smbclient du command does not recuse properly Fix logic bug introduce in backport of ccache_regain_all_now, sync with Fix bug #6019 File corruption in Clustered SMB/NFS environment managed via CTDB From boyang - ensure we never "return" from a forked child, always _exit(). Fix bug #6035 - Possible race between fcntl F_SETLKW and alarm delivery. Fix bug #6040 - Calling Samba print server with an aliased DNS-name fails. Allow reinit_after_fork to be called safely from within swat and other binaries that don't have Fix bug #6040 - Missing header in Status page. "First thing, kill all the language lawyers" :-). Ensure possible insane compilers Another attempt to fix bug #4308 - Excel save operation corrupts file ACLs. Second part of the attemt to fix #4308 - Excel save operation corrupts file ACLs. Fix logic error in try_chown - we shouldn't arbitrarily chown Apply same logic fix for #4308 Excel save operation corrupts file ACLs Fix detection of dns_sd libraries. Make the LookupRid access check match LookupName until Fix usrmgr opening a user object as non-root. Following Björn JACKE's patch, unify the detec
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-443-g98e2fe5
The branch, master has been updated via 98e2fe5e6d7634aa1ecf12b1b1fb23c82b3f16c5 (commit) via 484c4a5955d0365beb9587bb15c73fe3ed3301ce (commit) via aa9592991a1f406708fc08fd32cd630f0e9ed43d (commit) from 8b408f781970b3f2b310389f9ae73ad0c5e42881 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 98e2fe5e6d7634aa1ecf12b1b1fb23c82b3f16c5 Author: Stefan Metzmacher Date: Tue Feb 3 17:43:23 2009 +0100 s3:selftest: fix blackbox.net_s3 tests metze commit 484c4a5955d0365beb9587bb15c73fe3ed3301ce Author: Stefan Metzmacher Date: Tue Feb 3 17:05:24 2009 +0100 Revert "s3:selftest: create BUILTIN\\Administrators at startup" This reverts commit a849183f9492d09ccd7e273f955d4d8f2668fdf3. This is to racy for most of the build-farm machines, because winbindd doesn't start fast enough. metze commit aa9592991a1f406708fc08fd32cd630f0e9ed43d Author: Stefan Metzmacher Date: Tue Feb 3 17:04:42 2009 +0100 Revert "s3:test: try to find why creating BUILTIN\Administrators doesn't work in the build-farm" This reverts commit 20a1cb15699c781651593c68685ece91c03e6a18. I will also revert a849183f9492d09ccd7e273f955d4d8f2668fdf3 metze --- Summary of changes: source3/script/tests/selftest.sh |9 - source3/script/tests/test_net_registry.sh | 15 ++- source3/selftest/tests.sh |2 +- 3 files changed, 11 insertions(+), 15 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh index af01d0f..9462184 100755 --- a/source3/script/tests/selftest.sh +++ b/source3/script/tests/selftest.sh @@ -345,15 +345,6 @@ START=`date` bin/smbclient $CONFIGURATION -L $SERVER_IP -U% -p 139 | head -2 MAKE_TEST_BINARY="" - MAKE_TEST_BINARY="bin/net" - printf "%s\n" "creating BUILTIN\\Administrators..." - bin/net -s $SERVERCONFFILE sam createbuiltingroup Administrators || { - echo "FAILED: $?" - exit 1 - } - echo "DONE" - MAKE_TEST_BINARY="" - failed=0 . $SCRIPTDIR/tests_$SUBTESTS.sh diff --git a/source3/script/tests/test_net_registry.sh b/source3/script/tests/test_net_registry.sh index a3d1a24..52a78bc 100755 --- a/source3/script/tests/test_net_registry.sh +++ b/source3/script/tests/test_net_registry.sh @@ -7,10 +7,8 @@ RPC="$1" NET="$VALGRIND ${NET:-$BINDIR/net} $CONFIGURATION" -NETREMOTE="${NET} -U${USERNAME}%${PASSWORD} -S ${SERVER} -I ${SERVER_IP}" - if test "x${RPC}" = "xrpc" ; then - NETREG="${NETREMOTE} rpc registry" + NETREG="${NET} -U${USERNAME}%${PASSWORD} -I ${SERVER_IP} rpc registry" else NETREG="${NET} registry" fi @@ -336,7 +334,14 @@ test_setvalue_twice() give_administrative_rights() { - ${NETREMOTE} rpc group addmem BUILTIN\\Administrators $USERNAME + bin/net -s $SERVERCONFFILE sam createbuiltingroup Administrators + if test "x$?" != "x0" ; then + echo "ERROR: creating builtin group Administrators" + false + return + fi + + bin/net -s $SERVERCONFFILE sam addmem BUILTIN\\Administrators $USERNAME if test "x$?" != "x0" ; then echo "ERROR: adding user $USERNAME to BUILTIN\\Administrators" false @@ -347,7 +352,7 @@ give_administrative_rights() take_administrative_rights() { - ${NETREMOTE} rpc group delmem BUILTIN\\Administrators $USERNAME + bin/net -s $SERVERCONFFILE sam delmem BUILTIN\\Administrators $USERNAME if test "x$?" != "x0" ; then echo "ERROR: removing user $USERNAME from BUILTIN\\Administrators" false diff --git a/source3/selftest/tests.sh b/source3/selftest/tests.sh index 812a3a7..f88dab0 100755 --- a/source3/selftest/tests.sh +++ b/source3/selftest/tests.sh @@ -127,7 +127,7 @@ plantest "blackbox.smbclient_s3.crypt" dc BINDIR="$BINDIR" script/tests/test_smb #plantest "blackbox.smbclient_s3.crypt member creds" member BINDIR="$BINDIR" script/tests/test_smbclient_s3.sh \$SERVER \$SERVER_IP \$SERVER\$USERNAME \$PASSWORD "-e" #plantest "blackbox.smbclient_s3.crypt domain creds" member BINDIR="$BINDIR" script/tests/test_smbclient_s3.sh \$SERVER \$SERVER_IP \$DOMAIN\$DC_USERNAME \$DC_PASSWORD "-e" -plantest "blackbox.net_s3" dc BINDIR="$BINDIR" SCRIPTDIR="$SCRIPTDIR" script/tests/test_net_s3.sh +plantest "blackbox.net_s3" dc:local BINDIR="$BINDIR" SCRIPTDIR="$SCRIPTDIR" SERVERCONFFILE="\$SMB_CONF_PATH" script/tests/test_net_s3.sh ( shift $# -- Samba Shared Repository
svn commit: samba-web r1269 - in trunk: . devel history
Author: kseeger Date: 2009-02-03 16:54:07 + (Tue, 03 Feb 2009) New Revision: 1269 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=1269 Log: Announce Samba 3.2.8 Karolin Added: trunk/history/samba-3.2.8.html Modified: trunk/devel/index.html trunk/header_columns.html trunk/history/header_history.html trunk/index.html Changeset: Modified: trunk/devel/index.html === --- trunk/devel/index.html 2009-02-02 13:43:21 UTC (rev 1268) +++ trunk/devel/index.html 2009-02-03 16:54:07 UTC (rev 1269) @@ -32,7 +32,7 @@ GPLv3. Ongoing future research is being done for Samba 4.0 -This work is concurrent with Samba 3.2 maintenance +This work is concurrent with Samba 3.3 maintenance and development. An alpha release is available. Modified: trunk/header_columns.html === --- trunk/header_columns.html 2009-02-02 13:43:21 UTC (rev 1268) +++ trunk/header_columns.html 2009-02-03 16:54:07 UTC (rev 1269) @@ -137,9 +137,12 @@ Historical +Samba 3.2.8 (gzipped) +Release Notes 3.2.8 +Signature 3.2.8 Samba 3.0.34 (gzipped) -Release Notes -Signature +Release Notes 3.0.34 +Signature 3.0.34 Maintenance Modified: trunk/history/header_history.html === --- trunk/history/header_history.html 2009-02-02 13:43:21 UTC (rev 1268) +++ trunk/history/header_history.html 2009-02-03 16:54:07 UTC (rev 1269) @@ -78,6 +78,7 @@ Release Notes samba-3.3.0 +samba-3.2.8 samba-3.2.7 samba-3.2.6 samba-3.2.5 Added: trunk/history/samba-3.2.8.html === --- trunk/history/samba-3.2.8.html 2009-02-02 13:43:21 UTC (rev 1268) +++ trunk/history/samba-3.2.8.html 2009-02-03 16:54:07 UTC (rev 1269) @@ -0,0 +1,202 @@ +http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> +http://www.w3.org/1999/xhtml";> + + +Samba - Release Notes Archive + + + + + Samba 3.2.8 Available for Download + + + + = + Release Notes for Samba 3.2.8 + March 03, 2009 + = + + +This is a bug fix release of the Samba 3.2 series. + +Major enhancements included in Samba 3.2.8 are: + + o Correctly detect if the current DC is the closest one. + o Add saf_join_store() function to memorize the DC used at join time. +This avoids problems caused by replication delays shortly after domain +joins. + + +The original security announcement for this and past advisories can +be found http://www.samba.org/samba/security/ + + +## +Changes +### + +Changes since 3.2.7 +--- + + +o Michael Adam +* BUG 6066: netinet/ip.h present but cannot be compiled under Solaris. +* Fix join by creating keytab after changing the config in libnet. +* Streamline logic of libnet_join_post_processing() in libnet_join. +* Fix build of [u]mount.cifs in the RHEL packaging. +* Fix distclean target and add realdistclean target in the docs build. +* Clean generated .png images and build/catalog.xml in "make clean". +* Fix detection of netinet/ip.h on Solaris 8. + + +o Jeremy Allison +* BUG 4308: Excel save operation corrupts file ACLs. +* BUG 5979: Fix level 2 oplocks. +* BUG 5980: Fix race condition when granting level2 oplocks can cause break + notify to be missed. +* BUG 5986: Fix renaming of streams. +* BUG 5990: Strict allocate should be checked before ftruncate. +* BUG 6009: Setting "min receivefile size = 1" breaks writes. +* BUG 6016: Alternate Data Streams / Extended Attributes seem to conflict. +* BUG 6017: Fix magic scripts. +* BUG 6019: Fix file corruption in Clustered SMB/NFS environments managed via + CTDB. +* BUG 6021: smbclient du command does not recuse properly. +* BUG 6030: Add missing header in Status page. +* BUG 6035: Fix possible race between fcntl F_SETLKW and alarm delivery. +* BUG 6040: Calling Samba print server with an aliased DNS-name fails. +* Fix race condition in alarm lock processing. +* Fix logic bug introduce in backport of ccache_regain_all_now. +* Fix crash bug in SWAT. +* Fix logic error in try_chown. +* Fix detection of dns_sd libraries. + + +o Kai Blin +* BUG 5953: Fix smbclient crashes. + + +o Gerald (Jerry) Carter +* Fix "allow trusted domain" so it disables trusted domains. + + +o Guenther Deschner +* Fix buffer allocation in eventlog read call. +* Fix various invalid memcpy in read_package_entry(). + + +o SATOH Fumiyasu +* Variables for signals must be volatile sig_atomic_t in
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-425-g35f1e02
The branch, master has been updated via 35f1e02ca4c31214e85b7c25d8f695eb035871d7 (commit) from 329b8775f56c8a89f02646e11ba27a33080f48b1 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 35f1e02ca4c31214e85b7c25d8f695eb035871d7 Author: Günther Deschner Date: Mon Feb 2 16:41:44 2009 +0100 librpc: add ndr_size_string_array(). Guenther --- Summary of changes: librpc/ndr/libndr.h |1 + source3/librpc/ndr/ndr_string.c | 23 +++ source4/librpc/ndr/ndr_string.c | 23 +++ 3 files changed, 47 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h index 4ab0bf5..7109b73 100644 --- a/librpc/ndr/libndr.h +++ b/librpc/ndr/libndr.h @@ -506,6 +506,7 @@ uint32_t ndr_size_string(int ret, const char * const* string, int flags); enum ndr_err_code ndr_pull_string_array(struct ndr_pull *ndr, int ndr_flags, const char ***_a); enum ndr_err_code ndr_push_string_array(struct ndr_push *ndr, int ndr_flags, const char **a); void ndr_print_string_array(struct ndr_print *ndr, const char *name, const char **a); +size_t ndr_size_string_array(const char **a, uint32_t count, int flags); uint32_t ndr_string_length(const void *_var, uint32_t element_size); enum ndr_err_code ndr_check_string_terminator(struct ndr_pull *ndr, uint32_t count, uint32_t element_size); enum ndr_err_code ndr_pull_charset(struct ndr_pull *ndr, int ndr_flags, const char **var, uint32_t length, uint8_t byte_mul, charset_t chset); diff --git a/source3/librpc/ndr/ndr_string.c b/source3/librpc/ndr/ndr_string.c index 86d7b26..985d0f4 100644 --- a/source3/librpc/ndr/ndr_string.c +++ b/source3/librpc/ndr/ndr_string.c @@ -595,6 +595,29 @@ _PUBLIC_ void ndr_print_string_array(struct ndr_print *ndr, const char *name, co ndr->depth--; } +_PUBLIC_ size_t ndr_size_string_array(const char **a, uint32_t count, int flags) +{ + uint32_t i; + size_t size = 0; + + switch (flags & LIBNDR_STRING_FLAGS) { + case LIBNDR_FLAG_STR_NULLTERM: + for (i = 0; i < count; i++) { + size += strlen_m_term(a[i]); + } + break; + case LIBNDR_FLAG_STR_NOTERM: + for (i = 0; i < count; i++) { + size += strlen_m(a[i]); + } + break; + default: + return 0; + } + + return size; +} + /** * Return number of elements in a string including the last (zeroed) element */ diff --git a/source4/librpc/ndr/ndr_string.c b/source4/librpc/ndr/ndr_string.c index 265fa68..a2fcdea 100644 --- a/source4/librpc/ndr/ndr_string.c +++ b/source4/librpc/ndr/ndr_string.c @@ -595,6 +595,29 @@ _PUBLIC_ void ndr_print_string_array(struct ndr_print *ndr, const char *name, co ndr->depth--; } +_PUBLIC_ size_t ndr_size_string_array(const char **a, uint32_t count, int flags) +{ + uint32_t i; + size_t size = 0; + + switch (flags & LIBNDR_STRING_FLAGS) { + case LIBNDR_FLAG_STR_NULLTERM: + for (i = 0; i < count; i++) { + size += strlen_m_term(a[i]); + } + break; + case LIBNDR_FLAG_STR_NOTERM: + for (i = 0; i < count; i++) { + size += strlen_m(a[i]); + } + break; + default: + return 0; + } + + return size; +} + /** * Return number of elements in a string including the last (zeroed) element */ -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3425-g268be70
The branch, v3-2-test has been updated via 268be70cecd5025b0512372cff572095be763af1 (commit) from 8ddb30ca90d31624ba86cd731f573aedad43face (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 268be70cecd5025b0512372cff572095be763af1 Author: Ted Percival Date: Tue Feb 3 14:10:20 2009 -0800 Probably fixes a crash during name resolution when log level >= 10 and libc segfaults if printf is passed NULL for a "%s" arg (eg. Solaris). --- Summary of changes: source/libsmb/namequery.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/libsmb/namequery.c b/source/libsmb/namequery.c index 112df1b..dd3cd56 100644 --- a/source/libsmb/namequery.c +++ b/source/libsmb/namequery.c @@ -1502,7 +1502,7 @@ NTSTATUS internal_resolve_name(const char *name, *return_count = 0; DEBUG(10, ("internal_resolve_name: looking up %s#%x (sitename %s)\n", - name, name_type, sitename ? sitename : NULL)); + name, name_type, sitename ? sitename : "(null)")); if (is_ipaddress(name)) { if ((*return_iplist = SMB_MALLOC_P(struct ip_service)) == -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3426-g16e9f1e
The branch, v3-2-test has been updated via 16e9f1e2d4a1d391efdf8348fa7f57b2640a6bdb (commit) from 268be70cecd5025b0512372cff572095be763af1 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 16e9f1e2d4a1d391efdf8348fa7f57b2640a6bdb Author: Miguel Suarez Date: Tue Feb 3 14:35:19 2009 -0800 Fix bug #6085 - In vfs_default.c change utime( ) call. --- Summary of changes: source/modules/vfs_default.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/modules/vfs_default.c b/source/modules/vfs_default.c index 2da97f1..f3cebd6 100644 --- a/source/modules/vfs_default.c +++ b/source/modules/vfs_default.c @@ -670,7 +670,7 @@ static int vfswrap_ntimes(vfs_handle_struct *handle, const char *path, const str struct utimbuf times; times.actime = convert_timespec_to_time_t(ts[0]); times.modtime = convert_timespec_to_time_t(ts[1]); - result = utime(path, times); + result = utime(path, ×); } else { result = utime(path, NULL); } -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-32-143-gd3220d9
The branch, v3-0-test has been updated via d3220d9d58477f2a6ef7a78c3cf05cb232b57aff (commit) from dbfdfd047e8e69942b3289733d300d716cdbec53 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test - Log - commit d3220d9d58477f2a6ef7a78c3cf05cb232b57aff Author: Ted Percival Date: Tue Feb 3 14:10:20 2009 -0800 Probably fixes a crash during name resolution when log level >= 10 and libc segfaults if printf is passed NULL for a "%s" arg (eg. Solaris). --- Summary of changes: source/libsmb/namequery.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/libsmb/namequery.c b/source/libsmb/namequery.c index 023fd3f..62cb1ba 100644 --- a/source/libsmb/namequery.c +++ b/source/libsmb/namequery.c @@ -1225,7 +1225,7 @@ BOOL internal_resolve_name(const char *name, int name_type, *return_count = 0; DEBUG(10, ("internal_resolve_name: looking up %s#%x (sitename %s)\n", - name, name_type, sitename ? sitename : NULL)); + name, name_type, sitename ? sitename : "(null)")); if (allzeros || allones || is_address) { -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-444-g189a85d
The branch, master has been updated via 189a85dd68eb6c62272e51769d842afbf8389a4f (commit) from 98e2fe5e6d7634aa1ecf12b1b1fb23c82b3f16c5 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 189a85dd68eb6c62272e51769d842afbf8389a4f Author: Ted Percival Date: Tue Feb 3 14:25:31 2009 -0800 Probably fixes a crash during name resolution when log level >= 10 and libc segfaults if printf is passed NULL for a "%s" arg (eg. Solaris). --- Summary of changes: source3/libsmb/namequery.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c index 0567957..ac38d40 100644 --- a/source3/libsmb/namequery.c +++ b/source3/libsmb/namequery.c @@ -1502,7 +1502,7 @@ NTSTATUS internal_resolve_name(const char *name, *return_count = 0; DEBUG(10, ("internal_resolve_name: looking up %s#%x (sitename %s)\n", - name, name_type, sitename ? sitename : NULL)); + name, name_type, sitename ? sitename : "(null)")); if (is_ipaddress(name)) { if ((*return_iplist = SMB_MALLOC_P(struct ip_service)) == -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-445-ga4c5054
The branch, master has been updated via a4c5054b5a92c08498f522b39472d64a32a3cebb (commit) from 189a85dd68eb6c62272e51769d842afbf8389a4f (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit a4c5054b5a92c08498f522b39472d64a32a3cebb Author: Miguel Suarez Date: Tue Feb 3 14:36:50 2009 -0800 Fix bug #6085 - In vfs_default.c change utime( ) call. --- Summary of changes: source3/modules/vfs_default.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index f8ac3e8..679be57 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -735,7 +735,7 @@ static int vfswrap_ntimes(vfs_handle_struct *handle, const char *path, struct utimbuf times; times.actime = convert_timespec_to_time_t(ft->atime); times.modtime = convert_timespec_to_time_t(ft->mtime); - result = utime(path, times); + result = utime(path, ×); } else { result = utime(path, NULL); } -- Samba Shared Repository
Build status as of Wed Feb 4 00:00:02 2009
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2009-02-03 00:00:20.0 + +++ /home/build/master/cache/broken_results.txt 2009-02-04 00:00:09.0 + @@ -1,4 +1,4 @@ -Build status as of Tue Feb 3 00:00:02 2009 +Build status as of Wed Feb 4 00:00:02 2009 Build counts: Tree Total Broken Panic @@ -11,13 +11,13 @@ lorikeet-heimdal 25 15 0 pidl 17 2 0 ppp 10 0 0 -rsync28 9 0 +rsync27 9 0 samba-docs 0 0 0 samba-gtk4 4 0 -samba_3_X_devel 26 24 0 +samba_3_X_devel 26 23 0 samba_3_X_test 26 22 0 -samba_4_0_test 27 24 1 +samba_4_0_test 28 25 1 smb-build26 5 0 talloc 28 28 0 -tdb 24 8 0 +tdb 26 8 0
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4903-g16e49e8
The branch, v3-3-test has been updated via 16e49e8be8a942aa77a013c197a20d4c0bb3875f (commit) from 5994c90ff8754b64a3a6658e28bd94f6a91a441b (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit 16e49e8be8a942aa77a013c197a20d4c0bb3875f Author: Ted Percival Date: Tue Feb 3 14:10:20 2009 -0800 Probably fixes a crash during name resolution when log level >= 10 and libc segfaults if printf is passed NULL for a "%s" arg (eg. Solaris). --- Summary of changes: source/libsmb/namequery.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/libsmb/namequery.c b/source/libsmb/namequery.c index 112df1b..dd3cd56 100644 --- a/source/libsmb/namequery.c +++ b/source/libsmb/namequery.c @@ -1502,7 +1502,7 @@ NTSTATUS internal_resolve_name(const char *name, *return_count = 0; DEBUG(10, ("internal_resolve_name: looking up %s#%x (sitename %s)\n", - name, name_type, sitename ? sitename : NULL)); + name, name_type, sitename ? sitename : "(null)")); if (is_ipaddress(name)) { if ((*return_iplist = SMB_MALLOC_P(struct ip_service)) == -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-32-144-g7a1408f
The branch, v3-0-test has been updated via 7a1408f89f1addff993d1e2dfb7462d12d0a2f48 (commit) from d3220d9d58477f2a6ef7a78c3cf05cb232b57aff (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test - Log - commit 7a1408f89f1addff993d1e2dfb7462d12d0a2f48 Author: Miguel Suarez Date: Tue Feb 3 14:31:51 2009 -0800 Fix bug #6085 - In vfs_default.c change utime( ) call. --- Summary of changes: source/modules/vfs_default.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/modules/vfs_default.c b/source/modules/vfs_default.c index 4cc6e88..2dd8443 100644 --- a/source/modules/vfs_default.c +++ b/source/modules/vfs_default.c @@ -635,7 +635,7 @@ static int vfswrap_ntimes(vfs_handle_struct *handle, const char *path, const str struct utimbuf times; times.actime = convert_timespec_to_time_t(ts[0]); times.modtime = convert_timespec_to_time_t(ts[1]); - result = utime(path, times); + result = utime(path, ×); } #else errno = ENOSYS; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4904-g2937519
The branch, v3-3-test has been updated via 2937519665be41237ee0f2c3374bea716bf95e8a (commit) from 16e49e8be8a942aa77a013c197a20d4c0bb3875f (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit 2937519665be41237ee0f2c3374bea716bf95e8a Author: Miguel Suarez Date: Tue Feb 3 14:35:19 2009 -0800 Fix bug #6085 - In vfs_default.c change utime( ) call. --- Summary of changes: source/modules/vfs_default.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/modules/vfs_default.c b/source/modules/vfs_default.c index d306b0f..1e95633 100644 --- a/source/modules/vfs_default.c +++ b/source/modules/vfs_default.c @@ -670,7 +670,7 @@ static int vfswrap_ntimes(vfs_handle_struct *handle, const char *path, const str struct utimbuf times; times.actime = convert_timespec_to_time_t(ts[0]); times.modtime = convert_timespec_to_time_t(ts[1]); - result = utime(path, times); + result = utime(path, ×); } else { result = utime(path, NULL); } -- Samba Shared Repository
svn commit: samba-web r1270 - in trunk: . history
Author: kseeger Date: 2009-02-04 07:47:01 + (Wed, 04 Feb 2009) New Revision: 1270 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=1270 Log: -Add missing headline -move some older release announcements to the history Karolin Modified: trunk/history/index.html trunk/index.html Changeset: Modified: trunk/history/index.html === --- trunk/history/index.html2009-02-03 16:54:07 UTC (rev 1269) +++ trunk/history/index.html2009-02-04 07:47:01 UTC (rev 1270) @@ -17,7 +17,63 @@ Previous Release Announcements +05 January 2009 +Samba 3.2.7 Available for Download +This is a security release to address CVE-2009-0022. The +original advisory +is available online. A + +patch for Samba 3.2.6 is available. This security +advisory is applicable from Samba 3.2.0 to 3.2.6. Past security +advisories are available on our security page. + +The uncompressed tarballs and patch files have been signed +using GnuPG (ID 6568B7EA). The source code can be +downloaded now. +See the release notes for more info. + +15 December 2008 +Samba 3.3.0rc2 Available for Download + +Samba 3.3.0rc2 is now available for download. This the second +release candidate of the next upgrade production release version of Samba. +It is intended for testing purposes only. Please test and +https://bugzilla.samba.org/";>report any bugs that you +find. The final 3.3.0 release is planned for January 6, 2009. +Please read the changes in the +Release Notes +for details on new features and difference in behavior from +previous releases. + +The Samba 3.3.0rc2 +source code can be downloaded now. The GnuPG +signature is for the for the uncompressed tarball. +If you prefer, the patch +file against Samba 3.3.0rc1 +(GnuPG +signature) is also available for download. +Please read these instructions on +how to verify the gpg signature. Precompiled packages will +be made available on a volunteer basis and can be found in the +Binary_Packages download area. + +27 November 2008 +Samba 3.0.33 Available for Download + +This is a security release to address CVE-2008-4314. The +original advisory +is available online. + +The uncompressed tarballs and patch files have been signed +using GnuPG (ID 6568B7EA). The source code can be +downloaded now. +See the release notes for more +info. + + 10 December 2008 Samba 3.2.6 Available for Download Modified: trunk/index.html === --- trunk/index.html2009-02-03 16:54:07 UTC (rev 1269) +++ trunk/index.html2009-02-04 07:47:01 UTC (rev 1270) @@ -19,6 +19,7 @@ Current Release +03 February 2009 Samba 3.2.8 Maintenance Release Available This is the latest bug fix release for Samba 3.2 and is the @@ -53,65 +54,6 @@ is also available. See the release notes for more info. -05 January 2009 -Samba 3.2.7 Available for Download - -This is a security release to address CVE-2009-0022. The -original advisory -is available online. A - -patch for Samba 3.2.6 is available. This security -advisory is applicable from Samba 3.2.0 to 3.2.6. Past security -advisories are available on our security page. - -The uncompressed tarballs and patch files have been signed -using GnuPG (ID 6568B7EA). The source code can be -downloaded now. -See the release notes for more info. - -15 December 2008 -Samba 3.3.0rc2 Available for Download - -Samba 3.3.0rc2 is now available for download. This the second -release candidate of the next upgrade production release version of Samba. -It is intended for testing purposes only. Please test and -https://bugzilla.samba.org/";>report any bugs that you -find. The final 3.3.0 release is planned for January 6, 2009. -Please read the changes in the -Release Notes -for details on new features and difference in behavior from -previous releases. - -The Samba 3.3.0rc2 -source code can be downloaded now. The GnuPG -signature is for the for the uncompressed tarball. -If you prefer, the patch -file against Samba 3.3.0rc1 -(GnuPG -signature) is also available for download. -Please read these instructions on -how to verify the gpg signature. Precompiled packages will -be made available on a volunteer basis and can be found in the -Binary_Packages download area. - -27 November 2008 -Samba 3.0.33 Available for Download - -This is a security release to address CVE-2008-4314. The -original advisory -is available online. A - -patch for Samba 3.0.32 is available. This security -advisory is applicable from Samba 3.0.29 to 3.2.4. Past security -advisories are available on our security page. - -The uncompressed tarballs and patch files have been signed -using GnuPG (ID 6568B7EA). The source code can be -downloaded now. -