[SCM] Samba Shared Repository - branch v3-2-stable updated -
release-3-2-0-81-g65300a9
Karolin Seeger
kseeger at samba.org
Fri Jul 18 14:23:33 GMT 2008
The branch, v3-2-stable has been updated
via 65300a996e266a1116c883b5d582864658a9e814 (commit)
via 1c437591d19735170674daf74680a6fb6e12b4f4 (commit)
via 2d4d0e46e926a1a475ecf82ec6cf163d4e98da9b (commit)
via 6274d48e1495894a4dcd7b444b6e9419768a849b (commit)
via cc675d4a91a168c2a562d585a51c60ce27142c73 (commit)
via e4785b197fc1e8c112fc687869c82c4f87c6c14e (commit)
via bb28cc26fd46b9d62ee2a9465ac760810f1c727d (commit)
from e51d5026e6d9ef4d014ee6426213809f8c7d88da (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable
- Log -----------------------------------------------------------------
commit 65300a996e266a1116c883b5d582864658a9e814
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Jul 18 16:13:04 2008 +0200
WHATSNEW: Update changes since 3.2.0.
Karolin
(cherry picked from commit 2a874d07648a6b0303249ac8a6cdbf266668afe1)
commit 1c437591d19735170674daf74680a6fb6e12b4f4
Author: Volker Lendecke <vl at samba.org>
Date: Fri Jul 18 11:18:04 2008 +0200
Document the streams modules
(cherry picked from commit e7e6800b3df4e6c9c4429204c5a4162a1e1118d6)
commit 2d4d0e46e926a1a475ecf82ec6cf163d4e98da9b
Author: Volker Lendecke <vl at samba.org>
Date: Fri Jul 18 11:17:33 2008 +0200
Change the directory parameter in streams_depot to become consistent
This is not built by default and not documented in 3.2.0, so I doubt this will
break any setups :-)
(cherry picked from commit ca2dfb372cfd9096407fca67a6b65bceda6f72b6)
commit 6274d48e1495894a4dcd7b444b6e9419768a849b
Author: Jeremy Allison <jra at samba.org>
Date: Thu Jul 17 20:01:13 2008 -0700
From Jim McDonough
In reloading the smb.conf, if a "log file" is specified in smb.conf,
winbind children will overwrite the logfile name to be the same as the
parent.
Jeremy.
(cherry picked from commit 147dc45cfb0da3677e381bec3873b9645b320f60)
commit cc675d4a91a168c2a562d585a51c60ce27142c73
Author: Michael Adam <obnox at samba.org>
Date: Thu Jul 17 21:05:11 2008 +0200
gitignore: ignore the generated library symbol files
Michael
(cherry picked from commit 1006173f98ea8a19c4891c543373124dc2f65282)
commit e4785b197fc1e8c112fc687869c82c4f87c6c14e
Author: Herb Lewis <herb at samba.org>
Date: Thu Jul 17 09:23:30 2008 -0700
allow SID with 0 in subauthority to be converted properly
from string representation.
(cherry picked from commit eaee722ca74af274e628cbd868753800bddc3e97)
commit bb28cc26fd46b9d62ee2a9465ac760810f1c727d
Author: Bo Yang <boyang at novell.com>
Date: Wed Jul 16 11:11:55 2008 -0400
Allow %u parameters for print job username - use advanced sub
(cherry picked from commit 11a8f5161184914bec031c741c57bbce19998d2c)
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 4 +
WHATSNEW.txt | 12 +++-
...vfs_xattr_tdb.8.xml => vfs_streams_depot.8.xml} | 45 ++++++++-----
docs-xml/manpages-3/vfs_streams_xattr.8.xml | 68 ++++++++++++++++++++
source/modules/vfs_streams_depot.c | 2 +-
source/nsswitch/libwbclient/wbc_sid.c | 3 +-
source/printing/printing.c | 6 +-
source/winbindd/winbindd.c | 18 ++++--
source/winbindd/winbindd_dual.c | 3 +-
9 files changed, 131 insertions(+), 30 deletions(-)
copy docs-xml/manpages-3/{vfs_xattr_tdb.8.xml => vfs_streams_depot.8.xml} (51%)
create mode 100644 docs-xml/manpages-3/vfs_streams_xattr.8.xml
Changeset truncated at 500 lines:
diff --git a/.gitignore b/.gitignore
index fa58e01..764d38b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,6 +38,10 @@ source/cscope.out
source/torture.tdb
source/pkgconfig/*.pc
source/st
+source/exports/libnetapi.syms
+source/exports/libtalloc.syms
+source/exports/libtdb.syms
+source/exports/libwbclient.syms
examples/VFS/Makefile
examples/VFS/config.log
examples/VFS/config.status
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 6911438..17f0180 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -7,7 +7,9 @@ This is the second stable release of Samba 3.2.
Major bug fixes included in Samba 3.2.1 are:
- o
+ o Regression in Winbindd offline mode.
+ o Flushing of smb.conf when creating a new share using SWAT.
+ o Setting of ACEs in setups with "dos filemode = yes".
######################################################################
@@ -69,11 +71,14 @@ o Volker Lendecke <vl at samba.org>
* Fix error message if trying to join with a non-privileged user.
* Fix setups using "include = registry" without [global] settings
in the registry.
+ * Fix "net sam rights" on domain member servers.
+ * Add documentation for the vfs streams modules.
o Herb Lewis <herb at samba.org>
* Cleanup some duplicate code by passing the password to the wbinfo_auth*
functions.
+ * Allow SID with 0 in subauthority to be converted properly.
o Zach Loafman <zachary.loafman at isilon.com>
@@ -81,6 +86,10 @@ o Zach Loafman <zachary.loafman at isilon.com>
* Fix realpath() check so that it doesn't generate a core() when it fails.
+o Jim McDonough <jmcd at samba.org>
+ * Fix overwriting of winbind logfiles.
+
+
o Lars Müller <lars at samba.org>
* Fix "vfs_full_audit.c: name table not in sync with vfs.h" panic.
@@ -101,6 +110,7 @@ o Simo Sorce <idra at samba.org>
o Bo Yang <boyang at novell.com>
* Allow authentication and memory credential refresh after password
change from gdm/xdm.
+ * Allow %u parameters for print job username.
######################################################################
diff --git a/docs-xml/manpages-3/vfs_xattr_tdb.8.xml b/docs-xml/manpages-3/vfs_streams_depot.8.xml
similarity index 51%
copy from docs-xml/manpages-3/vfs_xattr_tdb.8.xml
copy to docs-xml/manpages-3/vfs_streams_depot.8.xml
index 4f3b702..3a11319 100644
--- a/docs-xml/manpages-3/vfs_xattr_tdb.8.xml
+++ b/docs-xml/manpages-3/vfs_streams_depot.8.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
-<refentry id="vfs_xattr_tdb.8">
+<refentry id="vfs_streams_depot.8">
<refmeta>
- <refentrytitle>vfs_xattr_tdb</refentrytitle>
+ <refentrytitle>vfs_streams_depot</refentrytitle>
<manvolnum>8</manvolnum>
<refmiscinfo class="source">Samba</refmiscinfo>
<refmiscinfo class="manual">System Administration tools</refmiscinfo>
@@ -12,48 +12,57 @@
<refnamediv>
- <refname>vfs_xattr_tdb</refname>
- <refpurpose>Save Extended Attributes (EAs) in a tdb file</refpurpose>
+ <refname>vfs_streams_depot</refname>
+ <refpurpose>EXPERIMENTAL module to store alternate data streams in a
+ central directory.
+ </refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
- <command>vfs objects = xattr_tdb</command>
+ <command>vfs objects = streams_depot</command>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1>
<title>DESCRIPTION</title>
- <para>This VFS module is part of the
+ <para>This <emphasis>EXPERIMENTAL</emphasis> VFS module is part of the
<citerefentry><refentrytitle>samba</refentrytitle>
<manvolnum>7</manvolnum></citerefentry> suite.</para>
- <para>The <command>vfs_xattr_tdb</command> VFS module stores
- Extended Attributes (EAs) in a tdb file.
- This enables the usage of Extended Attributes on OS and
- filesystems which do not support Extended Attributes
- by themselves.
- </para>
+ <para>The <command>vfs_streams_depot</command> enables storing of NTFS
+ alternate data streams in the file system. As a normal posix file
+ system does not support the concept of multiple data streams per file,
+ the streams_depot module stores the data in files in a separate
+ directory.</para>
- <para>This module is stackable.</para>
</refsect1>
<refsect1>
<title>OPTIONS</title>
<variablelist>
+
<varlistentry>
- <term>xattr_tdb:file = PATH</term>
+ <term>streams_depot:directory = PATH</term>
<listitem>
- <para>Name of the tdb file the EAs are stored in.
- If this option is not set, the default filename
- <filename>xattr.tdb</filename> is used.</para>
+ <para>Path of the directory where the alternate data streams
+ should be stored. Defaults to the sharepath/.streams.</para>
</listitem>
</varlistentry>
+
</variablelist>
+</refsect1>
+
+<refsect1>
+ <title>EXAMPLES</title>
+
+<programlisting>
+ <smbconfsection name="[share]"/>
+ <smbconfoption name="vfs objects">streams_depot</smbconfoption>
+</programlisting>
-
</refsect1>
<refsect1>
diff --git a/docs-xml/manpages-3/vfs_streams_xattr.8.xml b/docs-xml/manpages-3/vfs_streams_xattr.8.xml
new file mode 100644
index 0000000..50649af
--- /dev/null
+++ b/docs-xml/manpages-3/vfs_streams_xattr.8.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<refentry id="vfs_streams_xattr.8">
+
+<refmeta>
+ <refentrytitle>vfs_streams_xattr</refentrytitle>
+ <manvolnum>8</manvolnum>
+ <refmiscinfo class="source">Samba</refmiscinfo>
+ <refmiscinfo class="manual">System Administration tools</refmiscinfo>
+ <refmiscinfo class="version">3.2</refmiscinfo>
+</refmeta>
+
+
+<refnamediv>
+ <refname>vfs_streams_xattr</refname>
+ <refpurpose>Store alternate data streams in posix xattrs</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <cmdsynopsis>
+ <command>vfs objects = streams_xattr</command>
+ </cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1>
+ <title>DESCRIPTION</title>
+
+ <para>This VFS module is part of the
+ <citerefentry><refentrytitle>samba</refentrytitle>
+ <manvolnum>7</manvolnum></citerefentry> suite.</para>
+
+ <para>The <command>vfs_streams_xattr</command> enables storing of NTFS
+ alternate data streams in the file system. As a normal posix file
+ system does not support the concept of multiple data streams per file,
+ the streams_xattr module stores the data in posix extended attributes
+ (xattrs). The name of these attributes is
+ user.DosStream."ADS-NAME".</para>
+
+ <para>The file system that is shared with this module enabled must
+ support xattrs.</para>
+
+ <para>Please note that most file systems have severe limitations on
+ the size of xattrs. So this module might work for applications like IE
+ that stores small zone information in streams but will fail for
+ applications that store serious amounts of data in ADSs.</para>
+</refsect1>
+
+<refsect1>
+ <title>EXAMPLES</title>
+
+<programlisting>
+ <smbconfsection name="[share]"/>
+ <smbconfoption name="vfs objects">streams_xattr</smbconfoption>
+</programlisting>
+
+</refsect1>
+
+<refsect1>
+ <title>AUTHOR</title>
+
+ <para>The original Samba software and related utilities
+ were created by Andrew Tridgell. Samba is now developed
+ by the Samba Team as an Open Source project similar
+ to the way the Linux kernel is developed.</para>
+
+</refsect1>
+
+</refentry>
diff --git a/source/modules/vfs_streams_depot.c b/source/modules/vfs_streams_depot.c
index fa85ea4..d8c476f 100644
--- a/source/modules/vfs_streams_depot.c
+++ b/source/modules/vfs_streams_depot.c
@@ -118,7 +118,7 @@ static char *stream_dir(vfs_handle_struct *handle, const char *base_path,
uint8 id_buf[16];
const char *rootdir = lp_parm_const_string(
- SNUM(handle->conn), "streams", "directory",
+ SNUM(handle->conn), "streams_depot", "directory",
handle->conn->connectpath);
if (base_sbuf == NULL) {
diff --git a/source/nsswitch/libwbclient/wbc_sid.c b/source/nsswitch/libwbclient/wbc_sid.c
index b090926..4bfd62c 100644
--- a/source/nsswitch/libwbclient/wbc_sid.c
+++ b/source/nsswitch/libwbclient/wbc_sid.c
@@ -140,7 +140,8 @@ wbcErr wbcStringToSid(const char *str,
p = q +1;
sid->num_auths = 0;
while (sid->num_auths < WBC_MAXSUBAUTHS) {
- if ((x=(uint32_t)strtoul(p, &q, 10)) == 0)
+ x=(uint32_t)strtoul(p, &q, 10);
+ if (p == q)
break;
sid->sub_auths[sid->num_auths++] = x;
diff --git a/source/printing/printing.c b/source/printing/printing.c
index c5fe53f..af89852 100644
--- a/source/printing/printing.c
+++ b/source/printing/printing.c
@@ -2438,8 +2438,10 @@ uint32 print_job_start(struct current_user *user, int snum, char *jobname, NT_DE
if ((vuser = get_valid_user_struct(user->vuid)) != NULL) {
fstrcpy(pjob.user, lp_printjob_username(snum));
- standard_sub_basic(vuser->user.smb_name, vuser->user.domain,
- pjob.user, sizeof(pjob.user)-1);
+ standard_sub_advanced(sharename, vuser->user.smb_name, path,
+ vuser->gid, vuser->user.smb_name,
+ vuser->user.domain, pjob.user,
+ sizeof(pjob.user) - 1);
/* ensure NULL termination */
pjob.user[sizeof(pjob.user)-1] = '\0';
} else {
diff --git a/source/winbindd/winbindd.c b/source/winbindd/winbindd.c
index 1bc2ffd..98d70cc 100644
--- a/source/winbindd/winbindd.c
+++ b/source/winbindd/winbindd.c
@@ -56,7 +56,7 @@ struct messaging_context *winbind_messaging_context(void)
/* Reload configuration */
-static bool reload_services_file(void)
+static bool reload_services_file(const char *logfile)
{
bool ret;
@@ -68,6 +68,12 @@ static bool reload_services_file(void)
}
}
+ /* if this is a child, restore the logfile to the special
+ name - <domain>, idmap, etc. */
+ if (logfile && *logfile) {
+ lp_set_logfile(logfile);
+ }
+
reopen_logs();
ret = lp_load(get_dyn_CONFIGFILE(),False,False,True,True);
@@ -205,7 +211,7 @@ static void msg_reload_services(struct messaging_context *msg,
{
/* Flush various caches */
flush_caches();
- reload_services_file();
+ reload_services_file((const char *) private_data);
}
/* React on 'smbcontrol winbindd shutdown' in the same way as on SIGTERM*/
@@ -801,14 +807,14 @@ static bool remove_idle_client(void)
}
/* check if HUP has been received and reload files */
-void winbind_check_sighup(void)
+void winbind_check_sighup(const char *logfile)
{
if (do_sighup) {
DEBUG(3, ("got SIGHUP\n"));
flush_caches();
- reload_services_file();
+ reload_services_file(logfile);
do_sighup = False;
}
@@ -981,7 +987,7 @@ static void process_loop(void)
/* Check signal handling things */
winbind_check_sigterm(true);
- winbind_check_sighup();
+ winbind_check_sighup(NULL);
if (do_sigusr2) {
print_winbindd_status();
@@ -1134,7 +1140,7 @@ int main(int argc, char **argv, char **envp)
db_tdb2_setup_messaging(winbind_messaging_context(), true);
- if (!reload_services_file()) {
+ if (!reload_services_file(NULL)) {
DEBUG(0, ("error opening config file\n"));
exit(1);
}
diff --git a/source/winbindd/winbindd_dual.c b/source/winbindd/winbindd_dual.c
index c3bcb71..57ab627 100644
--- a/source/winbindd/winbindd_dual.c
+++ b/source/winbindd/winbindd_dual.c
@@ -1148,7 +1148,8 @@ static bool fork_domain_child(struct winbindd_child *child)
/* check for signals */
winbind_check_sigterm(false);
- winbind_check_sighup();
+ winbind_check_sighup(override_logfile ? NULL :
+ child->logfilename);
run_events(winbind_event_context(), 0, NULL, NULL);
--
Samba Shared Repository
More information about the samba-cvs
mailing list