[SCM] NSS Wrapper Repository - branch master updated

2015-12-17 Thread Michael Adam 
The branch, master has been updated
   via  03018f8 Bump version to 1.1.2
   via  a93a07d tests: Add reload test for the hosts file
   via  6406714 nwrap: Fix segfaults while reloading hosts file
  from  581a412 tests: Add the same alias again

https://git.samba.org/?p=nss_wrapper.git;a=shortlog;h=master


- Log -
commit 03018f8b035cd2b627298cf47290f2563f821e76
Author: Andreas Schneider 
Date:   Thu Dec 17 09:00:30 2015 +0100

Bump version to 1.1.2

Signed-off-by: Andreas Schneider 
Reviewed-by: Michael Adam 

commit a93a07d5e122b50dcec2e8fe7dbee022e5d5d301
Author: Andreas Schneider 
Date:   Thu Dec 17 08:56:05 2015 +0100

tests: Add reload test for the hosts file

With this valgrind should show issues if the hash table is not
recreated.

Signed-off-by: Andreas Schneider 
Reviewed-by: Michael Adam 

commit 64067145b4e013d4223bf17011984988bddbe43e
Author: Andreas Schneider 
Date:   Thu Dec 17 08:46:33 2015 +0100

nwrap: Fix segfaults while reloading hosts file

Signed-off-by: Andreas Schneider 
Reviewed-by: Michael Adam 

---

Summary of changes:
 CMakeLists.txt   |  4 ++--
 ChangeLog|  5 +
 src/nss_wrapper.c| 13 
 tests/test_getaddrinfo.c | 51 
 4 files changed, 71 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a1ed061..8b352cb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ set(APPLICATION_NAME ${PROJECT_NAME})
 
 set(APPLICATION_VERSION_MAJOR "1")
 set(APPLICATION_VERSION_MINOR "1")
-set(APPLICATION_VERSION_PATCH "1")
+set(APPLICATION_VERSION_PATCH "2")
 
 set(APPLICATION_VERSION 
"${APPLICATION_VERSION_MAJOR}.${APPLICATION_VERSION_MINOR}.${APPLICATION_VERSION_PATCH}")
 
@@ -19,7 +19,7 @@ set(APPLICATION_VERSION 
"${APPLICATION_VERSION_MAJOR}.${APPLICATION_VERSION_MINO
 # Increment AGE. Set REVISION to 0
 #   If the source code was changed, but there were no interface changes:
 # Increment REVISION.
-set(LIBRARY_VERSION "0.2.1")
+set(LIBRARY_VERSION "0.2.2")
 set(LIBRARY_SOVERSION "0")
 
 # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is 
checked
diff --git a/ChangeLog b/ChangeLog
index 139d4fa..8d55fc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 ChangeLog
 ==
 
+version 1.1.2 (released 2015-12-17)
+  * Fixed segfault while reloading hosts file
+  * Fixed issue where are not fault tolerant if an alias has already
+been added
+
 version 1.1.1 (released 2015-11-23)
   * Fixed nss_wrapper build on Solaris
 
diff --git a/src/nss_wrapper.c b/src/nss_wrapper.c
index f48b9cc..c4f1b33 100644
--- a/src/nss_wrapper.c
+++ b/src/nss_wrapper.c
@@ -2890,6 +2890,7 @@ static void nwrap_he_unload(struct nwrap_cache *nwrap)
struct nwrap_entdata *ed;
struct nwrap_entlist *el;
size_t i;
+   int rc;
 
nwrap_vector_foreach (ed, nwrap_he->entries, i)
{
@@ -2915,6 +2916,18 @@ static void nwrap_he_unload(struct nwrap_cache *nwrap)
 
nwrap_he->num = 0;
nwrap_he->idx = 0;
+
+   /*
+* If we unload the file, the pointers in the hash table point to
+* invalid memory. So we need to destroy the hash table and recreate
+* it.
+*/
+   hdestroy();
+   rc = hcreate(max_hostents);
+   if (rc == 0) {
+   NWRAP_LOG(NWRAP_LOG_ERROR, "Failed to initialize hash table");
+   exit(-1);
+   }
 }
 
 
diff --git a/tests/test_getaddrinfo.c b/tests/test_getaddrinfo.c
index b200275..438ea12 100644
--- a/tests/test_getaddrinfo.c
+++ b/tests/test_getaddrinfo.c
@@ -5,8 +5,10 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -83,6 +85,54 @@ static void test_nwrap_getaddrinfo(void **state)
freeaddrinfo(res);
 }
 
+/*
+ * The purpose of this test is to verify that reloading of the hosts
+ * file (triggered by a timestamp change) correctly frees and re-creates
+ * the internal data structures, so we do not end up using invalid memory.
+ */
+static void test_nwrap_getaddrinfo_reload(void **state)
+{
+   struct addrinfo hints;
+   struct addrinfo *res = NULL;
+   const char *env;
+   char touch_cmd[1024];
+   int rc;
+
+   (void) state; /* unused */
+
+   /* IPv4 */
+   memset(, 0, sizeof(struct addrinfo));
+   hints.ai_family = AF_UNSPEC;/* Allow IPv4 or IPv6 */
+   hints.ai_socktype = SOCK_DGRAM; /* Datagram socket */
+   hints.ai_flags = AI_PASSIVE;/* For wildcard IP address */
+   hints.ai_protocol = 0;  /* Any protocol

[SCM] NSS Wrapper Repository - annotated tag nss_wrapper-1.1.2 created

2015-12-17 Thread Andreas Schneider 
The annotated tag, nss_wrapper-1.1.2 has been created
at  a9cdbf40da31e5448f7f7f57267712496e227d0d (tag)
   tagging  03018f8b035cd2b627298cf47290f2563f821e76 (commit)
  replaces  nss_wrapper-1.1.1
 tagged by  Andreas Schneider
on  Thu Dec 17 09:15:28 2015 +0100

- Log -
nss_wrapper-1.1.2
-BEGIN PGP SIGNATURE-
Version: GnuPG v2

iQIcBAABCgAGBQJWcm8lAAoJEH7g/E3MAU49hykP/0yoP8Sx5IEmklFcjPNYQ6LR
g83PpZlS6CpnJKkzfLBQ3pTQUeE2gMhtNbXjShbDra+pX1WSR6dGyqbNjKuJbjXl
bRAjzOc5atiNH+VN7+gQhg6C/mg+d+C7yROWA8Re3+zuRiVPrGbu+R++2gS85q1b
o1Z7+BITgjwEbkEU2lXcHtTH8zpTrh9rhKzRbAlB87p5GcGxxR6M/Wju+8g303A3
vey8ax93nXCINx6IIIoJQlT6T+Vc6cjxRxxUTQdJGWC0m+XF8L9QjZA527InI33j
Iaonm2lBrOdSjkF7/5hPMSujcaxe5CZIxcYmzQaOBR4VioK331o4PUnSMWix5Jdy
CAQX9e/h9VQSgmOdWZSXagU7BIpza2RRANdMbZptelDJyZXfSPeQnJezkC5eIDNv
UAZR5SVM+f1QSfd1FRmj6zngdVbL4bp9iA4hx6X3mMhmS8XRF6W5gxoMcuzYSTX1
i1a8TP4P2q8QZU67tfC315erXZRY5B3XMccNYGZhlM4uncoF0U3vZvs1wL6lYFzx
4rJNJImIyfiAmWCTMTkg4bCf6U/lpdjYlUk82IoKN1Okfd2XNzW40LplhcehutwX
cRVB26uRF046cAvzrXiU7vLEsliZTZR1+JwSxMVvyGiFdIir152VzF5cK9PhVHiM
vO+mrfg7zCwh/si5pKun
=yAoY
-END PGP SIGNATURE-

Andreas Schneider (5):
  nwrap: Don't fail if we want to add an existing entry
  tests: Add the same alias again
  nwrap: Fix segfaults while reloading hosts file
  tests: Add reload test for the hosts file
  Bump version to 1.1.2

---


-- 
NSS Wrapper Repository

[SCM] Samba Shared Repository - branch v4-3-test updated

2015-12-17 Thread Karolin Seeger 
The branch, v4-3-test has been updated
   via  a7fa3a6 smbd: make "hide dot files" option work with "store dos 
attributes = yes"
   via  76edbf5 lib/async_req: do not install async_connect_send_test.
   via  795c543 lib/param: add a fixed unified 
lpcfg_string_{free,set,set_upper}() infrastructure
   via  b8ecf97 samba-tool: fsmo.py throws an uncaught exception if no
   via  95ed8b7 s4:torture:vfs_fruit: add a test for POSIX rename
   via  685ad2d vfs_fruit: enable POSIX directory rename semantics
   via  dfbf293 vfs_fruit: add a flag that tracks whether use of AAPL was 
negotiated
   via  02968ec s3:smbd: file_struct: seperate POSIX directory rename cap 
from POSIX open
   via  db3d0c6 s3:smbd: convert file_struct.posix_open to a bitmap with 
flags
  from  420f38f VERSION: Bump version up to 4.3.4...

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-3-test


- Log -
commit a7fa3a6db563e0e160843090f72bfd6a40f27303
Author: Ralph Boehme 
Date:   Tue Dec 15 13:13:02 2015 +0100

smbd: make "hide dot files" option work with "store dos attributes = yes"

When using "store dos attributes = yes", the function that reads the
attributes from the xattr get_ea_dos_attribute() will overwrite the
attribute previously set for "hide dot files".

According to smb.conf, "store dos attributes = yes" should only
overwrite the "map XXX" options, but not "hide dot files".

Bug: https://bugzilla.samba.org/show_bug.cgi?id=11645

Signed-off-by: Ralph Boehme 
Reviewed-by: Jeremy Allison 

Autobuild-User(master): Jeremy Allison 
Autobuild-Date(master): Wed Dec 16 07:21:10 CET 2015 on sn-devel-104

(cherry picked from commit 2058ce246ea5008202e737f64fbdd9b586b2d7d4)

Autobuild-User(v4-3-test): Karolin Seeger 
Autobuild-Date(v4-3-test): Thu Dec 17 14:08:21 CET 2015 on sn-devel-104

commit 76edbf52b1e7a56014e546abfa588f3ee40e2574
Author: Günther Deschner 
Date:   Tue Dec 1 14:39:37 2015 +0100

lib/async_req: do not install async_connect_send_test.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11639

Guenther

Signed-off-by: Günther Deschner 
Reviewed-by: Ralph Boehme 
(cherry picked from commit 632114584d3be0d4660e97a6c9e69e577a7bc1e2)

commit 795c543d858b2452f062a02846c2f908fe4cffe4
Author: Jeremy Allison 
Date:   Mon Dec 7 16:01:17 2015 -0800

lib/param: add a fixed unified lpcfg_string_{free,set,set_upper}() 
infrastructure

This reduces the memory footprint of empty string options.

smbd -d1 -i with 1400 shares in smb.conf under x64 valgrind massif before 
this
patch has 7,703,392 bytes peak memory consumption and after this patch
3,321,200 bytes.

This fixes a regression introduced by commit
2dd7c890792cf12049ec13b88aa4e9de23035f9d.

BUG:

Bug: https://bugzilla.samba.org/show_bug.cgi?id=11625

Back-port of commit a84eed532549c1dbad43f963838bc5f13c4fe68d
from master.

Signed-off-by: Stefan Metzmacher 
Reviewed-by: Volker Lendecke 
Reviewed-by: Jeremy Allison 

commit b8ecf97b1f3d67fd6124ef51202d792734024c8b
Author: Rowland Penny 
Date:   Mon Nov 23 18:40:19 2015 +

samba-tool: fsmo.py throws an uncaught exception if no

fSMORoleOwner attribute

This will fix bug 11613 where a user got the uncaught exception when trying
to seize an FSMO role that didn't have the required attribute.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11613

Signed-off-by: Rowland Penny 
Reviewed-by: Jeremy Allison 
Reviewed-by: Uri Simchoni 

Autobuild-User(master): Uri Simchoni 
Autobuild-Date(master): Sun Dec  6 00:33:10 CET 2015 on sn-devel-104

(cherry picked from commit 4735e5f5e35bdff88bf59d56ecf1980cdabc3c83)

commit 95ed8b75eda7ad120d64e6e9554ef2a69d8b8491
Author: Ralph Boehme 
Date:   Sat Nov 28 19:26:47 2015 +0100

s4:torture:vfs_fruit: add a test for POSIX rename

Bug: https://bugzilla.samba.org/show_bug.cgi?id=11065

Signed-off-by: Ralph Boehme 
(cherry picked from commit 0f0693d0fa5fa991bb573525f332eba5ceb6ece6)

commit 685ad2d373d679c054ab4dd976c80fbc4d377638
Author: Ralph Boehme 
Date:   Thu Jan 22 10:07:56 2015 +0100

vfs_fruit: enable POSIX directory rename semantics

Bug: https://bugzilla.samba.org/show_bug.cgi?id=11065

Signed-off-by: Ralph Boehme 
Reviewed-by: Jeremy Allison 
(cherry picked from commit

[SCM] Samba Shared Repository - branch master updated

2015-12-17 Thread Stefan Metzmacher 
The branch, master has been updated
   via  55d8bfc s3:libsmb: remove unused spnego related includes
   via  fbcc309 s3:smbd: remove unused spnego related includes
  from  e242d72 selftest: Ensure that if the SAMBA_PID is not set, that the 
env is not OK

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


- Log -
commit 55d8bfca9b08d62587eb00deebf7fe4d165451cd
Author: Stefan Metzmacher 
Date:   Wed Dec 9 12:25:46 2015 +0100

s3:libsmb: remove unused spnego related includes

Signed-off-by: Stefan Metzmacher 
Reviewed-by: Günther Deschner 

Autobuild-User(master): Stefan Metzmacher 
Autobuild-Date(master): Thu Dec 17 17:49:14 CET 2015 on sn-devel-144

commit fbcc30931caedaa8363c0dc62502c7c54f83c902
Author: Stefan Metzmacher 
Date:   Wed Dec 9 12:25:46 2015 +0100

s3:smbd: remove unused spnego related includes

Signed-off-by: Stefan Metzmacher 
Reviewed-by: Günther Deschner 

---

Summary of changes:
 source3/libsmb/clifsinfo.c | 2 --
 source3/smbd/negprot.c | 1 -
 source3/smbd/seal.c| 2 --
 source3/smbd/sesssetup.c   | 5 -
 4 files changed, 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/clifsinfo.c b/source3/libsmb/clifsinfo.c
index 907d1d2..6d5a86c 100644
--- a/source3/libsmb/clifsinfo.c
+++ b/source3/libsmb/clifsinfo.c
@@ -21,8 +21,6 @@
 
 #include "includes.h"
 #include "libsmb/libsmb.h"
-#include "../libcli/auth/spnego.h"
-#include "../auth/ntlmssp/ntlmssp.h"
 #include "../lib/util/tevent_ntstatus.h"
 #include "async_smb.h"
 #include "../libcli/smb/smb_seal.h"
diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c
index fe942c1..83baeb1 100644
--- a/source3/smbd/negprot.c
+++ b/source3/smbd/negprot.c
@@ -21,7 +21,6 @@
 #include "includes.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
-#include "../libcli/auth/spnego.h"
 #include "serverid.h"
 #include "auth.h"
 #include "messages.h"
diff --git a/source3/smbd/seal.c b/source3/smbd/seal.c
index e088d74..d2c8951 100644
--- a/source3/smbd/seal.c
+++ b/source3/smbd/seal.c
@@ -20,9 +20,7 @@
 #include "includes.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
-#include "../libcli/auth/spnego.h"
 #include "../libcli/smb/smb_seal.h"
-#include "../lib/util/asn1.h"
 #include "auth.h"
 #include "libsmb/libsmb.h"
 #include "../lib/tsocket/tsocket.h"
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index 6c31958..fbc4013 100644
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -26,11 +26,6 @@
 #include "../lib/tsocket/tsocket.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
-#include "../libcli/auth/spnego.h"
-#include "../auth/ntlmssp/ntlmssp.h"
-#include "../librpc/gen_ndr/krb5pac.h"
-#include "libads/kerberos_proto.h"
-#include "../lib/util/asn1.h"
 #include "auth.h"
 #include "messages.h"
 #include "smbprofile.h"


-- 
Samba Shared Repository

autobuild[sn-devel-144]: intermittent test failure detected

2015-12-17 Thread autobuild 
The autobuild test system (on sn-devel-144) has detected an intermittent 
failing test in 
the current master tree.

The autobuild log of the failure is available here:

   http://git.samba.org/autobuild.flakey.sn-devel-144/2015-12-17-1807/flakey.log

The samba build logs are available here:

   
http://git.samba.org/autobuild.flakey.sn-devel-144/2015-12-17-1807/samba.stderr
   
http://git.samba.org/autobuild.flakey.sn-devel-144/2015-12-17-1807/samba.stdout
  
The top commit at the time of the failure was:

commit e242d7264e50b1f13b95497d9cb759205931e7a2
Author: Andrew Bartlett 
Date:   Mon Dec 7 13:32:25 2015 +1300

selftest: Ensure that if the SAMBA_PID is not set, that the env is not OK

This ensures that we must instead start the selftest environment, it is not 
already running

Signed-off-by: Andrew Bartlett 
Reviewed-by: Garming Sam 

Autobuild-User(master): Andrew Bartlett 
Autobuild-Date(master): Thu Dec 17 06:27:14 CET 2015 on sn-devel-104

autobuild[sn-devel-144]: intermittent test failure detected

2015-12-17 Thread autobuild 
The autobuild test system (on sn-devel-144) has detected an intermittent 
failing test in 
the current master tree.

The autobuild log of the failure is available here:

   http://git.samba.org/autobuild.flakey.sn-devel-144/2015-12-17-2143/flakey.log

The samba build logs are available here:

   
http://git.samba.org/autobuild.flakey.sn-devel-144/2015-12-17-2143/samba.stderr
   
http://git.samba.org/autobuild.flakey.sn-devel-144/2015-12-17-2143/samba.stdout
  
The top commit at the time of the failure was:

commit 55d8bfca9b08d62587eb00deebf7fe4d165451cd
Author: Stefan Metzmacher 
Date:   Wed Dec 9 12:25:46 2015 +0100

s3:libsmb: remove unused spnego related includes

Signed-off-by: Stefan Metzmacher 
Reviewed-by: Günther Deschner 

Autobuild-User(master): Stefan Metzmacher 
Autobuild-Date(master): Thu Dec 17 17:49:14 CET 2015 on sn-devel-144

[SCM] Samba Shared Repository - branch master updated

2015-12-17 Thread Ira Cooper 
The branch, master has been updated
   via  f27ba17 vfs_glusterfs: Fix a memory leak in AIO
  from  55d8bfc s3:libsmb: remove unused spnego related includes

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


- Log -
commit f27ba17fcf1cf6a8559ef7d77c08efe648fd49e5
Author: Jose A. Rivera 
Date:   Thu Dec 17 08:19:22 2015 -0600

vfs_glusterfs: Fix a memory leak in AIO

Signed-off-by: Jose A. Rivera 
Reviewed-by: Ira Cooper 

Autobuild-User(master): Ira Cooper 
Autobuild-Date(master): Thu Dec 17 20:55:22 CET 2015 on sn-devel-144

---

Summary of changes:
 source3/modules/vfs_glusterfs.c | 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_glusterfs.c b/source3/modules/vfs_glusterfs.c
index e0cf719..f32f598 100644
--- a/source3/modules/vfs_glusterfs.c
+++ b/source3/modules/vfs_glusterfs.c
@@ -577,18 +577,14 @@ static void aio_tevent_fd_done(struct tevent_context 
*event_ctx,
DEBUG(0,("\nRead from pipe failed (%s)", strerror(errno)));
}
 
-   if (state->cancelled) {
-   return;
-   }
-
-   req = state->req;
-
/* if we've cancelled the op, there is no req, so just clean up. */
if (state->cancelled == true) {
TALLOC_FREE(state);
return;
}
 
+   req = state->req;
+
if (req) {
tevent_req_done(req);
}


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2015-12-17 Thread Jeremy Allison 
The branch, master has been updated
   via  dbd87b9 tdb: Refuse to load a database with hash size 0
   via  bffcc17 libads: Remove "foreign" from ads_struct
  from  bf1fa9e negoex.idl: use DATA_BLOB for negoex_BYTE_VECTOR

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


- Log -
commit dbd87b94aafcae214053116321497941bacc7cad
Author: Andrew Bartlett 
Date:   Mon Nov 9 14:10:11 2015 +1300

tdb: Refuse to load a database with hash size 0

This just ensures we reject (rather than div-by-0) a corrupt
DB with a zero hash size.

Found with american fuzzy lop

Signed-off-by: Andrew Bartlett 
Reviewed-by: Jeremy Allison 

Autobuild-User(master): Jeremy Allison 
Autobuild-Date(master): Fri Dec 18 08:26:25 CET 2015 on sn-devel-144

commit bffcc175676657064c44f37f90fe95d3675276fc
Author: Volker Lendecke 
Date:   Wed Dec 16 21:44:50 2015 +0100

libads: Remove "foreign" from ads_struct

AFAICS this was never actually used

Signed-off-by: Volker Lendecke 
Reviewed-by: Jeremy Allison 

---

Summary of changes:
 lib/tdb/common/open.c   | 7 +++
 source3/include/ads.h   | 2 --
 source3/libads/ads_struct.c | 8 
 source3/libads/ndr.c| 1 -
 4 files changed, 7 insertions(+), 11 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/tdb/common/open.c b/lib/tdb/common/open.c
index 3b53fa7..f3ef856 100644
--- a/lib/tdb/common/open.c
+++ b/lib/tdb/common/open.c
@@ -593,6 +593,13 @@ _PUBLIC_ struct tdb_context *tdb_open_ex(const char *name, 
int hash_size, int td
errno = ENOSYS;
goto fail;
}
+
+   if (header.hash_size == 0) {
+   TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_open_ex: invalid database: 
0 hash_size\n"));
+   errno = ENOSYS;
+   goto fail;
+   }
+
tdb->hash_size = header.hash_size;
 
if (header.rwlocks == TDB_FEATURE_FLAG_MAGIC) {
diff --git a/source3/include/ads.h b/source3/include/ads.h
index daea56d..cacb25c 100644
--- a/source3/include/ads.h
+++ b/source3/include/ads.h
@@ -32,8 +32,6 @@ typedef struct ads_struct {
char *realm;
char *workgroup;
char *ldap_server;
-   int foreign; /* set to 1 if connecting to a foreign
- * realm */
bool gc; /* Is this a global catalog server? */
} server;
 
diff --git a/source3/libads/ads_struct.c b/source3/libads/ads_struct.c
index 30d433e..27af4d6 100644
--- a/source3/libads/ads_struct.c
+++ b/source3/libads/ads_struct.c
@@ -144,14 +144,6 @@ ADS_STRUCT *ads_init(const char *realm,
ads->server.workgroup = workgroup ? SMB_STRDUP(workgroup) : NULL;
ads->server.ldap_server = ldap_server? SMB_STRDUP(ldap_server) : NULL;
 
-   /* we need to know if this is a foreign realm */
-   if (realm && *realm && !strequal(lp_realm(), realm)) {
-   ads->server.foreign = 1;
-   }
-   if (workgroup && *workgroup && !strequal(lp_workgroup(), workgroup)) {
-   ads->server.foreign = 1;
-   }
-
/* the caller will own the memory by default */
ads->is_mine = 1;
 
diff --git a/source3/libads/ndr.c b/source3/libads/ndr.c
index fd0b63e..eb48437 100644
--- a/source3/libads/ndr.c
+++ b/source3/libads/ndr.c
@@ -50,7 +50,6 @@ void ndr_print_ads_struct(struct ndr_print *ndr, const char 
*name, const struct
ndr_print_string(ndr, "realm", r->server.realm);
ndr_print_string(ndr, "workgroup", r->server.workgroup);
ndr_print_string(ndr, "ldap_server", r->server.ldap_server);
-   ndr_print_bool(ndr, "foreign", r->server.foreign);
ndr->depth--;
ndr_print_struct(ndr, name, "auth");
ndr->depth++;


-- 
Samba Shared Repository

[SCM] Samba Website Repository - branch master updated

2015-12-17 Thread Karolin Seeger 
The branch, master has been updated
   via  2c2b849 Add missing .html to the announcement links.
  from  4cbb77f Fix links to 4.2.6/4.1.21 diffs to 4.2.7/4.1.22

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


- Log -
commit 2c2b849491fec8a010c069202e6a7695856ab5eb
Author: Karolin Seeger 
Date:   Fri Dec 18 08:50:56 2015 +0100

Add missing .html to the announcement links.

Signed-off-by: Karolin Seeger 

---

Summary of changes:
 history/security.html | 48 
 1 file changed, 24 insertions(+), 24 deletions(-)


Changeset truncated at 500 lines:

diff --git a/history/security.html b/history/security.html
index 794dbf2..17252df 100755
--- a/history/security.html
+++ b/history/security.html
@@ -80,7 +80,7 @@ link to full release notes for each release.
4.0.0 - 4.1.15
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-8143;>CVE-2014-8143

-   Announcement
+   Announcement

 
 
@@ -95,7 +95,7 @@ link to full release notes for each release.
4.0.0 - 4.1.10
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-3560;>CVE-2014-3560

-   Announcement
+   Announcement

 
 
@@ -113,8 +113,8 @@ link to full release notes for each release.
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-0244;>CVE-2014-0244,
 
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-3493;>CVE-2014-3493

-   Announcement
-   Announcement
+   Announcement
+   Announcement

 
 
@@ -132,8 +132,8 @@ link to full release notes for each release.
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-0178;>CVE-2014-0178,
 
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-0239;>CVE-2014-0239

-   Announcement
-   Announcement
+   Announcement
+   Announcement

 
 
@@ -152,8 +152,8 @@ link to full release notes for each release.
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-4496;>CVE-2013-4496,
 
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-6442;>CVE-2013-6442

-   Announcement
-   Announcement
+   Announcement
+   Announcement

 
 
@@ -175,8 +175,8 @@ link to full release notes for each release.
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-4408;>CVE-2013-4408,
 
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-6150;>CVE-2012-6150

-   Announcement
-   Announcement
+   Announcement
+   Announcement

 
 
@@ -194,8 +194,8 @@ link to full release notes for each release.
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-4475;>CVE-2013-4475,
 
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-4476;>CVE-2013-4476

-   Announcement
-   Announcement
+   Announcement
+   Announcement

 
 
@@ -212,7 +212,7 @@ link to full release notes for each release.
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-4124;>CVE-2013-4124

-   Announcement
+   Announcement

 
 
@@ -224,7 +224,7 @@ link to full release notes for each release.
3.6.0 - 3.6.5 (inclusive)
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-0454;>CVE-2013-0454

-   Announcement
+   Announcement

 
 
@@ -237,7 +237,7 @@ link to full release notes for each release.
4.0.0rc6-4.0.3
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-1863;>CVE-2013-1863

-   Announcement
+   Announcement

 
 
@@ -254,8 +254,8 @@ link to full release notes for each release.
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-0213;>CVE-2013-0213,
 
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-0214;>CVE-2013-0214

-   Announcement
-   Announcement
+   Announcement
+   Announcement

 
 
@@ -267,7 +267,7 @@ link to full release notes for each release.
access to LDAP directory objects.
4.0.0
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-0172;>CVE-2013-0172
-   Announcement
+   Announcement
 
 
 
@@ -282,7 +282,7 @@ link to full release notes for each release.
compromise file server security.
3.4.x-3.6.4
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-2111;>CVE-2012-2111
-   Announcement
+   Announcement
 
 
 
@@ -302,7 +302,7 @@ link to full release notes for each release.
"root" credential remote code execution
all current releases

[SCM] Samba Shared Repository - branch master updated

2015-12-17 Thread Volker Lendecke 
The branch, master has been updated
   via  d7feb18 s3: libsmb: Correctly initialize the list head when keeping 
a list of primary followed by DFS connections.
  from  f27ba17 vfs_glusterfs: Fix a memory leak in AIO

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


- Log -
commit d7feb1879ee711598540049c2c5eccc80fd6f1e5
Author: Jeremy Allison 
Date:   Wed Dec 16 11:04:20 2015 -0800

s3: libsmb: Correctly initialize the list head when keeping a list of 
primary followed by DFS connections.

Greatly helped by  to
track down this issue.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11624

Signed-off-by: Jeremy Allison 
Reviewed-by: Volker Lendecke 

Autobuild-User(master): Volker Lendecke 
Autobuild-Date(master): Fri Dec 18 01:02:55 CET 2015 on sn-devel-144

---

Summary of changes:
 source3/libsmb/libsmb_server.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c
index 2abd37e..06c0211 100644
--- a/source3/libsmb/libsmb_server.c
+++ b/source3/libsmb/libsmb_server.c
@@ -620,7 +620,7 @@ SMBC_server_internal(TALLOC_CTX *ctx,
}
 
ZERO_STRUCTP(srv);
-   srv->cli = c;
+   DLIST_ADD(srv->cli, c);
srv->dev = (dev_t)(str_checksum(server) ^ str_checksum(share));
 srv->no_pathinfo = False;
 srv->no_pathinfo2 = False;
@@ -816,7 +816,7 @@ SMBC_attr_server(TALLOC_CTX *ctx,
 }
 
 ZERO_STRUCTP(ipc_srv);
-ipc_srv->cli = ipc_cli;
+DLIST_ADD(ipc_srv->cli, ipc_cli);
 
 nt_status = cli_rpc_pipe_open_noauth(
ipc_srv->cli, _table_lsarpc, _hnd);


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2015-12-17 Thread Stefan Metzmacher 
The branch, master has been updated
   via  bf1fa9e negoex.idl: use DATA_BLOB for negoex_BYTE_VECTOR
   via  a4fa489 negoex.idl: initial version
  from  d7feb18 s3: libsmb: Correctly initialize the list head when keeping 
a list of primary followed by DFS connections.

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


- Log -
commit bf1fa9e080c48ce02d2a83b1095854485d00d5f0
Author: Stefan Metzmacher 
Date:   Mon Dec 7 09:31:03 2015 +0100

negoex.idl: use DATA_BLOB for negoex_BYTE_VECTOR

That's much easier for the callers.

Signed-off-by: Stefan Metzmacher 
Reviewed-by: Günther Deschner 

Autobuild-User(master): Stefan Metzmacher 
Autobuild-Date(master): Fri Dec 18 04:07:56 CET 2015 on sn-devel-144

commit a4fa4897058e32c81e3c1cac3cb321757a967ebc
Author: Stefan Metzmacher 
Date:   Mon Dec 7 09:30:47 2015 +0100

negoex.idl: initial version

Signed-off-by: Stefan Metzmacher 
Reviewed-by: Günther Deschner 

---

Summary of changes:
 librpc/idl/negoex.idl| 156 ++
 librpc/idl/wscript_build |   2 +-
 librpc/ndr/ndr_negoex.c  | 520 +++
 librpc/ndr/ndr_negoex.h  |  37 
 librpc/wscript_build |   7 +-
 5 files changed, 720 insertions(+), 2 deletions(-)
 create mode 100644 librpc/idl/negoex.idl
 create mode 100644 librpc/ndr/ndr_negoex.c
 create mode 100644 librpc/ndr/ndr_negoex.h


Changeset truncated at 500 lines:

diff --git a/librpc/idl/negoex.idl b/librpc/idl/negoex.idl
new file mode 100644
index 000..e2f8222
--- /dev/null
+++ b/librpc/idl/negoex.idl
@@ -0,0 +1,156 @@
+#include "idl_types.h"
+
+/*
+  NEGOEX interface definition
+  See http://ietfreport.isoc.org/all-ids/draft-zhu-negoex-04.txt
+*/
+
+import "misc.idl";
+
+[
+   uuid("fcc30ddc-98d0-11e5-8a56-83e9a6706f2f"),
+   helper("../librpc/ndr/ndr_negoex.h"),
+   helpstring("NEGOEX messages")
+]
+interface negoex
+{
+   typedef [nopush,nopull,noprint] struct {
+#if 0
+   [relative,size_is(length)] uint8 *data;
+   uint32 length;
+#else
+   DATA_BLOB blob;
+   /*
+* internal helper variable */
+   uint32 _length;
+   /*
+* the dummy pointer is needed in order to let the
+* callers use NDR_BUFFERS
+*/
+   [relative] uint8 *_dummy;
+#endif
+   } negoex_BYTE_VECTOR;
+
+   typedef [public] struct {
+   GUID guid;
+   } negoex_AUTH_SCHEME;
+
+   typedef [nopush,nopull] struct {
+   [relative,size_is(count)] negoex_AUTH_SCHEME *array;
+   uint32 count;
+   } negoex_AUTH_SCHEME_VECTOR;
+
+   typedef [v1_enum] enum {
+   NEGOEX_EXTENSION_TYPE_TODO = 0 /* TODO */
+   } negoex_ExtensionTypes;
+
+   typedef [public] struct {
+   negoex_ExtensionTypes type;
+   negoex_BYTE_VECTOR value;
+   } negoex_EXTENSION;
+
+   typedef [nopush,nopull] struct {
+   [relative,size_is(count)] negoex_EXTENSION *array;
+   uint32 count;
+   } negoex_EXTENSION_VECTOR;
+
+   typedef [v1_enum] enum {
+   NEGOEX_CHECKSUM_SCHEME_RFC3961 = 1
+   } negoex_ChecksumSchemes;
+
+   typedef struct {
+   [value(20)] uint32 header_length;
+   negoex_ChecksumSchemes scheme;
+   uint32 type;
+   negoex_BYTE_VECTOR value;
+   } negoex_CHECKSUM;
+
+   typedef [v1_enum] enum {
+   NEGOEX_ALERT_VERIFY_NO_KEY = 1
+   } negoex_AlertReason;
+
+   typedef [public] struct {
+   [value(4)] uint32 header_length; /* TODO: is 4 correct? */
+   negoex_AlertReason reason;
+   } negoex_ALERT_PULSE;
+
+   typedef [v1_enum] enum {
+   NEGOEX_ALERT_TYPE_PULSE = 1
+   } negoex_AlertTypes;
+
+   typedef [public] struct {
+   negoex_AlertTypes type;
+   negoex_BYTE_VECTOR value;
+   } negoex_ALERT;
+
+   typedef [nopush,nopull] struct {
+   [relative,size_is(count)] negoex_ALERT *array;
+   uint32 count;
+   } negoex_ALERT_VECTOR;
+
+   typedef [public,v1_enum] enum {
+   NEGOEX_MESSAGE_TYPE_INITIATOR_NEGO = 0,
+   NEGOEX_MESSAGE_TYPE_ACCEPTOR_NEGO = 1,
+   NEGOEX_MESSAGE_TYPE_INITIATOR_META_DATA = 2,
+   NEGOEX_MESSAGE_TYPE_ACCEPTOR_META_DATA = 3,
+   NEGOEX_MESSAGE_TYPE_CHALLENGE = 4,
+   NEGOEX_MESSAGE_TYPE_AP_REQUEST = 5,
+   NEGOEX_MESSAGE_TYPE_VERIFY = 6,
+   NEGOEX_MESSAGE_TYPE_ALERT = 7
+   } negoex_MESSAGE_TYPE;
+
+

autobuild[sn-devel-144]: intermittent test failure detected

2015-12-17 Thread autobuild 
The autobuild test system (on sn-devel-144) has detected an intermittent 
failing test in 
the current master tree.

The autobuild log of the failure is available here:

   http://git.samba.org/autobuild.flakey.sn-devel-144/2015-12-18-0408/flakey.log

The samba build logs are available here:

   
http://git.samba.org/autobuild.flakey.sn-devel-144/2015-12-18-0408/samba.stderr
   
http://git.samba.org/autobuild.flakey.sn-devel-144/2015-12-18-0408/samba.stdout
  
The top commit at the time of the failure was:

commit d7feb1879ee711598540049c2c5eccc80fd6f1e5
Author: Jeremy Allison 
Date:   Wed Dec 16 11:04:20 2015 -0800

s3: libsmb: Correctly initialize the list head when keeping a list of 
primary followed by DFS connections.

Greatly helped by  to
track down this issue.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11624

Signed-off-by: Jeremy Allison 
Reviewed-by: Volker Lendecke 

Autobuild-User(master): Volker Lendecke 
Autobuild-Date(master): Fri Dec 18 01:02:55 CET 2015 on sn-devel-144

autobuild[sn-devel-104]: intermittent test failure detected

2015-12-17 Thread autobuild 
The autobuild test system (on sn-devel-104) has detected an intermittent 
failing test in 
the current master tree.

The autobuild log of the failure is available here:

   http://git.samba.org/autobuild.flakey.sn-devel-104/2015-12-17-1216/flakey.log

The samba build logs are available here:

   
http://git.samba.org/autobuild.flakey.sn-devel-104/2015-12-17-1216/samba.stderr
   
http://git.samba.org/autobuild.flakey.sn-devel-104/2015-12-17-1216/samba.stdout
  
The top commit at the time of the failure was:

commit e242d7264e50b1f13b95497d9cb759205931e7a2
Author: Andrew Bartlett 
Date:   Mon Dec 7 13:32:25 2015 +1300

selftest: Ensure that if the SAMBA_PID is not set, that the env is not OK

This ensures that we must instead start the selftest environment, it is not 
already running

Signed-off-by: Andrew Bartlett 
Reviewed-by: Garming Sam 

Autobuild-User(master): Andrew Bartlett 
Autobuild-Date(master): Thu Dec 17 06:27:14 CET 2015 on sn-devel-104

autobuild[sn-devel-144]: intermittent test failure detected

2015-12-17 Thread autobuild 
The autobuild test system (on sn-devel-144) has detected an intermittent 
failing test in 
the current master tree.

The autobuild log of the failure is available here:

   http://git.samba.org/autobuild.flakey.sn-devel-144/2015-12-17-1216/flakey.log

The samba build logs are available here:

   
http://git.samba.org/autobuild.flakey.sn-devel-144/2015-12-17-1216/samba.stderr
   
http://git.samba.org/autobuild.flakey.sn-devel-144/2015-12-17-1216/samba.stdout
  
The top commit at the time of the failure was:

commit e242d7264e50b1f13b95497d9cb759205931e7a2
Author: Andrew Bartlett 
Date:   Mon Dec 7 13:32:25 2015 +1300

selftest: Ensure that if the SAMBA_PID is not set, that the env is not OK

This ensures that we must instead start the selftest environment, it is not 
already running

Signed-off-by: Andrew Bartlett 
Reviewed-by: Garming Sam 

Autobuild-User(master): Andrew Bartlett 
Autobuild-Date(master): Thu Dec 17 06:27:14 CET 2015 on sn-devel-104

autobuild[sn-devel-104]: intermittent test failure detected

2015-12-17 Thread autobuild 
The autobuild test system (on sn-devel-104) has detected an intermittent 
failing test in 
the current master tree.

The autobuild log of the failure is available here:

   http://git.samba.org/autobuild.flakey.sn-devel-104/2015-12-17-2146/flakey.log

The samba build logs are available here:

   
http://git.samba.org/autobuild.flakey.sn-devel-104/2015-12-17-2146/samba.stderr
   
http://git.samba.org/autobuild.flakey.sn-devel-104/2015-12-17-2146/samba.stdout
  
The top commit at the time of the failure was:

commit 55d8bfca9b08d62587eb00deebf7fe4d165451cd
Author: Stefan Metzmacher 
Date:   Wed Dec 9 12:25:46 2015 +0100

s3:libsmb: remove unused spnego related includes

Signed-off-by: Stefan Metzmacher 
Reviewed-by: Günther Deschner 

Autobuild-User(master): Stefan Metzmacher 
Autobuild-Date(master): Thu Dec 17 17:49:14 CET 2015 on sn-devel-144