[SCM] Samba Shared Repository - branch master updated

2012-02-12 Thread Andrew Bartlett 
The branch, master has been updated
   via  cf155fa s3-selftest: Do not assume $USERNAME is the same as 
$DC_USERNAME
   via  70f4a96 selftest: Allow setup_env() to signal that an environment 
name is unknown
   via  3bf9221 s3-build: expliticly require gssapi for HAVE_KRB5 and 
remove HAVE_GSSAPI
   via  4a0d1b5 s3-libads: Move to using only the HAVE_KRB5 define
   via  310cf98 s3-lib/addns: Move to system/kerberos.h and HAVE_KRB5
  from  bee55a2 s4-dsdb: Check if metadata.tdb exists, before trying to 
open it

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit cf155fa366cd11a24c351452d3b9ccde707de07a
Author: Andrew Bartlett 
Date:   Mon Feb 13 12:36:21 2012 +1100

s3-selftest: Do not assume $USERNAME is the same as $DC_USERNAME

Autobuild-User: Andrew Bartlett 
Autobuild-Date: Mon Feb 13 06:13:38 CET 2012 on sn-devel-104

commit 70f4a96c68e91e407651e2487cc3c66a80262fa2
Author: Andrew Bartlett 
Date:   Mon Feb 13 12:14:57 2012 +1100

selftest: Allow setup_env() to signal that an environment name is unknown

This will allow us to skip samba4 environments that may be mentioned in
the source3/selftest/tests.py file.

Andrew Bartlett

commit 3bf922111a29277e390361c6f4cf7580ff4453e3
Author: Andrew Bartlett 
Date:   Mon Feb 13 11:26:24 2012 +1100

s3-build: expliticly require gssapi for HAVE_KRB5 and remove HAVE_GSSAPI

The requirement for gss functions already make this happen, but
this is clearer.  No code depends on HAVE_GSSAPI any more.

Andrew Bartlett

commit 4a0d1b5ac6c2a42fd5df969acf91bb8e60af06e1
Author: Andrew Bartlett 
Date:   Mon Feb 13 11:23:15 2012 +1100

s3-libads: Move to using only the HAVE_KRB5 define

HAVE_KRB5 already implies that GSSAPI is present as well.

Andrew Bartlett

commit 310cf9857491e23678657598739d77520e7afcda
Author: Andrew Bartlett 
Date:   Mon Feb 13 11:21:11 2012 +1100

s3-lib/addns: Move to system/kerberos.h and HAVE_KRB5

---

Summary of changes:
 lib/addns/dns.h |   21 +++--
 lib/addns/dnsgss.c  |4 ++--
 selftest/selftest.pl|9 -
 selftest/target/Samba.pm|4 ++--
 selftest/target/Samba3.pm   |2 +-
 selftest/target/Samba4.pm   |2 +-
 source3/configure.in|3 ---
 source3/libads/ads_status.c |4 +---
 source3/libads/sasl.c   |   20 ++--
 source3/selftest/tests.py   |6 +++---
 source3/wscript |4 +---
 source4/heimdal_build/wscript_configure |1 -
 12 files changed, 32 insertions(+), 48 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/addns/dns.h b/lib/addns/dns.h
index d98a27e..d01 100644
--- a/lib/addns/dns.h
+++ b/lib/addns/dns.h
@@ -27,6 +27,7 @@
 
 #include "../replace/replace.h"
 #include "system/network.h"
+#include "system/kerberos.h"
 
 /* make sure we have included the correct config.h */
 #ifndef NO_CONFIG_H /* for some tests */
@@ -77,22 +78,6 @@
 #endif
 #endif
 
-#ifdef HAVE_KRB5_H
-#include 
-#endif
-
-#if HAVE_GSSAPI_GSSAPI_H
-#include 
-#elif HAVE_GSSAPI_GSSAPI_GENERIC_H
-#include 
-#elif HAVE_GSSAPI_H
-#include 
-#endif
-
-#if defined(HAVE_GSSAPI_H) || defined(HAVE_GSSAPI_GSSAPI_H) || 
defined(HAVE_GSSAPI_GSSAPI_GENERIC_H)
-#define HAVE_GSSAPI_SUPPORT1
-#endif
-
 #include 
 
 /***
@@ -483,7 +468,7 @@ const char *dns_errstr(DNS_ERROR err);
 
 /* from dnsgss.c */
 
-#ifdef HAVE_GSSAPI_SUPPORT
+#ifdef HAVE_KRB5
 
 void display_status( const char *msg, OM_uint32 maj_stat, OM_uint32 min_stat 
); 
 DNS_ERROR dns_negotiate_sec_ctx( const char *target_realm,
@@ -497,6 +482,6 @@ DNS_ERROR dns_sign_update(struct dns_update_request *req,
  const char *algorithmname,
  time_t time_signed, uint16 fudge);
 
-#endif /* HAVE_GSSAPI_SUPPORT */
+#endif /* HAVE_KRB5 */
 
 #endif /* _DNS_H */
diff --git a/lib/addns/dnsgss.c b/lib/addns/dnsgss.c
index 19b734a..4fef832 100644
--- a/lib/addns/dnsgss.c
+++ b/lib/addns/dnsgss.c
@@ -26,7 +26,7 @@
 #include 
 
 
-#ifdef HAVE_GSSAPI_SUPPORT
+#ifdef HAVE_KRB5
 
 /*
 */
@@ -331,4 +331,4 @@ DNS_ERROR dns_sign_update(struct dns_update_request *req,
return err;
 }
 
-#endif /* HAVE_GSSAPI_SUPPORT */
+#endif /* HAVE_KRB5 */
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index e5ccbd8..4625172 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -882,7 +882,9 @@ sub setup_env($$)
}
} else {

[SCM] Samba Shared Repository - branch master updated

2012-02-12 Thread Amitay Isaacs 
The branch, master has been updated
   via  bee55a2 s4-dsdb: Check if metadata.tdb exists, before trying to 
open it
  from  caf485a auth: Pass in the SMB username (for %U) into 
generate_session_info

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit bee55a29578e8eab66c36de9b2526769b05b8dba
Author: Amitay Isaacs 
Date:   Mon Feb 13 11:07:06 2012 +1100

s4-dsdb: Check if metadata.tdb exists, before trying to open it

This fixes the error output from tdb2 when metadata module tries
to create metadata.tdb first time. This error is reported since
metadata module tries to check if tdb exists by trying to open
tdb file.

Autobuild-User: Amitay Isaacs 
Autobuild-Date: Mon Feb 13 03:02:09 CET 2012 on sn-devel-104

---

Summary of changes:
 .../dsdb/samdb/ldb_modules/partition_metadata.c|6 ++
 1 files changed, 6 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/samdb/ldb_modules/partition_metadata.c 
b/source4/dsdb/samdb/ldb_modules/partition_metadata.c
index acf414b..e3f0fb5 100644
--- a/source4/dsdb/samdb/ldb_modules/partition_metadata.c
+++ b/source4/dsdb/samdb/ldb_modules/partition_metadata.c
@@ -152,6 +152,7 @@ static int partition_metadata_open(struct ldb_module 
*module, bool create)
const char *sam_name;
char *filename, *dirname;
int open_flags;
+   struct stat statbuf;
 
data = talloc_get_type_abort(ldb_module_get_private(module),
 struct partition_private_data);
@@ -193,6 +194,11 @@ static int partition_metadata_open(struct ldb_module 
*module, bool create)
 
mkdir(dirname, 0700);
talloc_free(dirname);
+   } else {
+   if (stat(filename, &statbuf) != 0) {
+   talloc_free(tmp_ctx);
+   return LDB_ERR_OPERATIONS_ERROR;
+   }
}
 
lp_ctx = talloc_get_type_abort(ldb_get_opaque(ldb, "loadparm"),


-- 
Samba Shared Repository

[SCM] CTDB repository - branch master updated - ctdb-1.12-197-ga7e7fa2

2012-02-12 Thread Ronnie Sahlberg 
The branch, master has been updated
   via  a7e7fa2169ee12f817336f6d03d5bb72df7ec020 (commit)
   via  f4d395165816f74839ed48860e3210e05bc16d3d (commit)
   via  f0bc1760c36c8589f58354c50b23880946cb57c6 (commit)
   via  3c2117e8e4156e0048fbd2c94546112f0c588522 (commit)
  from  496e8f8540f78606ef23ee8fa100eb2b2cf3f106 (commit)

http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master


- Log -
commit a7e7fa2169ee12f817336f6d03d5bb72df7ec020
Author: Ronnie Sahlberg 
Date:   Mon Feb 13 11:16:24 2012 +1100

READONLY: add test for creating and revoking delegations

commit f4d395165816f74839ed48860e3210e05bc16d3d
Author: Ronnie Sahlberg 
Date:   Mon Feb 13 11:06:45 2012 +1100

READONLY: Update the fetch-readonly-once test tool to use CTDB_SOCKET if set

commit f0bc1760c36c8589f58354c50b23880946cb57c6
Author: Ronnie Sahlberg 
Date:   Mon Feb 13 10:34:41 2012 +1100

READONLY: document the command to activate readonly record support

commit 3c2117e8e4156e0048fbd2c94546112f0c588522
Author: Ronnie Sahlberg 
Date:   Mon Feb 13 10:27:59 2012 +1100

READONLY:  allow specifying the db name for setdbreadonly instead of just 
the hash

---

Summary of changes:
 doc/ctdb.1|  676 +++--
 doc/ctdb.1.html   |  163 
 doc/ctdb.1.xml|   11 +
 tests/simple/75_readonly_records_basic.sh |  163 +++
 tests/src/ctdb_fetch_readonly_once.c  |8 +-
 tools/ctdb.c  |   33 ++-
 6 files changed, 541 insertions(+), 513 deletions(-)
 create mode 100755 tests/simple/75_readonly_records_basic.sh


Changeset truncated at 500 lines:

diff --git a/doc/ctdb.1 b/doc/ctdb.1
index 55454f3..c75a658 100644
--- a/doc/ctdb.1
+++ b/doc/ctdb.1
@@ -1,218 +1,164 @@
-'\" t
-.\" Title: ctdb
-.\"Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 
-.\"  Date: 12/23/2011
-.\"Manual: CTDB - clustered TDB database
-.\"Source: ctdb
-.\"  Language: English
-.\"
-.TH "CTDB" "1" "12/23/2011" "ctdb" "CTDB \- clustered TDB database"
-.\" -
-.\" * Define some portability stuff
-.\" -
-.\" ~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~
-.ie \n(.g .ds Aq \(aq
-.el   .ds Aq '
-.\" -
-.\" * set default formatting
-.\" -
+.\" ** You probably do not want to edit this file directly **
+.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
+.\" Instead of manually editing it, you probably should edit the DocBook XML
+.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
+.TH "CTDB" "1" "02/13/2012" "ctdb" "CTDB \- clustered TDB database"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
 .ad l
-.\" -
-.\" * MAIN CONTENT STARTS HERE *
-.\" -
 .SH "NAME"
 ctdb \- clustered tdb database management utility
 .SH "SYNOPSIS"
-.HP \w'\fBctdb\ [\ OPTIONS\ ]\ COMMAND\ \&.\&.\&.\fR\ 'u
-\fBctdb [ OPTIONS ] COMMAND \&.\&.\&.\fR
-.HP \w'\fBctdb\fR\ 'u
+.HP 29
+\fBctdb [ OPTIONS ] COMMAND ...\fR
+.HP 5
 \fBctdb\fR [\-n\ ] [\-Y] [\-t\ ] [\-T\ ] [\-?\ 
\-\-help] [\-\-usage] [\-d\ \-\-debug=] [\-\-socket=] 
[\-\-print\-emptyrecords] [\-\-print\-datasize] [\-\-print\-lmaster] 
[\-\-print\-hash] [\-\-print\-recordflags]
 .SH "DESCRIPTION"
 .PP
-ctdb is a utility to view and manage a ctdb cluster\&.
+ctdb is a utility to view and manage a ctdb cluster.
 .SH "OPTIONS"
-.PP
+.TP
 \-n 
-.RS 4
-This specifies the physical node number on which to execute the command\&. 
Default is to run the command on the daemon running on the local host\&.
+This specifies the physical node number on which to execute the command. 
Default is to run the command on the daemon running on the local host.
 .sp
-The physical node number is an integer that describes the node in the 
cluster\&. The first node has physical node number 0\&.
-.RE
-.PP
+The physical node number is an integer that describes the node in the cluster. 
The first node has physical node number 0.
+.TP
 \-Y
-.RS 4
-Produce output in machine readable form for easier parsing by scripts\&. Not 
all commands support this option\&.
-.RE
-.PP
+Produce output in machine readable form for easier parsin

[SCM] Samba Shared Repository - branch master updated

2012-02-12 Thread Andrew Bartlett 
The branch, master has been updated
   via  caf485a auth: Pass in the SMB username (for %U) into 
generate_session_info
   via  05f9495 s4:join python code - "msDS-KeyVersionNumber" does not 
exist on Win2k
   via  1e46ccb LDB:pyldb.c - use always the case insensitive comparison 
for attribute names
  from  2d66d16 wafsamba: Add tests for dict_concat.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit caf485a2bd0453b7d22600f9106a2026b1a50c79
Author: Andrew Bartlett 
Date:   Mon Jan 30 21:49:33 2012 +1100

auth: Pass in the SMB username (for %U) into generate_session_info

This matches what Samba3 does.

Andrew Bartlett

Autobuild-User: Andrew Bartlett 
Autobuild-Date: Mon Feb 13 01:25:59 CET 2012 on sn-devel-104

commit 05f9495ff36c2335ff9c69ea408cd9328f6cc6e6
Author: Matthias Dieter Wallnöfer 
Date:   Mon Jan 30 17:20:28 2012 +0100

s4:join python code - "msDS-KeyVersionNumber" does not exist on Win2k

No problem since "secretsdb_self_join()" then chooses 1 as a default
value.
Fix case sensitivity for "msDS-KeyVersionNumber".

Signed-off-by: Andrew Bartlett 

commit 1e46ccba5ada1be310be4bbf4a954df73cde6c3a
Author: Matthias Dieter Wallnöfer 
Date:   Sat Feb 11 12:48:20 2012 +0100

LDB:pyldb.c - use always the case insensitive comparison for attribute names

We can make no assumptions about our users

Signed-off-by: Andrew Bartlett 

---

Summary of changes:
 auth/common_auth.h |1 +
 lib/ldb/pyldb.c|4 ++--
 source4/auth/ntlm/auth.c   |8 ++--
 source4/auth/ntlm/auth_simple.c|1 +
 source4/auth/ntlmssp/ntlmssp_server.c  |1 +
 source4/auth/unix_token.c  |7 ---
 source4/scripting/python/samba/join.py |8 ++--
 source4/smb_server/smb/sesssetup.c |4 +++-
 8 files changed, 24 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/auth/common_auth.h b/auth/common_auth.h
index 453c0c9..d9996e1 100644
--- a/auth/common_auth.h
+++ b/auth/common_auth.h
@@ -120,6 +120,7 @@ struct auth4_context {
NTSTATUS (*generate_session_info)(TALLOC_CTX *mem_ctx,
  struct auth4_context *auth_context,
  void *server_returned_info,
+ const char *original_user_name,
  uint32_t session_info_flags,
  struct auth_session_info 
**session_info);
 
diff --git a/lib/ldb/pyldb.c b/lib/ldb/pyldb.c
index b253bcd..2f99d14 100644
--- a/lib/ldb/pyldb.c
+++ b/lib/ldb/pyldb.c
@@ -1051,7 +1051,7 @@ static struct ldb_message *PyDict_AsMessage(TALLOC_CTX 
*mem_ctx,
 
while (PyDict_Next(py_obj, &dict_pos, &key, &value)) {
char *key_str = PyString_AsString(key);
-   if (strcmp(key_str, "dn") != 0) {
+   if (ldb_attr_cmp(key_str, "dn") != 0) {
msg_el = PyObject_AsMessageElement(msg->elements, value,
   mod_flags, key_str);
if (msg_el == NULL) {
@@ -2516,7 +2516,7 @@ static PyObject 
*py_ldb_msg_getitem_helper(PyLdbMessageObject *self, PyObject *p
return NULL;
}
name = PyString_AsString(py_name);
-   if (!strcmp(name, "dn"))
+   if (!ldb_attr_cmp(name, "dn"))
return pyldb_Dn_FromDn(msg->dn);
el = ldb_msg_find_element(msg, name);
if (el == NULL) {
diff --git a/source4/auth/ntlm/auth.c b/source4/auth/ntlm/auth.c
index 6dd82e4..fdfdb63 100644
--- a/source4/auth/ntlm/auth.c
+++ b/source4/auth/ntlm/auth.c
@@ -36,7 +36,8 @@
 static NTSTATUS auth_generate_session_info_wrapper(TALLOC_CTX *mem_ctx,
   struct auth4_context 
*auth_context,
   void *server_returned_info,
-  uint32_t session_info_flags,
+  const char 
*original_user_name,
+  uint32_t session_info_flags,
   struct auth_session_info 
**session_info);
 
 /***
@@ -140,6 +141,7 @@ static NTSTATUS auth_generate_session_info_principal(struct 
auth4_context *auth_
 
nt_status = auth_generate_session_info_wrapper(mem_ctx, 
auth_ctx,
   user_info_dc,
+  
user_info_dc->info->account_name,

[SCM] Samba Shared Repository - branch v3-6-test updated

2012-02-12 Thread Karolin Seeger 
The branch, v3-6-test has been updated
   via  16f900c Allow vfs_aio_pthread to build as a static module.
   via  c738f0e Update man page to fix typo vfs_aio_fork -> 
vfs_aio_pthread, add aio read size, aio write size examples. (cherry picked 
from commit 12b614a9298974ba5daee7aa8d1aa47006de01e2)
   via  0ba64e6 Add vfs_aio_pthread code.
   via  caa7cca Ensure we always free aio_ex on all error paths by moving 
the TALLOC_FREE call out of smbd_aio_complete_aio_ex() and into the caller.
   via  00d59a0 Add man page for vfs_aio_pthread module. (cherry picked 
from commit d8c699190d2cc0ce64395c7b2b10bb25c98a2943)
   via  b306267 Change the signature of pthreadpool_finished_job() to 
return 0 on success, errno on fail and return the jobid in a separate variable.
  from  5bfe963 s3:smb2_server: fix a logic error, we should sign non guest 
sessions

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -
commit 16f900cb94a69a47d627666751d374f097f092f4
Author: Christian Ambach 
Date:   Fri Jan 27 10:25:13 2012 -0800

Allow vfs_aio_pthread to build as a static module.

The last 6 patches address bug #8723 (Add pthread-based aio module to 
3.6.3.).

commit c738f0ea9e1c2356eab1dac778ceb94f22036f0a
Author: Jeremy Allison 
Date:   Wed Jan 25 17:17:48 2012 -0800

Update man page to fix typo vfs_aio_fork -> vfs_aio_pthread, add aio read 
size, aio write size examples. (cherry picked from commit 
12b614a9298974ba5daee7aa8d1aa47006de01e2)

commit 0ba64e6bc78404b2f75af638c22b52007159d96b
Author: Jeremy Allison 
Date:   Wed Jan 25 16:54:39 2012 -0800

Add vfs_aio_pthread code.

commit caa7ccae10f9be77cf28890aadff735ca83de93e
Author: Jeremy Allison 
Date:   Wed Jan 25 16:27:54 2012 -0800

Ensure we always free aio_ex on all error paths by moving the TALLOC_FREE 
call out of smbd_aio_complete_aio_ex() and into the caller.

commit 00d59a043dc4008f25cdf44dc233d181114dfa2d
Author: Jeremy Allison 
Date:   Wed Jan 25 14:11:12 2012 -0800

Add man page for vfs_aio_pthread module. (cherry picked from commit 
d8c699190d2cc0ce64395c7b2b10bb25c98a2943)

commit b30626720405c435ad48abf8e1445ee8f4b859a3
Author: Jeremy Allison 
Date:   Wed Dec 21 20:38:32 2011 -0800

Change the signature of pthreadpool_finished_job() to return 0 on success, 
errno on fail and return the jobid in a separate variable.

I need this fix for my vfs_aio_pthread.c module.

Autobuild-User: Jeremy Allison 
Autobuild-Date: Thu Dec 22 12:12:33 CET 2011 on sn-devel-104
(cherry picked from commit 711c18c2301d1bea35cac1144080a94e6b89be27)

---

Summary of changes:
 docs-xml/manpages-3/vfs_aio_pthread.8.xml |  120 ++
 source3/Makefile.in   |5 +
 source3/configure.in  |4 +
 source3/lib/fncall.c  |3 +-
 source3/lib/pthreadpool/pthreadpool.c |9 +-
 source3/lib/pthreadpool/pthreadpool.h |5 +-
 source3/lib/pthreadpool/tests.c   |   18 +-
 source3/modules/vfs_aio_fork.c|1 +
 source3/modules/vfs_aio_pthread.c |  625 +
 source3/smbd/aio.c|3 +-
 10 files changed, 775 insertions(+), 18 deletions(-)
 create mode 100644 docs-xml/manpages-3/vfs_aio_pthread.8.xml
 create mode 100644 source3/modules/vfs_aio_pthread.c


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages-3/vfs_aio_pthread.8.xml 
b/docs-xml/manpages-3/vfs_aio_pthread.8.xml
new file mode 100644
index 000..3e41ee9
--- /dev/null
+++ b/docs-xml/manpages-3/vfs_aio_pthread.8.xml
@@ -0,0 +1,120 @@
+
+http://www.samba.org/samba/DTD/samba-doc";>
+
+
+
+   vfs_aio_pthread
+   8
+   Samba
+   System Administration tools
+   3.6
+
+
+
+
+   vfs_aio_pthread
+   implement async I/O in Samba vfs using a pthread 
pool
+
+
+
+   
+   vfs objects = aio_pthread
+   
+
+
+
+   DESCRIPTION
+
+   This VFS module is part of the
+   samba
+   7 suite.
+
+   The aio_pthread VFS module enables asynchronous
+   I/O for Samba on platforms which have the pthreads API available,
+   without using the Posix AIO interface. Posix AIO can suffer from severe
+   limitations.  For example, on some Linux versions the
+   real-time signals that it uses are broken under heavy load.
+   Other systems only allow AIO when special kernel modules are
+   loaded or only allow a certain system-wide amount of async
+   requests being scheduled. Systems based on glibc (most Linux
+   systems) only allow a single outstanding request per file
+   descriptor which essentially makes Posix AIO useless on systems
+   using the glibc implementation.
+
+   To work around all these limitations, the aio_pthread module
+   was written. It uses a

[SCM] Samba Shared Repository - branch v3-6-test updated

2012-02-12 Thread Karolin Seeger 
The branch, v3-6-test has been updated
   via  5bfe963 s3:smb2_server: fix a logic error, we should sign non guest 
sessions
   via  ecb9978 s3:smb2-server: session setup replies should always be 
signed (except for guest sessions)
  from  9269f41 s3-popt: Fix configure.developer builds on Solaris.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -
commit 5bfe963d9279571b8392fabf0373b603014615eb
Author: Stefan Metzmacher 
Date:   Thu Sep 22 21:04:51 2011 +0200

s3:smb2_server: fix a logic error, we should sign non guest sessions

metze

The last 2 patches address bug #8749 (SMB2: SessionSetup responses are not
signed).

commit ecb99789acc1cd8a4caa6635291cf5f44fe39e7e
Author: Michael Adam 
Date:   Wed Sep 21 03:56:30 2011 +0200

s3:smb2-server: session setup replies should always be signed (except for 
guest sessions)

not only if the session should be signed

Signed-off-by: Stefan Metzmacher 

Autobuild-User: Stefan Metzmacher 
Autobuild-Date: Wed Sep 21 11:00:09 CEST 2011 on sn-devel-104

---

Summary of changes:
 source3/smbd/smb2_sesssetup.c |8 ++--
 1 files changed, 6 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c
index a081290..64a8053 100644
--- a/source3/smbd/smb2_sesssetup.c
+++ b/source3/smbd/smb2_sesssetup.c
@@ -187,6 +187,7 @@ static NTSTATUS smbd_smb2_session_setup_krb5(struct 
smbd_smb2_session *session,
fstring tmp;
bool username_was_mapped = false;
bool map_domainuser_to_guest = false;
+   bool guest = false;
 
if (!spnego_parse_krb5_wrap(talloc_tos(), *secblob, &ticket, tok_id)) {
status = NT_STATUS_LOGON_FAILURE;
@@ -263,6 +264,7 @@ static NTSTATUS smbd_smb2_session_setup_krb5(struct 
smbd_smb2_session *session,
*out_session_flags |= SMB2_SESSION_FLAG_IS_NULL;
/* force no signing */
session->do_signing = false;
+   guest = true;
}
 
data_blob_free(&session->session_info->user_session_key);
@@ -315,7 +317,7 @@ static NTSTATUS smbd_smb2_session_setup_krb5(struct 
smbd_smb2_session *session,
 * so that the response can be signed
 */
smb2req->session = session;
-   if (session->do_signing) {
+   if (!guest) {
smb2req->do_signing = true;
}
 
@@ -469,6 +471,7 @@ static NTSTATUS smbd_smb2_common_ntlmssp_auth_return(struct 
smbd_smb2_session *s
uint64_t *out_session_id)
 {
fstring tmp;
+   bool guest = false;
 
if ((in_security_mode & SMB2_NEGOTIATE_SIGNING_REQUIRED) ||
lp_server_signing() == Required) {
@@ -481,6 +484,7 @@ static NTSTATUS smbd_smb2_common_ntlmssp_auth_return(struct 
smbd_smb2_session *s
*out_session_flags |= SMB2_SESSION_FLAG_IS_NULL;
/* force no signing */
session->do_signing = false;
+   guest = true;
}
 
session->session_key = session->session_info->user_session_key;
@@ -528,7 +532,7 @@ static NTSTATUS smbd_smb2_common_ntlmssp_auth_return(struct 
smbd_smb2_session *s
 * so that the response can be signed
 */
smb2req->session = session;
-   if (session->do_signing) {
+   if (!guest) {
smb2req->do_signing = true;
}
 


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-6-test updated

2012-02-12 Thread Karolin Seeger 
The branch, v3-6-test has been updated
   via  9269f41 s3-popt: Fix configure.developer builds on Solaris.
  from  9d5ed16 s3:winbindd fix a return code check

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -
commit 9269f41229368b2614880718e710fd461b28196f
Author: Ira Cooper 
Date:   Fri Feb 3 16:47:18 2012 -0800

s3-popt: Fix configure.developer builds on Solaris.

alloca.h needs to be included, or the build complains the implicit
definition of alloca.

Signed-off-by: Jeremy Allison 

Autobuild-User: Jeremy Allison 
Autobuild-Date: Sat Feb  4 03:27:42 CET 2012 on sn-devel-104
(cherry picked from commit 74ca6d1ddb1c5a4fbe9ddb29566878efe1761897)

Fix bug #8743 (configure.developer build is broken).

---

Summary of changes:
 lib/popt/system.h |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/popt/system.h b/lib/popt/system.h
index 1d1b9da..bbb4f6c 100644
--- a/lib/popt/system.h
+++ b/lib/popt/system.h
@@ -58,6 +58,8 @@ char *alloca ();
 # endif
 #elif defined(__GNUC__) && defined(__STRICT_ANSI__)
 #define alloca __builtin_alloca
+#elif defined(__GNUC__) && defined(HAVE_ALLOCA_H)
+# include 
 #endif
 
 /*@-redecl -redef@*/


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2012-02-12 Thread Jelmer Vernooij 
The branch, master has been updated
   via  2d66d16 wafsamba: Add tests for dict_concat.
   via  a0fb721 wafsamba: Add tests for unique_list, subst_vars_error.
   via  c3a9d1e waf: Add initial unit test for samba_utils.
  from  8de129d gitignore: Ignore waf cache files.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 2d66d16af09239d285d572b9e3749b0132b69f99
Author: Jelmer Vernooij 
Date:   Sun Feb 12 18:42:17 2012 +0100

wafsamba: Add tests for dict_concat.

Autobuild-User: Jelmer Vernooij 
Autobuild-Date: Sun Feb 12 20:17:54 CET 2012 on sn-devel-104

commit a0fb7211cde25748e76f615b8fd8254dec947e2c
Author: Jelmer Vernooij 
Date:   Sun Feb 12 17:48:01 2012 +0100

wafsamba: Add tests for unique_list, subst_vars_error.

commit c3a9d1eb15100f3b46bcb9f67303c5729f6fa4ff
Author: Jelmer Vernooij 
Date:   Sun Feb 12 17:35:20 2012 +0100

waf: Add initial unit test for samba_utils.

---

Summary of changes:
 {source3/build => buildtools/wafsamba}/__init__.py |0
 buildtools/wafsamba/samba_utils.py |3 +-
 buildtools/wafsamba/tests/__init__.py  |   33 +
 buildtools/wafsamba/tests/test_utils.py|   76 
 source4/selftest/tests.py  |1 +
 5 files changed, 111 insertions(+), 2 deletions(-)
 copy {source3/build => buildtools/wafsamba}/__init__.py (100%)
 create mode 100644 buildtools/wafsamba/tests/__init__.py
 create mode 100644 buildtools/wafsamba/tests/test_utils.py


Changeset truncated at 500 lines:

diff --git a/source3/build/__init__.py b/buildtools/wafsamba/__init__.py
similarity index 100%
copy from source3/build/__init__.py
copy to buildtools/wafsamba/__init__.py
diff --git a/buildtools/wafsamba/samba_utils.py 
b/buildtools/wafsamba/samba_utils.py
index 71cfbc5..519b77b 100644
--- a/buildtools/wafsamba/samba_utils.py
+++ b/buildtools/wafsamba/samba_utils.py
@@ -233,8 +233,7 @@ def subst_vars_error(string, env):
 if re.match('\$\{\w+\}', v):
 vname = v[2:-1]
 if not vname in env:
-Logs.error("Failed to find variable %s in %s" % (vname, 
string))
-sys.exit(1)
+raise KeyError("Failed to find variable %s in %s" % (vname, 
string))
 v = env[vname]
 out.append(v)
 return ''.join(out)
diff --git a/buildtools/wafsamba/tests/__init__.py 
b/buildtools/wafsamba/tests/__init__.py
new file mode 100644
index 000..7678880
--- /dev/null
+++ b/buildtools/wafsamba/tests/__init__.py
@@ -0,0 +1,33 @@
+# Copyright (C) 2012 Jelmer Vernooij 
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+"""Tests for wafsamba."""
+
+from unittest import (
+TestCase,
+TestLoader,
+)
+
+def test_suite():
+names = [
+'utils',
+]
+module_names = ['wafsamba.tests.test_' + name for name in names]
+loader = TestLoader()
+result = loader.suiteClass()
+suite = loader.loadTestsFromNames(module_names)
+result.addTests(suite)
+return result
diff --git a/buildtools/wafsamba/tests/test_utils.py 
b/buildtools/wafsamba/tests/test_utils.py
new file mode 100644
index 000..a9578e2
--- /dev/null
+++ b/buildtools/wafsamba/tests/test_utils.py
@@ -0,0 +1,76 @@
+# Copyright (C) 2012 Jelmer Vernooij 
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+from wafsamba.tests import TestCase
+
+from wafsamba.samba_utils import (
+TO_LIST,
+dict_concat,
+subst_

[SCM] Samba Shared Repository - branch master updated

2012-02-12 Thread Jelmer Vernooij 
The branch, master has been updated
   via  8de129d gitignore: Ignore waf cache files.
  from  567f05e mkversion: Add quotes around various version strings

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 8de129df100b3dce7490c2aa730a737d6c5ec4c8
Author: Jelmer Vernooij 
Date:   Sun Feb 12 14:38:37 2012 +0100

gitignore: Ignore waf cache files.

Autobuild-User: Jelmer Vernooij 
Autobuild-Date: Sun Feb 12 16:14:49 CET 2012 on sn-devel-104

---

Summary of changes:
 .gitignore |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/.gitignore b/.gitignore
index e21ea90..09a5ee4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -138,3 +138,5 @@ docs-xml/Samba3-HOWTO/images/pdftoepsonusb.png
 docs-xml/Samba3-HOWTO/images/pdftosocket.png
 docs-xml/Samba3-HOWTO/images/trusts1.png
 .testrepository
+bin/.confcache/*/*
+bin/.conf_check_*/*


-- 
Samba Shared Repository

[SCM] Samba Website Repository - branch master updated

2012-02-12 Thread Lars Müller 
The branch, master has been updated
   via  7a4f50b Replace no longer existing sfconservancy web host
  from  71f8606 Remove 3smil as the web page is dead + no answer

http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master


- Log -
commit 7a4f50b367ab8f8f392b8eed753dd802ff5026fb
Author: Lars Müller 
Date:   Sun Feb 12 15:54:01 2012 +0100

Replace no longer existing sfconservancy web host

http://conservancy.softwarefreedom.org/ isn't known by DNS.
http://www.sfconservancy.org/ is the current location.

---

Summary of changes:
 generated_news/latest_1_bodies.html |2 +-
 index.html  |2 +-
 latest_news.html|2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/generated_news/latest_1_bodies.html 
b/generated_news/latest_1_bodies.html
index 668a7d8..714c9cc 100644
--- a/generated_news/latest_1_bodies.html
+++ b/generated_news/latest_1_bodies.html
@@ -2868,7 +2868,7 @@ in Washington D.C.
 
 
 This is the first donation of its type for Samba since the project
-joined the http://conservancy.softwarefreedom.org/";>Software
+joined the http://www.sfconservancy.org/";>Software
 Freedom Conservancy.  Membership of the SFC makes
  accepting donations like this considerably easier for the team.
 
diff --git a/index.html b/index.html
index ba57a89..eeef19c 100644
--- a/index.html
+++ b/index.html
@@ -12,7 +12,7 @@
 
Samba is http://www.gnu.org/philosophy/free-sw.html"; 
target="_blank">Free Software licensed under
the GNU General Public License, the 
Samba project is a member
-   of the http://conservancy.softwarefreedom.org/"; 
target="_blank">Software Freedom Conservancy.
+   of the http://www.sfconservancy.org/"; target="_blank">Software 
Freedom Conservancy.
 
 
Since 1992, Samba has provided 
secure, stable and fast
diff --git a/latest_news.html b/latest_news.html
index cc23d63..963dfe5 100755
--- a/latest_news.html
+++ b/latest_news.html
@@ -8,7 +8,7 @@
 Samba is http://www.gnu.org/philosophy/free-sw.html";>Free
 Software licensed under the GNU
 General Public License, the Samba project is a member of the
-  http://conservancy.softwarefreedom.org/";>Software Freedom
+  http://www.sfconservancy.org/";>Software Freedom
 Conservancy.
 
 Since 1992, Samba has


-- 
Samba Website Repository