[SCM] Samba Shared Repository - branch v4-0-test updated
Karolin Seeger
kseeger at samba.org
Mon Jan 21 05:01:04 MST 2013
The branch, v4-0-test has been updated
via 0c29da8 samr: Fix bug 9541, make use of posix_openpt
via 4063f9e samr: Split up an assignment from an if condition
via da9d6c8 docs: document the command line options in dbwrap_tool(1)
via fa0e1dc docs: add popt.common.samba.server and popt.common.samba.client entities
via 3a70b74 docs: fix the stdarg.configfile entity to print a "=" sign after the long option
via 94b7d3b docs: use the stdarg.option entity in the popt.common.samba entity
via 5ca8907 docs: add an entity stdarg.option for the "--option" command line parameter
via 6916daa build(waf): docs-xml: build new dbwrap_tool.8 manual page (fix bug #9568 [2/2])
via 1c6a561 docs-xml: add dbwrap_tool.1 manual page (fix bug #9568 [1/2])
via b247db7 nsswitch: Fix two bitfield constants being the same.
via 2a9528e Sort winbind request flags. Ira saw we have a duplicate.
from 78f4e66 vfs: Fix compilation of solaris ACL module
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit 0c29da8baded29ac4e0ac5dd4cfa63eee4dba61c
Author: Volker Lendecke <vl at samba.org>
Date: Fri Jan 11 10:36:04 2013 +0100
samr: Fix bug 9541, make use of posix_openpt
Autobuild-User(v4-0-test): Karolin Seeger <kseeger at samba.org>
Autobuild-Date(v4-0-test): Mon Jan 21 13:00:07 CET 2013 on sn-devel-104
commit 4063f9e46a370800aac5242cdc60a80997773749
Author: Volker Lendecke <vl at samba.org>
Date: Fri Jan 11 10:31:42 2013 +0100
samr: Split up an assignment from an if condition
commit da9d6c834b67687dcc047490c566db3bbb8980dd
Author: Michael Adam <obnox at samba.org>
Date: Mon Jan 14 17:15:08 2013 +0100
docs: document the command line options in dbwrap_tool(1)
Related to bug #9568.
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
(cherry picked from commit d67911bafc0d098e67c8ad8d9b4bc49f184ff832)
commit fa0e1dc89e025823d2c7a6e958ce4a442b260c9c
Author: Michael Adam <obnox at samba.org>
Date: Mon Jan 14 17:08:30 2013 +0100
docs: add popt.common.samba.server and popt.common.samba.client entities
These are comprised by the popt.common.samba entity and the stdarg.server.debug
or the stdarg.client.debut entity, respectively.
The difference is only in the default value of the debug level setting.
Related to bug #9568.
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
(cherry picked from commit 2d30e5deaf731839402b47751683d2c0e32d2bc7)
commit 3a70b74f2063c4e0acdb647bfa39a28ccdda3486
Author: Michael Adam <obnox at samba.org>
Date: Mon Jan 14 17:12:51 2013 +0100
docs: fix the stdarg.configfile entity to print a "=" sign after the long option
This makes the appearance equal to the other options like --debuglevel or
--log-basename.
Related to bug #9568.
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
(cherry picked from commit 2ab3a96d262f60d26a8cd16dded3296889ab7f3f)
commit 94b7d3b8c05e52d0be9c80822ca14fb71990702d
Author: Michael Adam <obnox at samba.org>
Date: Mon Jan 14 17:06:03 2013 +0100
docs: use the stdarg.option entity in the popt.common.samba entity
Related to bug #9568.
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
(cherry picked from commit e3db3db784085bb2fedbf3063154b7cd77630e59)
commit 5ca89077c43ee6e1f96edb027687e711322b45d3
Author: Michael Adam <obnox at samba.org>
Date: Mon Jan 14 17:05:05 2013 +0100
docs: add an entity stdarg.option for the "--option" command line parameter
Related to bug #9568.
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
(cherry picked from commit c9b95eb205abbdb77960eb0419937512358f7e64)
commit 6916daa1a4a49e33daedc3d8c8e16a772fd90a86
Author: Björn Baumbach <bb at sernet.de>
Date: Mon Oct 15 17:20:07 2012 +0200
build(waf): docs-xml: build new dbwrap_tool.8 manual page (fix bug #9568 [2/2])
Signed-off-by: Björn Baumbach <bb at sernet.de>
Reviewed-by: Michael Adam <obnox at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
(cherry picked from commit b7a091ecf48963e2a0d1757d0faf131ad8d940fa)
commit 1c6a561ec1429beb2e24a990d9ee5e96abab98a5
Author: Björn Baumbach <bb at sernet.de>
Date: Mon Oct 15 17:17:29 2012 +0200
docs-xml: add dbwrap_tool.1 manual page (fix bug #9568 [1/2])
Signed-off-by: Björn Baumbach <bb at sernet.de>
Reviewed-by: Michael Adam <obnox at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
(cherry picked from commit 8d6104f02d9ab879efe7867fec53cbe5cc408ded)
commit b247db70f707c9ed325986e5e949d0be1d09b30c
Author: Ira Cooper <ira at samba.org>
Date: Wed Jan 16 11:33:31 2013 -0800
nsswitch: Fix two bitfield constants being the same.
WBFLAG_PAM_AUTH_PAC and WBFLAG_BIG_NTLMV2_BLOB
are the same causing errors in NTLMv2 authentication.
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
The last 2 patches address bug #9575 - Duplicate flags defined in the winbindd
protocol.
commit 2a9528eb03e2ebd341de08217fa31a9554ed1410
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jan 16 11:31:32 2013 -0800
Sort winbind request flags. Ira saw we have a duplicate.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed by: Ira Cooper <ira at wakeful.net>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
-----------------------------------------------------------------------
Summary of changes:
docs-xml/build/DTD/samba.entities | 26 ++++-
docs-xml/manpages/dbwrap_tool.1.xml | 164 ++++++++++++++++++++++++++
docs-xml/wscript_build | 1 +
nsswitch/winbind_struct_protocol.h | 16 +--
source3/configure.in | 2 +-
source3/rpc_server/samr/srv_samr_chgpasswd.c | 7 +-
source3/wscript | 2 +-
7 files changed, 205 insertions(+), 13 deletions(-)
create mode 100644 docs-xml/manpages/dbwrap_tool.1.xml
Changeset truncated at 500 lines:
diff --git a/docs-xml/build/DTD/samba.entities b/docs-xml/build/DTD/samba.entities
index c7e46c2..c9c6744 100644
--- a/docs-xml/build/DTD/samba.entities
+++ b/docs-xml/build/DTD/samba.entities
@@ -214,7 +214,7 @@ in the &smb.conf; file.</para>
<!ENTITY stdarg.configfile '
<varlistentry>
-<term>-s|--configfile <configuration file></term>
+<term>-s|--configfile=<configuration file></term>
<listitem><para>The file specified contains the
configuration details required by the server. The
information in this file includes server-specific
@@ -241,12 +241,36 @@ log.smbd, etc...). The log file is never removed by the client.
</para></listitem>
</varlistentry>'>
+<!ENTITY stdarg.option '
+<varlistentry>
+<term>--option=<name>=<value></term>
+<listitem><para>Set the
+<citerefentry><refentrytitle>smb.conf</refentrytitle>
+<manvolnum>5</manvolnum></citerefentry>
+option "<name>" to value "<value>" from the command line.
+This overrides compiled-in defaults and options read from the configuration
+file.
+</para></listitem>
+</varlistentry>'>
+
<!ENTITY popt.common.samba '
&stdarg.version;
&stdarg.configfile;
&stdarg.log-basename;
+&stdarg.option;
'>
+<!ENTITY popt.common.samba.client '
+&stdarg.client.debug;
+&popt.common.samba;
+'>
+
+<!ENTITY popt.common.samba.server '
+&stdarg.server.debug;
+&popt.common.samba;
+'>
+
+
<!ENTITY stdarg.resolve.order '
<varlistentry>
<term>-R|--name-resolve <name resolve order></term>
diff --git a/docs-xml/manpages/dbwrap_tool.1.xml b/docs-xml/manpages/dbwrap_tool.1.xml
new file mode 100644
index 0000000..f4a6388
--- /dev/null
+++ b/docs-xml/manpages/dbwrap_tool.1.xml
@@ -0,0 +1,164 @@
+<?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="dbwrap_tool.1">
+
+<refmeta>
+ <refentrytitle>dbwrap_tool</refentrytitle>
+ <manvolnum>1</manvolnum>
+ <refmiscinfo class="source">Samba</refmiscinfo>
+ <refmiscinfo class="manual">System Administration tools</refmiscinfo>
+ <refmiscinfo class="version">4.0</refmiscinfo>
+</refmeta>
+
+
+<refnamediv>
+ <refname>dbwrap_tool</refname>
+ <refpurpose>low level TDB/CTDB manipulation tool using the dbwrap interface</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <cmdsynopsis>
+ <command>dbwrap_tool</command>
+ <arg choice="opt">-d <debug level></arg>
+ <arg choice="opt">-s <config file></arg>
+ <arg choice="opt">-l <log file base></arg>
+ <arg choice="opt">-V</arg>
+ <arg choice="opt">--option=<name>=<value></arg>
+ <arg choice="req"><database></arg>
+ <arg choice="req"><operation></arg>
+ <arg choice="opt"><key>
+ <arg choice="opt"><type>
+ <arg choice="opt"><value></arg>
+ </arg>
+ </arg>
+ </cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1>
+ <title>DESCRIPTION</title>
+
+ <para>This tool is part of the <citerefentry><refentrytitle>samba</refentrytitle>
+ <manvolnum>7</manvolnum></citerefentry> suite.</para>
+
+ <para>The dbwrap_tool program is used to read and manipulate
+ TDB/CTDB databases using the dbwrap interface.</para>
+
+ <para>The following database operations are available:
+ <itemizedlist>
+ <listitem><para>fetch: fetch a record</para></listitem>
+ <listitem><para>store: create or modify a record</para></listitem>
+ <listitem><para>delete: remove a record</para></listitem>
+ <listitem><para>erase: remove all records</para></listitem>
+ <listitem><para>listkeys: list all available records</para></listitem>
+ <listitem><para>listwatchers: list processes, which are waiting for changes in a record</para></listitem>
+ </itemizedlist>
+ </para>
+ <para>The following types are available:
+ <itemizedlist>
+ <listitem><para>int32: signed 32bit integer</para></listitem>
+ <listitem><para>uint32: unsigned 32bit integer</para></listitem>
+ <listitem><para>string: "hello world"</para></listitem>
+ <listitem><para>hex: hex strings like "68656C6C6F20776F726C6400" ("hello world")</para></listitem>
+ </itemizedlist>
+ </para>
+</refsect1>
+
+<refsect1>
+ <title>OPTIONS</title>
+
+ <variablelist>
+ &popt.common.samba.client;
+ &stdarg.help;
+ </variablelist>
+</refsect1>
+
+<refsect1>
+ <title>COMMANDS</title>
+ <refsect2>
+ <title>fetch</title>
+ <cmdsynopsis>
+ <command>dbwrap_tool</command> <database> fetch <key> <type>
+ </cmdsynopsis>
+ </refsect2>
+ <refsect2>
+ <title>store</title>
+ <cmdsynopsis>
+ <command>dbwrap_tool</command> <database> store <key> <type> <value>
+ </cmdsynopsis>
+ </refsect2>
+ <refsect2>
+ <title>delete</title>
+ <cmdsynopsis>
+ <command>dbwrap_tool</command> <database> delete <key>
+ </cmdsynopsis>
+ </refsect2>
+ <refsect2>
+ <title>erase</title>
+ <cmdsynopsis>
+ <command>dbwrap_tool</command> <database> erase </cmdsynopsis>
+ </refsect2>
+ <refsect2>
+ <title>listkeys</title>
+ <cmdsynopsis>
+ <command>dbwrap_tool</command> <database> listkeys
+ </cmdsynopsis>
+ </refsect2>
+ <refsect2>
+ <title>listwatchers</title>
+ <cmdsynopsis>
+ <command>dbwrap_tool</command> <database> listwatchers
+ </cmdsynopsis>
+ </refsect2>
+</refsect1>
+
+<refsect1>
+ <title>EXAMPLES</title>
+ <variablelist>
+ <varlistentry><term>List all keys from winbindd_idmap.tdb</term>
+ <listitem><para><command>dbwrap_tool</command> winbindd_idmap.tdb listkeys</para></listitem>
+ </varlistentry>
+ <varlistentry><term>Fetch record with key "USER HWM" as uint32</term>
+ <listitem><para><command>dbwrap_tool</command> winbindd_idmap.tdb fetch "USER HWM" uint32</para></listitem>
+ </varlistentry>
+ <varlistentry><term>Remove record with key "USER HWM"</term>
+ <listitem><para><command>dbwrap_tool</command> winbindd_idmap.tdb remove "USER HWM"</para></listitem>
+ </varlistentry>
+ <varlistentry><term>Store and overwrite record "USER HWM" with value 214</term>
+ <listitem><para>uint32: <command>dbwrap_tool</command> winbindd_idmap.tdb store "USER HWM" uint32 214</para></listitem>
+ <listitem><para>hex: <command>dbwrap_tool</command> winbindd_idmap.tdb store "USER HWM" hex D6000000</para></listitem>
+ </varlistentry>
+ </variablelist>
+</refsect1>
+
+<refsect1>
+ <title>NOTES</title>
+
+ <para>Use with caution!</para>
+</refsect1>
+
+
+<refsect1>
+ <title>VERSION</title>
+
+ <para>This man page is correct for version 3 of the Samba suite.</para>
+</refsect1>
+
+<refsect1>
+ <title>SEE ALSO</title>
+ <para><citerefentry><refentrytitle>smbd</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>samba</refentrytitle>
+ <manvolnum>7</manvolnum></citerefentry></para>
+</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>
+
+ <para>The dbwrap_tool manpage was written by Bjoern Baumbach.</para>
+</refsect1>
+
+</refentry>
diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
index 8a5f3a4..25e381e 100644
--- a/docs-xml/wscript_build
+++ b/docs-xml/wscript_build
@@ -1,6 +1,7 @@
#!/usr/bin/env python
from samba_utils import save_file
manpages='''
+ manpages/dbwrap_tool.1
manpages/eventlogadm.8
manpages/findsmb.1
manpages/libsmbclient.7
diff --git a/nsswitch/winbind_struct_protocol.h b/nsswitch/winbind_struct_protocol.h
index c1704c8..4a41ba3 100644
--- a/nsswitch/winbind_struct_protocol.h
+++ b/nsswitch/winbind_struct_protocol.h
@@ -205,27 +205,25 @@ typedef struct winbindd_gr {
uint32_t gr_mem_ofs; /* offset to group membership */
} WINBINDD_GR;
-/* PAM specific request flags */
+/* Request flags */
#define WBFLAG_PAM_INFO3_NDR 0x00000001
#define WBFLAG_PAM_INFO3_TEXT 0x00000002
#define WBFLAG_PAM_USER_SESSION_KEY 0x00000004
#define WBFLAG_PAM_LMKEY 0x00000008
#define WBFLAG_PAM_CONTACT_TRUSTDOM 0x00000010
+#define WBFLAG_QUERY_ONLY 0x00000020 /* not used */
+#define WBFLAG_PAM_AUTH_PAC 0x00000040
#define WBFLAG_PAM_UNIX_NAME 0x00000080
#define WBFLAG_PAM_AFS_TOKEN 0x00000100
#define WBFLAG_PAM_NT_STATUS_SQUASH 0x00000200
-#define WBFLAG_PAM_KRB5 0x00001000
-#define WBFLAG_PAM_FALLBACK_AFTER_KRB5 0x00002000
-#define WBFLAG_PAM_CACHED_LOGIN 0x00004000
-#define WBFLAG_PAM_GET_PWD_POLICY 0x00008000
-#define WBFLAG_PAM_AUTH_PAC 0x00010000
-
-/* generic request flags */
-#define WBFLAG_QUERY_ONLY 0x00000020 /* not used */
/* This is a flag that can only be sent from parent to child */
#define WBFLAG_IS_PRIVILEGED 0x00000400 /* not used */
/* Flag to say this is a winbindd internal send - don't recurse. */
#define WBFLAG_RECURSE 0x00000800
+#define WBFLAG_PAM_KRB5 0x00001000
+#define WBFLAG_PAM_FALLBACK_AFTER_KRB5 0x00002000
+#define WBFLAG_PAM_CACHED_LOGIN 0x00004000
+#define WBFLAG_PAM_GET_PWD_POLICY 0x00008000
/* Flag to tell winbind the NTLMv2 blob is too big for the struct and is in the
* extra_data field */
#define WBFLAG_BIG_NTLMV2_BLOB 0x00010000
diff --git a/source3/configure.in b/source3/configure.in
index e719b53..d0c2a48 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -971,7 +971,7 @@ AC_CHECK_FUNCS(sigprocmask sigblock sigaction sigset innetgr setnetgrent getnetg
AC_CHECK_FUNCS(initgroups select rdchk getgrnam getgrent pathconf)
AC_CHECK_FUNCS(getgrset)
AC_CHECK_FUNCS(setpriv setgidx setuidx setgroups syscall sysconf)
-AC_CHECK_FUNCS(atexit grantpt posix_fallocate)
+AC_CHECK_FUNCS(atexit grantpt posix_openpt posix_fallocate)
AC_CHECK_FUNCS(fallocate)
AC_CHECK_FUNCS(fseeko setluid getpwanam)
AC_CHECK_FUNCS(fdopendir)
diff --git a/source3/rpc_server/samr/srv_samr_chgpasswd.c b/source3/rpc_server/samr/srv_samr_chgpasswd.c
index 51c0d0f..db1f459 100644
--- a/source3/rpc_server/samr/srv_samr_chgpasswd.c
+++ b/source3/rpc_server/samr/srv_samr_chgpasswd.c
@@ -73,8 +73,13 @@ static int findpty(char **slave)
*slave = NULL;
#if defined(HAVE_GRANTPT)
+#if defined(HAVE_POSIX_OPENPT)
+ master = posix_openpt(O_RDWR|O_NOCTTY);
+#else
/* Try to open /dev/ptmx. If that fails, fall through to old method. */
- if ((master = open("/dev/ptmx", O_RDWR, 0)) >= 0) {
+ master = open("/dev/ptmx", O_RDWR, 0);
+#endif
+ if (master >= 0) {
grantpt(master);
unlockpt(master);
line = (char *)ptsname(master);
diff --git a/source3/wscript b/source3/wscript
index 5ee2cca..097cd83 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -81,7 +81,7 @@ def configure(conf):
conf.CHECK_FUNCS('sigprocmask sigblock sigaction sigset innetgr')
conf.CHECK_FUNCS('initgroups select poll rdchk getgrnam getgrent pathconf')
conf.CHECK_FUNCS('setpriv setgidx setuidx setgroups syscall sysconf')
- conf.CHECK_FUNCS('atexit grantpt fallocate posix_fallocate')
+ conf.CHECK_FUNCS('atexit grantpt posix_openpt fallocate posix_fallocate')
conf.CHECK_FUNCS('fseeko setluid')
conf.CHECK_FUNCS('getpwnam', headers='sys/types.h pwd.h')
conf.CHECK_FUNCS('fdopendir')
--
Samba Shared Repository
More information about the samba-cvs
mailing list