[SCM] Samba Website Repository - branch master updated
The branch, master has been updated via 5ff08d0 lwn.net about LCA 2012 and Samba 4 from f4941b6 Move Resera to the right position in order http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master - Log - commit 5ff08d0a673ebe1fff0efdeb2b53de68f451e2ab Author: Lars Müller Date: Tue Jan 17 21:47:45 2012 +0100 lwn.net about LCA 2012 and Samba 4 --- Summary of changes: generated_news/latest_10_bodies.html| 25 + generated_news/latest_10_headlines.html |4 ++-- generated_news/latest_2_bodies.html | 18 +- 3 files changed, 20 insertions(+), 27 deletions(-) Changeset truncated at 500 lines: diff --git a/generated_news/latest_10_bodies.html b/generated_news/latest_10_bodies.html index e75fdc9..7c4c005 100644 --- a/generated_news/latest_10_bodies.html +++ b/generated_news/latest_10_bodies.html @@ -1,3 +1,12 @@ + 17 January 2012 + LCA: A Samba 4 update + +Read what Jonathan Corbet and many others got presented at +http://linux.conf.au/";>linux.conf.au 2012 at the +http://lwn.net/SubscriberLink/475592/8ed5bac474ed9f8a/";> +A Samba 4 update talk. + + 02 November 2011 Samba Notes Passing a Milestone Microsoft developers submit Samba patches! @@ -93,19 +102,3 @@ Precompiled packages will be made available on a volunteer basis and can be found in the http://samba.org/samba/ftp/Binary_Packages/";>Binary_Packages download area. - - - 26 July 2011 - Samba 3.5.10 Available for Download - -This is a security release in order to address -http://www.samba.org/samba/security/CVE-2011-2522";>CVE-2011-2522 -(Cross-Site Request Forgery in SWAT) and -http://www.samba.org/samba/security/CVE-2011-2694";>CVE-2011-2694 -(Cross-Site Scripting vulnerability in SWAT). - -The uncompressed tarballs and patch files have been signed -using GnuPG (ID 6568B7EA). The source code can be -http://samba.org/samba/ftp/stable/samba-3.5.10.tar.gz";>downloaded -now. See http://samba.org/samba/history/samba-3.5.10.html";> -the release notes for more info. diff --git a/generated_news/latest_10_headlines.html b/generated_news/latest_10_headlines.html index 34c100a..7c7311c 100644 --- a/generated_news/latest_10_headlines.html +++ b/generated_news/latest_10_headlines.html @@ -1,4 +1,6 @@ +17 January 2012 http://lwn.net/SubscriberLink/475592/8ed5bac474ed9f8a/";>A Samba 4 update featured by http://LWN.net/>LWN.net. + 02 November 2011 Samba Notes Passing a Milestone 26 October 2011 Samba 3.5.12 Available for Download @@ -16,6 +18,4 @@ 04 August 2011 Samba 3.5.11 Available for Download 26 July 2011 Samba 3.6.0rc3 Available for Download - -26 July 2011 Samba 3.5.10 Available for Download diff --git a/generated_news/latest_2_bodies.html b/generated_news/latest_2_bodies.html index addfb25..74618fc 100644 --- a/generated_news/latest_2_bodies.html +++ b/generated_news/latest_2_bodies.html @@ -1,15 +1,15 @@ + 17 January 2012 + LCA: A Samba 4 update + +Read what Jonathan Corbet and many others got presented at +http://linux.conf.au/";>linux.conf.au 2012 at the +http://lwn.net/SubscriberLink/475592/8ed5bac474ed9f8a/";> +A Samba 4 update talk. + + 02 November 2011 Samba Notes Passing a Milestone Microsoft developers submit Samba patches! The whole story can be found here. - - 26 October 2011 - Samba 3.5.12 Available for Download - This is the latest stable release of the Samba 3.5 series. - -The uncompressed tarballs and patch files have been signed -using GnuPG (ID 6568B7EA). The source code can be -http://samba.org/samba/ftp/stable/samba-3.5.12.tar.gz";>downloaded -now. A http://samba.org/samba/ftp/patches/patch-3.5.11-3.5.12.diffs.gz";>patch against Samba 3.5.11 is also available. See http://samba.org/samba/history/samba-3.5.12.html";>the release notes for more info. -- Samba Website Repository
[SCM] Samba Website Repository - branch master updated
The branch, master has been updated via f4941b6 Move Resera to the right position in order from b9b55fb Add vendor Resara http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master - Log - commit f4941b63acb92da1eb3534434f8c5ec0e7e2f229 Author: Lars Müller Date: Tue Jan 17 19:41:48 2012 +0100 Move Resera to the right position in order --- Summary of changes: vendors/index.html |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/vendors/index.html b/vendors/index.html index b038184..17beda4 100755 --- a/vendors/index.html +++ b/vendors/index.html @@ -67,13 +67,13 @@ see the Samba Support page. - + - + - + -- Samba Website Repository
[SCM] Samba Website Repository - branch master updated
The branch, master has been updated via b9b55fb Add vendor Resara from 785c9b6 Add ; after < and > http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master - Log - commit b9b55fb88fb479b4e92e88d45543ec56bd9bce18 Author: Lars Müller Date: Tue Jan 17 19:33:35 2012 +0100 Add vendor Resara --- Summary of changes: vendors/index.html |3 +++ vendors/resara.html | 15 +++ vendors/resara_logo.png | Bin 0 -> 49656 bytes 3 files changed, 18 insertions(+), 0 deletions(-) create mode 100644 vendors/resara.html create mode 100644 vendors/resara_logo.png Changeset truncated at 500 lines: diff --git a/vendors/index.html b/vendors/index.html index 5bd2ffc..b038184 100755 --- a/vendors/index.html +++ b/vendors/index.html @@ -73,6 +73,9 @@ see the Samba Support page. + + + diff --git a/vendors/resara.html b/vendors/resara.html new file mode 100644 index 000..0edf3ea --- /dev/null +++ b/vendors/resara.html @@ -0,0 +1,15 @@ +Resara + +http://www.resara.com/";> + + + + +Resara Server is a turn-key samba4 server designed to be incredibly +easy to use. It features powerful GUI management tools for user and +computer management, DHCP/DNS, file sharing and automatic drive mapping, +remote file access, and much more. The Community Edition of Resara +Server is completely free and open source, and the commercial versions +offer additional features and excellent support. Visit our +http://www.resara.com/";>website and try Resara Server today! + diff --git a/vendors/resara_logo.png b/vendors/resara_logo.png new file mode 100644 index 000..76331f9 Binary files /dev/null and b/vendors/resara_logo.png differ -- Samba Website Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via a325e7b s3: Fix bug 8695
via 43b7038 RHEL-CTDB: *.msg files moved
via 077e5bc RHEL-CTDB: *.dat files moved
via 29c2422 RHEL-CTDB: CP*so are no more
via 2a1a276 RHEL-CTDB: --with-mandir -> --mandir
from e9874bd dynconfig: overwrite --with-privatelibdir as a Samba option
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit a325e7b560502ce43c78a7c6c8d692e872f262ae
Author: Volker Lendecke
Date: Tue Jan 17 17:14:38 2012 +0100
s3: Fix bug 8695
Autobuild-User: Volker Lendecke
Autobuild-Date: Tue Jan 17 18:55:01 CET 2012 on sn-devel-104
commit 43b7038dead78fae022a3f145582a25684538266
Author: Volker Lendecke
Date: Tue Jan 17 14:21:30 2012 +0100
RHEL-CTDB: *.msg files moved
commit 077e5bc5564fdda230c78e812bae767aa3c719bf
Author: Volker Lendecke
Date: Tue Jan 17 14:21:30 2012 +0100
RHEL-CTDB: *.dat files moved
commit 29c2422bb4fb7b71611d586c6217b23e6a545509
Author: Volker Lendecke
Date: Tue Jan 17 14:21:30 2012 +0100
RHEL-CTDB: CP*so are no more
commit 2a1a2766bb3318e0deb1f319de2d647cc2bf0651
Author: Volker Lendecke
Date: Tue Jan 17 14:21:30 2012 +0100
RHEL-CTDB: --with-mandir -> --mandir
---
Summary of changes:
packaging/RHEL-CTDB/configure.rpm |2 +-
packaging/RHEL-CTDB/samba.spec.tmpl | 12 +---
source3/param/loadparm.c|1 +
3 files changed, 7 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RHEL-CTDB/configure.rpm
b/packaging/RHEL-CTDB/configure.rpm
index fafad81..c2a0302 100755
--- a/packaging/RHEL-CTDB/configure.rpm
+++ b/packaging/RHEL-CTDB/configure.rpm
@@ -35,7 +35,7 @@ CC="$CC" CFLAGS="-Wall -g -D_GNU_SOURCE -O3" ./configure -C \
--with-pammodulesdir=/${_libarch}/security \
--with-lockdir=/var/lib/samba \
--with-logfilebase=/var/log/samba \
- --with-mandir=${_mandir} \
+ --mandir=${_mandir} \
--with-piddir=/var/run \
--with-privatedir=${_sysconfdir}/samba \
--with-sambabook=${_datadir}/swat/using_samba \
diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl
b/packaging/RHEL-CTDB/samba.spec.tmpl
index fae9ffe..67d4eef 100644
--- a/packaging/RHEL-CTDB/samba.spec.tmpl
+++ b/packaging/RHEL-CTDB/samba.spec.tmpl
@@ -170,7 +170,7 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \
--with-pammodulesdir=%{_libarch}/security \
--with-lockdir=/var/lib/samba \
--with-logfilebase=/var/log/samba \
---with-mandir=%{_mandir} \
+--mandir=%{_mandir} \
--with-piddir=/var/run \
--with-privatedir=%{_sysconfdir}/samba \
--with-sambabook=%{_datadir}/swat/using_samba \
@@ -480,7 +480,7 @@ exit 0
%{_datadir}/swat/*
%{_sbindir}/swat
%{_mandir}/man8/swat.8*
-%attr(755,root,root) %{_libarchdir}/samba/*.msg
+%attr(755,root,root) /usr/share/codepages/*.msg
##
@@ -538,18 +538,16 @@ exit 0
/usr/share/locale/*/LC_MESSAGES/pam_winbind.mo
/usr/share/locale/*/LC_MESSAGES/net.mo
-%{_libarchdir}/samba/charset/CP437.so
-%{_libarchdir}/samba/charset/CP850.so
%{_libarchdir}/samba/idmap/ad.so
%{_libarchdir}/samba/idmap/rid.so
%{_libarchdir}/samba/idmap/tdb2.so
%{_libarchdir}/samba/idmap/autorid.so
-%{_libarchdir}/samba/lowcase.dat
%{_libarchdir}/samba/nss_info/rfc2307.so
%{_libarchdir}/samba/nss_info/sfu.so
%{_libarchdir}/samba/nss_info/sfu20.so
-%{_libarchdir}/samba/upcase.dat
-%{_libarchdir}/samba/valid.dat
+/usr/share/codepages/lowcase.dat
+/usr/share/codepages/upcase.dat
+/usr/share/codepages/valid.dat
%{_includedir}/libsmbclient.h
%{_libarchdir}/libsmbclient.*
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 2ab32f8..0c769e6 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -6474,6 +6474,7 @@ static void copy_service(struct loadparm_service
*pserviceDest, struct loadparm_
case P_INTEGER:
case P_ENUM:
case P_OCTAL:
+ case P_BYTES:
*(int *)dest_ptr = *(int *)src_ptr;
break;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via e9874bd dynconfig: overwrite --with-privatelibdir as a Samba option
via 1f7dbc6 dynconfig: --with-modulesdir should be a Samba option
via 0ca1f32 dynconfig/config.m4: expand prefix, exec_prefix,
sysconfdir, localstatedir and datarootdir in Makefile
from 7d83d37 s3:lib/messages: remove unused messaging_event_context()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit e9874bdf9ef79e0e8c115af14d6727e6624e4d20
Author: Stefan Metzmacher
Date: Tue Jan 17 12:51:57 2012 +0100
dynconfig: overwrite --with-privatelibdir as a Samba option
metze
Autobuild-User: Stefan Metzmacher
Autobuild-Date: Tue Jan 17 17:17:56 CET 2012 on sn-devel-104
commit 1f7dbc665c56ec90b274a3e5f17c2d8fbdb7e8b1
Author: Stefan Metzmacher
Date: Tue Jan 17 12:32:47 2012 +0100
dynconfig: --with-modulesdir should be a Samba option
This also restores the defaults from Samba 3.6.x:
"${libdir}" or "${libdir}/samba" in FHS mode.
metze
commit 0ca1f321ac1105ffc5a6a3747d68067cda0aa4ea
Author: Stefan Metzmacher
Date: Tue Jan 17 12:29:53 2012 +0100
dynconfig/config.m4: expand prefix, exec_prefix, sysconfdir, localstatedir
and datarootdir in Makefile
Otherwise $prefix is "NONE" without explicit --prefix
metze
---
Summary of changes:
dynconfig/config.m4 | 59 ++
dynconfig/wscript | 24
2 files changed, 54 insertions(+), 29 deletions(-)
Changeset truncated at 500 lines:
diff --git a/dynconfig/config.m4 b/dynconfig/config.m4
index e7a7228..842a960 100644
--- a/dynconfig/config.m4
+++ b/dynconfig/config.m4
@@ -4,10 +4,6 @@
# ones...
AC_PREFIX_DEFAULT(/usr/local/samba)
-test x"${modulesdir}" = x"" && {
-modulesdir="\${exec_prefix}/modules"
-}
-
BINDIR="${bindir}"
SBINDIR="${sbindir}"
LIBDIR="${libdir}"
@@ -23,43 +19,58 @@ AC_ARG_ENABLE(fhs,
[AS_HELP_STRING([--enable-fhs], [Turn on FHS support (default=no)])])
if test x$enable_fhs != xyes; then
- MODULESDIR="${modulesdir}"
+ MODULESDIR="${libdir}"
INCLUDEDIR="${includedir}"
SETUPDIR="${datadir}/setup"
PKGCONFIGDIR="${libdir}/pkgconfig"
SWATDIR="${datadir}/swat"
CODEPAGEDIR="${datadir}/codepages"
PAMMODULESDIR="${libdir}/security"
- CONFIGDIR="${sysconfdir}"
- PRIVATE_DIR="${prefix}/private"
- LOCKDIR="${localstatedir}/lock"
- PIDDIR="${localstatedir}/run"
- STATEDIR="${localstatedir}/locks"
- CACHEDIR="${localstatedir}/cache"
- LOGFILEBASE="${localstatedir}"
- SOCKET_DIR="${localstatedir}/run"
- PRIVILEGED_SOCKET_DIR="${localstatedir}/lib"
+ CONFIGDIR="\${sysconfdir}"
+ PRIVATE_DIR="\${prefix}/private"
+ LOCKDIR="\${localstatedir}/lock"
+ PIDDIR="\${localstatedir}/run"
+ STATEDIR="\${localstatedir}/locks"
+ CACHEDIR="\${localstatedir}/cache"
+ LOGFILEBASE="\${localstatedir}"
+ SOCKET_DIR="\${localstatedir}/run"
+ PRIVILEGED_SOCKET_DIR="\${localstatedir}/lib"
else
AC_DEFINE(FHS_COMPATIBLE, 1, [Whether to use fully FHS-compatible
paths])
- MODULESDIR="${modulesdir}/samba"
+ MODULESDIR="${libdir}/samba"
INCLUDEDIR="${includedir}/samba-4.0"
SETUPDIR="${datadir}/samba/setup"
PKGCONFIGDIR="${libdir}/pkgconfig"
SWATDIR="${datadir}/samba/swat"
CODEPAGEDIR="${datadir}/samba/codepages"
PAMMODULESDIR="${libdir}/security"
- CONFIGDIR="${sysconfdir}/samba"
- PRIVATE_DIR="${localstatedir}/lib/samba/private"
- LOCKDIR="${localstatedir}/lock/samba"
- PIDDIR="${localstatedir}/run/samba"
- STATEDIR="${localstatedir}/lib/samba"
- CACHEDIR="${localstatedir}/cache/samba"
- LOGFILEBASE="${localstatedir}/log/samba"
- SOCKET_DIR="${localstatedir}/run/samba"
- PRIVILEGED_SOCKET_DIR="${localstatedir}/lib/samba"
+ CONFIGDIR="\${sysconfdir}/samba"
+ PRIVATE_DIR="\${localstatedir}/lib/samba/private"
+ LOCKDIR="\${localstatedir}/lock/samba"
+ PIDDIR="\${localstatedir}/run/samba"
+ STATEDIR="\${localstatedir}/lib/samba"
+ CACHEDIR="\${localstatedir}/cache/samba"
+ LOGFILEBASE="\${localstatedir}/log/samba"
+ SOCKET_DIR="\${localstatedir}/run/samba"
+ PRIVILEGED_SOCKET_DIR="\${localstatedir}/lib/samba"
fi
+AC_ARG_WITH(modulesdir,
+[AS_HELP_STRING([--with-modulesdir=DIR],
+ [Which directory to use for modules ($exec_prefix/modules)])],
+[ case "$withval" in
+ yes|no)
+ #
+ # Just in case anybody calls it without argument
+ #
+AC_MSG_WARN([--with-modulesdir called without argument - will use default])
+ ;;
+ * )
+MODULESDIR="$withval"
+ ;;
+ esac])
+
AC_ARG_WITH(pammodulesdir,
[AS
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 7d83d37 s3:lib/messages: remove unused messaging_event_context()
via ecd8fcd s3:smbcontrol: avoid using messaging_event_context()
via 77d1053 s3:smbcontrol: pass tevent_context down to wait_replies()
via e5ee6d3 s3:smbcontrol: pass tevent_context down to subcommands
via 32b5b46 s3:printing: avoid messaging_event_context() in
print_queue_housekeeping()
from cb2fbdd s3-install: Don't let MANDIR and SRCDIR be overwritten
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 7d83d379ad2424dfd88cbfbab1b7dbae06b23bd1
Author: Stefan Metzmacher
Date: Mon Jan 16 16:15:59 2012 +0100
s3:lib/messages: remove unused messaging_event_context()
metze
Autobuild-User: Stefan Metzmacher
Autobuild-Date: Tue Jan 17 09:45:30 CET 2012 on sn-devel-104
commit ecd8fcdb1eaf7ef4efa7d26dcef1fb4a8950fd8e
Author: Stefan Metzmacher
Date: Mon Jan 16 16:14:35 2012 +0100
s3:smbcontrol: avoid using messaging_event_context()
metze
commit 77d1053c294f0b25d0c6c03d53acfe7b00f22ef5
Author: Stefan Metzmacher
Date: Mon Jan 16 16:11:42 2012 +0100
s3:smbcontrol: pass tevent_context down to wait_replies()
metze
commit e5ee6d3a2473dbfefe649210464c5ef2c050c641
Author: Stefan Metzmacher
Date: Mon Jan 16 16:08:48 2012 +0100
s3:smbcontrol: pass tevent_context down to subcommands
metze
commit 32b5b461fa72df813da2b45b255b11ed350328fa
Author: Stefan Metzmacher
Date: Mon Jan 16 15:54:41 2012 +0100
s3:printing: avoid messaging_event_context() in print_queue_housekeeping()
metze
---
Summary of changes:
source3/include/messages.h |1 -
source3/lib/messages.c |5 --
source3/printing/queue_process.c | 27 ++--
source3/utils/smbcontrol.c | 145 +++---
4 files changed, 108 insertions(+), 70 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/messages.h b/source3/include/messages.h
index e3538f1..2161a77 100644
--- a/source3/include/messages.h
+++ b/source3/include/messages.h
@@ -107,7 +107,6 @@ bool message_send_all(struct messaging_context *msg_ctx,
int msg_type,
const void *buf, size_t len,
int *n_sent);
-struct event_context *messaging_event_context(struct messaging_context
*msg_ctx);
struct messaging_context *messaging_init(TALLOC_CTX *mem_ctx,
struct event_context *ev);
diff --git a/source3/lib/messages.c b/source3/lib/messages.c
index 421d883..12e3a48 100644
--- a/source3/lib/messages.c
+++ b/source3/lib/messages.c
@@ -176,11 +176,6 @@ bool message_send_all(struct messaging_context *msg_ctx,
return true;
}
-struct event_context *messaging_event_context(struct messaging_context
*msg_ctx)
-{
- return msg_ctx->event_ctx;
-}
-
struct messaging_context *messaging_init(TALLOC_CTX *mem_ctx,
struct event_context *ev)
{
diff --git a/source3/printing/queue_process.c b/source3/printing/queue_process.c
index ce4047c..de41f89 100644
--- a/source3/printing/queue_process.c
+++ b/source3/printing/queue_process.c
@@ -44,10 +44,16 @@ static void reload_pcap_change_notify(struct tevent_context
*ev,
message_send_all(msg_ctx, MSG_PRINTER_PCAP, NULL, 0, NULL);
}
+struct printing_queue_housekeeping_state {
+ struct tevent_context *ev;
+ struct messaging_context *msg;
+};
+
static bool print_queue_housekeeping(const struct timeval *now, void *pvt)
{
- struct messaging_context *msg_ctx =
- talloc_get_type_abort(pvt, struct messaging_context);
+ struct printing_queue_housekeeping_state *state =
+ talloc_get_type_abort(pvt,
+ struct printing_queue_housekeeping_state);
time_t printcap_cache_time = (time_t)lp_printcap_cache_time();
time_t t = time_mono(NULL);
@@ -58,8 +64,7 @@ static bool print_queue_housekeeping(const struct timeval
*now, void *pvt)
if ((printcap_cache_time != 0) &&
(t >= (last_printer_reload_time + printcap_cache_time))) {
DEBUG( 3,( "Printcap cache time expired.\n"));
- pcap_cache_reload(messaging_event_context(msg_ctx),
- msg_ctx,
+ pcap_cache_reload(state->ev, state->msg,
&reload_pcap_change_notify);
last_printer_reload_time = t;
}
@@ -70,12 +75,22 @@ static bool print_queue_housekeeping(const struct timeval
*now, void *pvt)
static bool printing_subsystem_queue_tasks(struct tevent_context *ev_ctx,
struct messaging_context *msg_ctx)
{
+ struct printing_queue_housek
