[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Tue May 14 13:46:02 MDT 2013
The branch, master has been updated
via 8c3fa00 lib/param: remove unused 'printer_admin'
via 0ffd074 doc-xml/smbdotconf: fix server [min|max] protocol documentation
via 8a878ec talloc: only provide the --enable-talloc-compat1 in standalone build
via f08205b winbind/idmap_ad: be verbose about the user that we fail to map
from 5868acc vfs_gpfs: slightly simplify connect()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 8c3fa009ca6e80bf6e8f9daf786b3ec490c735af
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Apr 29 12:27:25 2013 +0200
lib/param: remove unused 'printer_admin'
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
Autobuild-Date(master): Tue May 14 21:45:19 CEST 2013 on sn-devel-104
commit 0ffd074690529a1833e29829b552b3cf6ebcd914
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Apr 30 08:39:00 2013 +0200
doc-xml/smbdotconf: fix server [min|max] protocol documentation
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 8a878ec74bd24180aa73cfb39ff4a6c3e72d9d0b
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue May 7 14:15:35 2013 +0200
talloc: only provide the --enable-talloc-compat1 in standalone build
The compat library is already only built in standalone build,
so we need the configure option also only in the standalone build.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit f08205be7003f6c0a15fd5fd99d01951164ad15c
Author: Björn Jacke <bj at sernet.de>
Date: Tue May 14 16:51:28 2013 +0200
winbind/idmap_ad: be verbose about the user that we fail to map
Reviewed-by: Stefan Metzmacher <metze at samba.org>
-----------------------------------------------------------------------
Summary of changes:
docs-xml/smbdotconf/protocol/servermaxprotocol.xml | 10 ----------
docs-xml/smbdotconf/protocol/serverminprotocol.xml | 2 +-
lib/param/param_functions.c | 1 -
lib/talloc/wscript | 10 ++++++----
source3/winbindd/idmap_ad.c | 5 +++--
5 files changed, 10 insertions(+), 18 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/smbdotconf/protocol/servermaxprotocol.xml b/docs-xml/smbdotconf/protocol/servermaxprotocol.xml
index 94184c8..822e42b 100644
--- a/docs-xml/smbdotconf/protocol/servermaxprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/servermaxprotocol.xml
@@ -10,16 +10,6 @@
<para>Possible values are :</para>
<itemizedlist>
<listitem>
- <para><constant>CORE</constant>: Earliest version. No
- concept of user names.</para>
- </listitem>
-
- <listitem>
- <para><constant>COREPLUS</constant>: Slight improvements on
- CORE for efficiency.</para>
- </listitem>
-
- <listitem>
<para><constant>LANMAN1</constant>: First <emphasis>modern</emphasis>
version of the protocol. Long filename support.</para>
</listitem>
diff --git a/docs-xml/smbdotconf/protocol/serverminprotocol.xml b/docs-xml/smbdotconf/protocol/serverminprotocol.xml
index c62ebb3..fc249fc 100644
--- a/docs-xml/smbdotconf/protocol/serverminprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/serverminprotocol.xml
@@ -18,6 +18,6 @@
<related>server max protocol</related>
-<value type="default">CORE</value>
+<value type="default">LANMAN1</value>
<value type="example">NT1</value>
</samba:parameter>
diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index 7cb3a69..6fc7801 100644
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -72,7 +72,6 @@ FN_LOCAL_STRING(force_user, force_user)
FN_LOCAL_STRING(force_group, force_group)
FN_LOCAL_LIST(readlist, readlist)
FN_LOCAL_LIST(writelist, writelist)
-FN_LOCAL_LIST(printer_admin, printer_admin)
FN_LOCAL_LIST(vfs_objects, szVfsObjects)
FN_LOCAL_STRING(msdfs_proxy, szMSDfsProxy)
static FN_LOCAL_STRING(volume, volume)
diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index bd7708e..ecc5e24 100644
--- a/lib/talloc/wscript
+++ b/lib/talloc/wscript
@@ -27,10 +27,10 @@ def set_options(opt):
opt.BUILTIN_DEFAULT('replace')
opt.PRIVATE_EXTENSION_DEFAULT('talloc', noextension='talloc')
opt.RECURSE('lib/replace')
- opt.add_option('--enable-talloc-compat1',
- help=("Build talloc 1.x.x compat library [False]"),
- action="store_true", dest='TALLOC_COMPAT1', default=False)
if opt.IN_LAUNCH_DIR():
+ opt.add_option('--enable-talloc-compat1',
+ help=("Build talloc 1.x.x compat library [False]"),
+ action="store_true", dest='TALLOC_COMPAT1', default=False)
opt.add_option('--disable-python',
help=("disable the pytalloc module"),
action="store_true", dest='disable_python', default=False)
@@ -51,7 +51,9 @@ def configure(conf):
implied_deps='talloc replace'):
conf.define('USING_SYSTEM_PYTALLOC_UTIL', 1)
- conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1
+ conf.env.TALLOC_COMPAT1 = False
+ if conf.env.standalone_talloc:
+ conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1
conf.CHECK_XSLTPROC_MANPAGES()
diff --git a/source3/winbindd/idmap_ad.c b/source3/winbindd/idmap_ad.c
index 5bafa90..1ed6570 100644
--- a/source3/winbindd/idmap_ad.c
+++ b/source3/winbindd/idmap_ad.c
@@ -323,7 +323,7 @@ again:
ctx->ad_schema->posix_gidnumber_attr,
&id))
{
- DEBUG(1, ("Could not get unix ID\n"));
+ DEBUG(1, ("Could not get SID for unix ID %u\n", (unsigned) id));
continue;
}
@@ -520,7 +520,8 @@ again:
ctx->ad_schema->posix_gidnumber_attr,
&id))
{
- DEBUG(1, ("Could not get unix ID\n"));
+ DEBUG(1, ("Could not get unix ID for SID %s\n",
+ sid_string_dbg(map->sid)));
continue;
}
if (!idmap_unix_id_is_in_range(id, dom)) {
--
Samba Shared Repository
More information about the samba-cvs
mailing list