[SCM] Samba Shared Repository - branch v3-4-stable updated -
release-3-4-0rc1-19-g3329658
Karolin Seeger
kseeger at samba.org
Wed Jul 1 12:11:36 GMT 2009
The branch, v3-4-stable has been updated
via 3329658ba9f83e03de463bd9d8a751516b64ac8b (commit)
via 5cc5156fa63febc05d029bd44379ed54330aab24 (commit)
via 1e1ae462cdce317292446c0cc95beadb9960c86e (commit)
via 9002ff4b705b7f7f4c55b35934b831891019af54 (commit)
via d15595f10ce0ee75a71d2a95d7bfe188d5b830e2 (commit)
via c8204bb432bcc3a2a6b0505fbcb333fdfdb59e2b (commit)
from 518526bf6832a310551eeae018c5b703e9db3e64 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-stable
- Log -----------------------------------------------------------------
commit 3329658ba9f83e03de463bd9d8a751516b64ac8b
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed Jul 1 14:09:42 2009 +0200
WHATSNEW: Update changes since 3.4.0rc1.
Karolin
(cherry picked from commit 95c90fa6973676d6599668bbe816bdbbae5d086c)
commit 5cc5156fa63febc05d029bd44379ed54330aab24
Author: Michael Adam <obnox at samba.org>
Date: Wed Jul 1 10:51:17 2009 +0200
lib/util: fix order of includes in tevent_ntstatus.c
replace.h needs to be included first.
Michael
(cherry picked from commit 8d982d91f231abbf003473d09433fca2cfa240ac)
Signed-off-by: Michael Adam <obnox at samba.org>
This addresses bug #6521.
(cherry picked from commit 5c5f72b6c5e7473cfe42d2d54fd34c6b31cbf6b1)
commit 1e1ae462cdce317292446c0cc95beadb9960c86e
Author: Günther Deschner <gd at samba.org>
Date: Tue Jun 30 13:12:01 2009 +0200
s3-spoolss: Bug #6512. Fix support for enumerating user forms.
Found while testing Xerox WorkCentre 133 PCL driver, now also tested with
torture test.
Guenther
(cherry picked from commit b85b93dcff89e18bd15d4cef8b8c2dc61bc42cbe)
(cherry picked from commit 14be3fd3daee943d0aaad1029ab629e5d379708b)
commit 9002ff4b705b7f7f4c55b35934b831891019af54
Author: Matt Kraai <mkraai at beckman.com>
Date: Wed Jul 1 08:18:11 2009 +0200
s3/docs: Fix typo.
This fixes bug #6519.
(cherry picked from commit 4fb1f8e8fe46b3e77c06612ac3fc3d67cf650a11)
(cherry picked from commit 39bfcc5d50892ad0c387f0ca3932e961e77fdc39)
commit d15595f10ce0ee75a71d2a95d7bfe188d5b830e2
Author: Tim Prouty <tprouty at samba.org>
Date: Tue Jun 30 16:59:57 2009 -0700
s3 docs: Add documentation for 'kerberos method' and 'dedicated keytab file' parameters
(cherry picked from commit 969106a21fe169282e3b42e51d9e14836d6a41b2)
This fixes bug #6264.
(cherry picked from commit 8135fb06fb18fe42b05f6a938d31905d8ebc903a)
commit c8204bb432bcc3a2a6b0505fbcb333fdfdb59e2b
Author: Michael Adam <obnox at samba.org>
Date: Mon Jun 29 15:39:46 2009 +0200
lib/util: fix building tevent_ntstatus without config.h
(when called from places with "#define NO_CONFIG_H" set, such as configure)
This fixes bug #6521.
Michael
(cherry picked from commit e4e855563bcbeb7be54de57d8c1d41d35ddc5e7a)
(cherry picked from commit 6bac56bc6873470958a2369827cbfa3a7c8241d4)
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 7 +++-
docs-xml/Samba3-HOWTO/TOSHARG-upgrading-to-3.0.xml | 2 +-
.../smbdotconf/security/dedicatedkeytabfile.xml | 15 ++++++++
docs-xml/smbdotconf/security/kerberosmethod.xml | 39 ++++++++++++++++++++
lib/util/tevent_ntstatus.c | 2 +-
lib/util/tevent_ntstatus.h | 1 -
source3/rpc_server/srv_spoolss_nt.c | 10 +++---
7 files changed, 67 insertions(+), 9 deletions(-)
create mode 100644 docs-xml/smbdotconf/security/dedicatedkeytabfile.xml
create mode 100644 docs-xml/smbdotconf/security/kerberosmethod.xml
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index e10c567..a1ac150 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -208,9 +208,14 @@ Changes since 3.4.0rc1
o Michael Adam <obnox at samba.org>
* BUG 6509: Use gid (not uid) cache in fetch_gid_from_cache().
+ * BUG 6521: Fix building tevent_ntstatus without config.h.
-o Björn Jacke <bj at sernet.de>
+o Guenther Deschner <gd at samba.org>
+ * BUG 6512: Fix support for enumerating user forms.
+
+
+o Bjoern Jacke <bj at sernet.de>
* BUG 6497: Fix calling of 'test' in configure.
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-upgrading-to-3.0.xml b/docs-xml/Samba3-HOWTO/TOSHARG-upgrading-to-3.0.xml
index aa879ae..f3fb688 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-upgrading-to-3.0.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-upgrading-to-3.0.xml
@@ -88,7 +88,7 @@ See <link linkend="pdbeditthing">The <emphasis>pdbedit</emphasis> Command</link>
</sect1>
<sect1>
-<title>New Featuers in Samba-3.x Series</title>
+<title>New Features in Samba-3.x Series</title>
<para>
</para>
diff --git a/docs-xml/smbdotconf/security/dedicatedkeytabfile.xml b/docs-xml/smbdotconf/security/dedicatedkeytabfile.xml
new file mode 100644
index 0000000..c833e3f
--- /dev/null
+++ b/docs-xml/smbdotconf/security/dedicatedkeytabfile.xml
@@ -0,0 +1,15 @@
+<samba:parameter name="dedicated keytab file" context="G" type="string"
+ advanced="1" developer="1"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+ <para>
+ Specifies the path to the kerberos keytab file when
+ <smbconfoption name="kerberos method"/> is set to "dedicated
+ keytab".
+ </para>
+</description>
+<related>kerberos method</related>
+<value type="default"/>
+<value type="example">/usr/local/etc/krb5.keytab</value>
+</samba:parameter>
+
diff --git a/docs-xml/smbdotconf/security/kerberosmethod.xml b/docs-xml/smbdotconf/security/kerberosmethod.xml
new file mode 100644
index 0000000..3a11e06
--- /dev/null
+++ b/docs-xml/smbdotconf/security/kerberosmethod.xml
@@ -0,0 +1,39 @@
+<samba:parameter name="kerberos method" context="G" type="enum"
+ advanced="1" developer="1"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+ <para>
+ Controls how kerberos tickets are verified.
+ </para>
+
+ <para>Valid options are:</para>
+ <itemizedlist>
+ <listitem><para>secrets only - use only the secrets.tdb for
+ ticket verification (default)</para></listitem>
+
+ <listitem><para>system keytab - use only the system keytab
+ for ticket verification</para></listitem>
+
+ <listitem><para>dedicated keytab - use a dedicated keytab
+ for ticket verification</para></listitem>
+
+ <listitem><para>secrets and keytab - use the secrets.tdb
+ first, then the system keytab</para></listitem>
+ </itemizedlist>
+
+ <para>
+ The major difference between "system keytab" and "dedicated
+ keytab" is that the latter method relies on kerberos to find the
+ correct keytab entry instead of filtering based on expected
+ principals.
+ </para>
+
+ <para>
+ When the kerberos method is in "dedicated keytab" mode,
+ <smbconfoption name="dedicated keytab file"/> must be set to
+ specify the location of the keytab file.
+ </para>
+</description>
+<related>dedicated keytab file</related>
+<value type="default">secrets only</value>
+</samba:parameter>
diff --git a/lib/util/tevent_ntstatus.c b/lib/util/tevent_ntstatus.c
index 1a34e9c..6aa576d 100644
--- a/lib/util/tevent_ntstatus.c
+++ b/lib/util/tevent_ntstatus.c
@@ -17,8 +17,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "tevent_ntstatus.h"
#include "../replace/replace.h"
+#include "tevent_ntstatus.h"
bool tevent_req_nterror(struct tevent_req *req, NTSTATUS status)
{
diff --git a/lib/util/tevent_ntstatus.h b/lib/util/tevent_ntstatus.h
index 84c275f..acfb903 100644
--- a/lib/util/tevent_ntstatus.h
+++ b/lib/util/tevent_ntstatus.h
@@ -22,7 +22,6 @@
#include <stdint.h>
#include <stdbool.h>
-#include "config.h"
#include "../libcli/util/ntstatus.h"
#include "../tevent/tevent.h"
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 5c56acf..79f0f14 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -7024,7 +7024,7 @@ static WERROR spoolss_enumforms_level1(TALLOC_CTX *mem_ctx,
/* construct the list of form structures */
for (i=0; i<num_builtin_forms; i++) {
- DEBUGADD(6,("Filling form number [%d]\n",i));
+ DEBUGADD(6,("Filling builtin form number [%d]\n",i));
result = fill_form_info_1(info, &info[i].info1,
&builtin_forms[i]);
if (!W_ERROR_IS_OK(result)) {
@@ -7032,10 +7032,10 @@ static WERROR spoolss_enumforms_level1(TALLOC_CTX *mem_ctx,
}
}
- for (; i<num_user_forms; i++) {
- DEBUGADD(6,("Filling form number [%d]\n",i));
- result = fill_form_info_1(info, &info[i].info1,
- &user_forms[i-num_builtin_forms]);
+ for (i=0; i<num_user_forms; i++) {
+ DEBUGADD(6,("Filling user form number [%d]\n",i));
+ result = fill_form_info_1(info, &info[i+num_builtin_forms].info1,
+ &user_forms[i]);
if (!W_ERROR_IS_OK(result)) {
goto out;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list