[SCM] Samba Shared Repository - branch master updated

2011-06-06 Thread Andrew Bartlett 
The branch, master has been updated
   via  b9108ca s3-s4-param: Add hooks for parametric options in the s3/s4 
glue layer
   via  d72b05c s3-passdb use new loadparm_init_s3 rather than reloading 
the smb.conf
   via  907cdb5 s4-modules Remove lp_ctx from init functions that no longer 
need it
   via  f67a149 s4-param Remove 'modules dir'
   via  de46ad9 lib/util use modules_path(), data_path() and shlib_ext() 
from source3
   via  876b1b3 s3-lib Remove unused lib_path()
   via  1dfc6fa s4-param Add hook between Samba3 and Samba4 loadparm 
systems.
   via  521687b s4-param make lpcfg_sam_name() cope with PDC and BDC roles
   via  698538e s3-param always allow the realm parameter
   via  a18efb1 s4-param Remove 'sid generator'
   via  834d590 s4-param Remove 'idmap database'
   via  1565da7 s4-param Remove 'secrets database' parameter
   via  c091a92 s4-param Remove 'sam database' parameter
   via  6bf8822 libcli/util Remove prototype for ntstatus_dos_equal()
  from  d168a5e s4-ipv6: fill in family when initialising from sockaddr

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


- Log -
commit b9108cac529dac4b4b392fab4bac4fd0e6da1b4b
Author: Andrew Bartlett abart...@samba.org
Date:   Mon Jun 6 16:47:32 2011 +1000

s3-s4-param: Add hooks for parametric options in the s3/s4 glue layer

Autobuild-User: Andrew Bartlett abart...@samba.org
Autobuild-Date: Mon Jun  6 10:48:53 CEST 2011 on sn-devel-104

commit d72b05cfe7d5c020fa32c8906f6185e1427e0a88
Author: Andrew Bartlett abart...@samba.org
Date:   Mon Jun 6 11:16:19 2011 +1000

s3-passdb use new loadparm_init_s3 rather than reloading the smb.conf

commit 907cdb5de7f16a2540299aeba211bf2a5ae6fafe
Author: Andrew Bartlett abart...@samba.org
Date:   Mon Jun 6 14:58:28 2011 +1000

s4-modules Remove lp_ctx from init functions that no longer need it

Now that we don't allow the smb.conf to change the modules dir, many
functions that simply load modules or initialise a subsytem that may
load modules no longer need an lp_ctx.

Andrew Bartlett

commit f67a14976bd6ccdacd319df872e6add994f0e0f3
Author: Andrew Bartlett abart...@samba.org
Date:   Mon Jun 6 14:39:19 2011 +1000

s4-param Remove 'modules dir'

The Samba waf build ensures that dyn_MODULESDIR is always correct
(even for in-tree binaries), so we don't need to allow the user to
configure this at run time.

Andrew Bartlett

commit de46ad9084aff4384f33660acf91da3b81554a88
Author: Andrew Bartlett abart...@samba.org
Date:   Mon Jun 6 14:37:06 2011 +1000

lib/util use modules_path(), data_path() and shlib_ext() from source3

This brings these helpful utility functions in common, as they are not
based on either loadparm system.

(The 'modules dir' parameter from Samba4 will shortly be removed, so
there is no loss in functionality)

Andrew Bartlett

commit 876b1b3d198e2306c36423bfb1449870c74181fd
Author: Andrew Bartlett abart...@samba.org
Date:   Mon Jun 6 14:22:12 2011 +1000

s3-lib Remove unused lib_path()

commit 1dfc6fa558e7735341a7095aa46e5568a4f56cfe
Author: Andrew Bartlett abart...@samba.org
Date:   Wed Jun 1 23:22:24 2011 +1000

s4-param Add hook between Samba3 and Samba4 loadparm systems.

In the top level build, this allows calls to code that requires a
lpcfg_ style loadparm_context, while using the global parameters
loaded from the source3 loadparm code.

Andrew Bartlett

commit 521687be0d4bcd6326417696fabdce6506824b99
Author: Andrew Bartlett abart...@samba.org
Date:   Mon Jun 6 11:38:04 2011 +1000

s4-param make lpcfg_sam_name() cope with PDC and BDC roles

These roles (ROLE_DOMAIN_CONTROLLER is ROLE_DOMAIN_BDC) will come in
from the s3 loadparm.

Andrew Bartlett

commit 698538e594f65dd7ae2bd3854371ae914328b536
Author: Andrew Bartlett abart...@samba.org
Date:   Mon Jun 6 10:56:19 2011 +1000

s3-param always allow the realm parameter

commit a18efb1490cebd92205973c50ce1582b091a7676
Author: Andrew Bartlett abart...@samba.org
Date:   Thu Jun 2 18:56:10 2011 +1000

s4-param Remove 'sid generator'

This was only used by the Fedora DS backend for Samba4.  We agreed to
no longer support external LDAP backends.

Andrew Bartlett

commit 834d590bcff79e2d458b9e193be0c64e849a6362
Author: Andrew Bartlett abart...@samba.org
Date:   Thu Jun 2 15:49:36 2011 +1000

s4-param Remove 'idmap database'

This is now just idmap.ldb in the private dir, which remains.

commit 1565da76947f91add10a54096cdfe2ab67917b32
Author: Andrew Bartlett abart...@samba.org
Date:   Thu Jun 2 15:47:44 2011 +1000

s4-param Remove 'secrets database' parameter

This is now just secrets.ldb in the private dir, which remains.

commit c091a92be51e8c14bf0b51ab83319fbcb704c91f
Author: Andrew Bartlett

[SCM] Samba Shared Repository - branch master updated

2011-06-06 Thread Björn Jacke 
The branch, master has been updated
   via  81e48df s4/server: simplify and replace bad portable gettimeofday 
by time
   via  4778d35 s3/pthreadpool: replace bad portable gettimeofday by 
clock_gettime
  from  b9108ca s3-s4-param: Add hooks for parametric options in the s3/s4 
glue layer

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


- Log -
commit 81e48dfa35e1b4df6cf46df74572a2ace81c1b84
Author: Björn Jacke b...@sernet.de
Date:   Sun Jun 5 21:32:11 2011 +0200

s4/server: simplify and replace bad portable gettimeofday by time

Signed-off-by: Stefan Metzmacher me...@samba.org

Autobuild-User: Björn Jacke b...@sernet.de
Autobuild-Date: Mon Jun  6 12:58:26 CEST 2011 on sn-devel-104

commit 4778d35c34031f7724379ac2d3b554af4adc48dc
Author: Björn Jacke b...@sernet.de
Date:   Sun Jun 5 21:30:16 2011 +0200

s3/pthreadpool: replace bad portable gettimeofday by clock_gettime

Signed-off-by: Stefan Metzmacher me...@samba.org

---

Summary of changes:
 source3/lib/pthreadpool/pthreadpool.c |6 ++
 source4/smbd/server.c |   17 ++---
 2 files changed, 4 insertions(+), 19 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/pthreadpool/pthreadpool.c 
b/source3/lib/pthreadpool/pthreadpool.c
index 7538fb7..9981ed2 100644
--- a/source3/lib/pthreadpool/pthreadpool.c
+++ b/source3/lib/pthreadpool/pthreadpool.c
@@ -427,7 +427,6 @@ static void *pthreadpool_server(void *arg)
}
 
while (1) {
-   struct timeval tv;
struct timespec ts;
struct pthreadpool_job *job;
 
@@ -436,9 +435,8 @@ static void *pthreadpool_server(void *arg)
 * time, exit this thread.
 */
 
-   gettimeofday(tv, NULL);
-   ts.tv_sec = tv.tv_sec + 1;
-   ts.tv_nsec = tv.tv_usec*1000;
+   clock_gettime(CLOCK_REALTIME, ts);
+   ts.tv_sec += 1;
 
while ((pool-jobs == NULL)  (pool-shutdown == 0)) {
 
diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index 53dc20d..6acccd1 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -178,13 +178,7 @@ _NORETURN_ static void max_runtime_handler(struct 
tevent_context *ev,
   struct timeval t, void *private_data)
 {
const char *binary_name = (const char *)private_data;
-   struct timeval tv;
-   struct timezone tz;
-   if (gettimeofday(tv, tz) == 0) {
-   DEBUG(0,(%s: maximum runtime exceeded - terminating, current 
ts: %d\n, binary_name, (int)tv.tv_sec));
-   } else {
-   DEBUG(0,(%s: maximum runtime exceeded - terminating\n, 
binary_name));
-   }
+   DEBUG(0,(%s: maximum runtime exceeded - terminating, current ts: 
%d\n, binary_name, time(NULL)));
exit(0);
 }
 
@@ -444,14 +438,7 @@ static int binary_smbd_main(const char *binary_name, int 
argc, const char *argv[
  discard_const(binary_name));
 
if (max_runtime) {
-   struct timeval tv;
-   struct timezone tz;
-
-   if (gettimeofday(tv, tz) == 0) {
-   DEBUG(0,(Called with maxruntime %d - current ts %d\n, 
max_runtime, (int)tv.tv_sec));
-   } else {
-   DEBUG(0,(Called with maxruntime %d\n, max_runtime));
-   }
+   DEBUG(0,(Called with maxruntime %d - current ts %d\n, 
max_runtime, time(NULL)));
tevent_add_timer(event_ctx, event_ctx,
 timeval_current_ofs(max_runtime, 0),
 max_runtime_handler,


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2011-06-06 Thread Volker Lendecke 
The branch, master has been updated
   via  411c52a s3: Fix two debug messages
  from  81e48df s4/server: simplify and replace bad portable gettimeofday 
by time

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


- Log -
commit 411c52aba33a01afc5a2824183f5ebdaa144ab49
Author: Volker Lendecke v...@samba.org
Date:   Mon Jun 6 12:41:26 2011 +0200

s3: Fix two debug messages

Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Mon Jun  6 14:11:06 CEST 2011 on sn-devel-104

---

Summary of changes:
 source3/lib/messages.c |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/messages.c b/source3/lib/messages.c
index 7b2b8c1..932d478 100644
--- a/source3/lib/messages.c
+++ b/source3/lib/messages.c
@@ -205,7 +205,7 @@ struct messaging_context *messaging_init(TALLOC_CTX 
*mem_ctx,
status = messaging_ctdbd_init(ctx, ctx, ctx-remote);
 
if (!NT_STATUS_IS_OK(status)) {
-   DEBUG(2, (messaging_ctdb_init failed: %s\n,
+   DEBUG(2, (messaging_ctdbd_init failed: %s\n,
  nt_errstr(status)));
TALLOC_FREE(ctx);
return NULL;
@@ -257,7 +257,7 @@ NTSTATUS messaging_reinit(struct messaging_context *msg_ctx,
  msg_ctx-remote);
 
if (!NT_STATUS_IS_OK(status)) {
-   DEBUG(1, (messaging_ctdb_init failed: %s\n,
+   DEBUG(1, (messaging_ctdbd_init failed: %s\n,
  nt_errstr(status)));
return status;
}


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2011-06-06 Thread Volker Lendecke 
The branch, master has been updated
   via  976a43c s3: Remove a pointless if-statement
  from  411c52a s3: Fix two debug messages

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


- Log -
commit 976a43c5aac7a1b972efc1a4f600013b789eabaa
Author: Volker Lendecke v...@samba.org
Date:   Mon Jun 6 17:03:06 2011 +0200

s3: Remove a pointless if-statement

We are here only if we have more than one num_pending

Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Mon Jun  6 18:21:17 CEST 2011 on sn-devel-104

---

Summary of changes:
 source3/libsmb/async_smb.c |4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index 8fdcac4..2ce6410 100644
--- a/source3/libsmb/async_smb.c
+++ b/source3/libsmb/async_smb.c
@@ -180,9 +180,7 @@ void cli_smb_req_unset_pending(struct tevent_req *req)
/*
 * Remove ourselves from the cli-pending array
 */
-   if (num_pending  1) {
-   cli-pending[i] = cli-pending[num_pending-1];
-   }
+   cli-pending[i] = cli-pending[num_pending-1];
 
/*
 * No NULL check here, we're shrinking by sizeof(void *), and


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2011-06-06 Thread Jeremy Allison 
The branch, master has been updated
   via  0efcc94 Fix bug #8197 - winbind does not properly detect when a DC 
connection is dead.
  from  976a43c s3: Remove a pointless if-statement

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


- Log -
commit 0efcc94fb834aeb03e8edc3034aa0cdeefdc0985
Author: Jeremy Allison j...@samba.org
Date:   Fri Jun 3 10:22:44 2011 -0700

Fix bug #8197 - winbind does not properly detect when a DC connection is 
dead.

Only waiting for writability doesn't get fd errors back with poll.
So always begin by selecting for readability, and if we get it then
see if bytes were available to read or it really is an error condition.

If bytes were available, remove the select on read as we know we
will retrieve the error when we've finished writing and start
reading the reply (or the write will timeout or fail).

Metze and Volker please check.

Autobuild-User: Jeremy Allison j...@samba.org
Autobuild-Date: Mon Jun  6 21:53:16 CEST 2011 on sn-devel-104

---

Summary of changes:
 lib/async_req/async_sock.c |   38 --
 1 files changed, 32 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/async_req/async_sock.c b/lib/async_req/async_sock.c
index 86053d9..dfb1a1c 100644
--- a/lib/async_req/async_sock.c
+++ b/lib/async_req/async_sock.c
@@ -386,6 +386,7 @@ struct writev_state {
int count;
size_t total_size;
uint16_t flags;
+   bool err_on_readability;
 };
 
 static void writev_trigger(struct tevent_req *req, void *private_data);
@@ -413,10 +414,8 @@ struct tevent_req *writev_send(TALLOC_CTX *mem_ctx, struct 
tevent_context *ev,
if (state-iov == NULL) {
goto fail;
}
-   state-flags = TEVENT_FD_WRITE;
-   if (err_on_readability) {
-   state-flags |= TEVENT_FD_READ;
-   }
+   state-flags = TEVENT_FD_WRITE|TEVENT_FD_READ;
+   state-err_on_readability = err_on_readability;
 
if (queue == NULL) {
struct tevent_fd *fde;
@@ -462,8 +461,35 @@ static void writev_handler(struct tevent_context *ev, 
struct tevent_fd *fde,
to_write = 0;
 
if ((state-flags  TEVENT_FD_READ)  (flags  TEVENT_FD_READ)) {
-   tevent_req_error(req, EPIPE);
-   return;
+   int ret, value;
+
+   if (state-err_on_readability) {
+   /* Readable and the caller wants an error on read. */
+   tevent_req_error(req, EPIPE);
+   return;
+   }
+
+   /* Might be an error. Check if there are bytes to read */
+   ret = ioctl(state-fd, FIONREAD, value);
+   /* FIXME - should we also check
+  for ret == 0 and value == 0 here ? */
+   if (ret == -1) {
+   /* There's an error. */
+   tevent_req_error(req, EPIPE);
+   return;
+   }
+   /* A request for TEVENT_FD_READ will succeed from now and
+  forevermore until the bytes are read so if there was
+  an error we'll wait until we do read, then get it in
+  the read callback function. Until then, remove TEVENT_FD_READ
+  from the flags we're waiting for. */
+   state-flags = ~TEVENT_FD_READ;
+   TEVENT_FD_NOT_READABLE(fde);
+
+   /* If not writable, we're done. */
+   if (!(flags  TEVENT_FD_WRITE)) {
+   return;
+   }
}
 
for (i=0; istate-count; i++) {


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2011-06-06 Thread Andreas Schneider 
The branch, master has been updated
   via  8b02b78 s3-waf: Fix pthreadpool build which needs librt now.
  from  0efcc94 Fix bug #8197 - winbind does not properly detect when a DC 
connection is dead.

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


- Log -
commit 8b02b78044bd5baf1654ad6c2f4f28c5e9934c91
Author: Andreas Schneider a...@samba.org
Date:   Mon Jun 6 22:22:34 2011 +0200

s3-waf: Fix pthreadpool build which needs librt now.

Autobuild-User: Andreas Schneider a...@cryptomilk.org
Autobuild-Date: Mon Jun  6 23:31:09 CEST 2011 on sn-devel-104

---

Summary of changes:
 source3/lib/pthreadpool/wscript_build |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/pthreadpool/wscript_build 
b/source3/lib/pthreadpool/wscript_build
index 7679b58..611ff5a 100644
--- a/source3/lib/pthreadpool/wscript_build
+++ b/source3/lib/pthreadpool/wscript_build
@@ -2,7 +2,7 @@
 
 bld.SAMBA3_SUBSYSTEM('PTHREADPOOL',
  source='pthreadpool.c',
- deps='pthread',
+ deps='pthread rt',
  enabled=bld.env.WITH_PTHREADPOOL)
 
 bld.SAMBA3_BINARY('pthreadpooltest',


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2011-06-06 Thread Volker Lendecke 
The branch, master has been updated
   via  56eab75 s3: Remove unused variables
  from  8b02b78 s3-waf: Fix pthreadpool build which needs librt now.

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


- Log -
commit 56eab757d011f89553ac364d8aa4809ffbb6b500
Author: Volker Lendecke v...@samba.org
Date:   Mon Jun 6 22:31:33 2011 +0200

s3: Remove unused variables

Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Tue Jun  7 00:42:51 CEST 2011 on sn-devel-104

---

Summary of changes:
 source3/libsmb/namequery.c |2 --
 1 files changed, 0 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index 7bb8caf..2ad1071 100644
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -1750,8 +1750,6 @@ NTSTATUS name_resolve_bcast(const char *name,
 {
struct sockaddr_storage *bcast_addrs;
int i, num_addrs, num_bcast_addrs;
-   struct sockaddr_storage *ss_list;
-   NTSTATUS status = NT_STATUS_NOT_FOUND;
 
if (lp_disable_netbios()) {
DEBUG(5,(name_resolve_bcast(%s#%02x): netbios is disabled\n,


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2011-06-06 Thread Andrew Bartlett 
The branch, master has been updated
   via  776598a s3-docs Add documentation for ncalrpc dir
   via  a8d1d0c s3-auth Use loadparm_init_s3() to get an lp_ctx for 
auth_samba4
   via  5197331 s4-auth Move default auth methods back into auth.c
  from  56eab75 s3: Remove unused variables

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


- Log -
commit 776598a98103a20fc6a0bfafdebd105e448518ac
Author: Andrew Bartlett abart...@samba.org
Date:   Tue Jun 7 09:47:26 2011 +1000

s3-docs Add documentation for ncalrpc dir

Autobuild-User: Andrew Bartlett abart...@samba.org
Autobuild-Date: Tue Jun  7 02:57:33 CEST 2011 on sn-devel-104

commit a8d1d0c94cf1bcc60d68d0385d8f092271d0145c
Author: Andrew Bartlett abart...@samba.org
Date:   Tue Jun 7 09:09:16 2011 +1000

s3-auth Use loadparm_init_s3() to get an lp_ctx for auth_samba4

This avoids loading the smb.conf twice.

Andrew Bartlett

commit 5197331fe5af0a53e02e642c9e006b19ae92ba19
Author: Andrew Bartlett abart...@samba.org
Date:   Tue Jun 7 09:07:52 2011 +1000

s4-auth Move default auth methods back into auth.c

This changes auth_methods_from_lp to no longer use the parametric
options, and to cope with ROLE_DOMAIN_BDC and ROLE_DOMAIN_PDC.  This
will assist in calling the source4 auth subsystem with a source3
derived lp_ctx.

Andrew Bartlett

---

Summary of changes:
 docs-xml/smbdotconf/misc/ncalrpcdir.xml |   13 +
 source3/auth/auth_samba4.c  |   17 ++---
 source4/auth/ntlm/auth.c|   10 ++
 source4/param/loadparm.c|3 ---
 4 files changed, 21 insertions(+), 22 deletions(-)
 create mode 100644 docs-xml/smbdotconf/misc/ncalrpcdir.xml


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/misc/ncalrpcdir.xml 
b/docs-xml/smbdotconf/misc/ncalrpcdir.xml
new file mode 100644
index 000..b53acef
--- /dev/null
+++ b/docs-xml/smbdotconf/misc/ncalrpcdir.xml
@@ -0,0 +1,13 @@
+samba:parameter name=ncalrpc dir
+ context=G
+ advanced=1 developer=1
+type=string
+ xmlns:samba=http://www.samba.org/samba/DTD/samba-doc;
+description
+   paraThis directory will hold a series of named pipes to allow RPC 
over inter-process communication.  /para.  
+   paraThis will allow Samba and other unix processes to interact over 
DCE/RPC without using TCP/IP.  Additionally a sub-directory 'np' has restricted 
permissions, and allows a trusted communication channel between Samba 
processes/para
+/description
+
+value type=default${prefix}/var/ncalrpc/value
+value type=example/var/run/samba/ncalrpc/value
+/samba:parameter
diff --git a/source3/auth/auth_samba4.c b/source3/auth/auth_samba4.c
index 57c07dd..a4673db 100644
--- a/source3/auth/auth_samba4.c
+++ b/source3/auth/auth_samba4.c
@@ -42,22 +42,9 @@ static NTSTATUS check_samba4_security(const struct 
auth_context *auth_context,
struct loadparm_context *lp_ctx;
const char *config_file;
 
-   lp_ctx = loadparm_init(frame);
+   lp_ctx = loadparm_init_s3(frame, loadparm_s3_context());
if (lp_ctx == NULL) {
-   DEBUG(10, (loadparm_init failed\n));
-   talloc_free(frame);
-   return NT_STATUS_INVALID_SERVER_STATE;
-   }
-
-   if (lp_loaded()) {
-   config_file = lp_configfile();
-   }
-   if (!config_file || !config_file[0]) {
-   config_file = get_dyn_CONFIGFILE();
-   }
-
-   if (!lpcfg_load(lp_ctx, config_file)) {
-   DEBUG(1, (s4 lpcfg_load() of s3 config file %s failed, 
config_file));
+   DEBUG(10, (loadparm_init_s3 failed\n));
talloc_free(frame);
return NT_STATUS_INVALID_SERVER_STATE;
}
diff --git a/source4/auth/ntlm/auth.c b/source4/auth/ntlm/auth.c
index 72338ac..2308b15 100644
--- a/source4/auth/ntlm/auth.c
+++ b/source4/auth/ntlm/auth.c
@@ -488,15 +488,17 @@ _PUBLIC_ NTSTATUS auth_context_create_methods(TALLOC_CTX 
*mem_ctx, const char **
 const char **auth_methods_from_lp(TALLOC_CTX *mem_ctx, struct loadparm_context 
*lp_ctx)
 {
const char **auth_methods = NULL;
+
switch (lpcfg_server_role(lp_ctx)) {
case ROLE_STANDALONE:
-   auth_methods = lpcfg_parm_string_list(mem_ctx, lp_ctx, NULL, 
auth methods, standalone, NULL);
+   auth_methods = str_list_make(mem_ctx, anonymous 
sam_ignoredomain, NULL);
break;
case ROLE_DOMAIN_MEMBER:
-   auth_methods = lpcfg_parm_string_list(mem_ctx, lp_ctx, NULL, 
auth methods, member server, NULL);
+   auth_methods = str_list_make(mem_ctx, anonymous sam winbind, 
NULL);
break;
-   case ROLE_DOMAIN_CONTROLLER:
-

[SCM] Samba Shared Repository - branch master updated

2011-06-06 Thread Andrew Tridgell 
The branch, master has been updated
   via  8acbc3a s4-provision: fixed detection of V4/V6 addresses
   via  3ccb72d s4-ipv6: fixed iface_list_same_net() for IPv6
   via  64380ff s4-ipv6: fixed DNS handling with new IPv6 code
   via  5d7ba30 s4-dsdb: cope with missing backlinks in rpmd handling
   via  c6252c2 s4-netlogon: force an IPv4 address
   via  6a6d4d8 s4-ipv6: fix iface_list_best_ip() for IPv6
  from  776598a s3-docs Add documentation for ncalrpc dir

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


- Log -
commit 8acbc3a17435ef330910993aa40b5ec1e4c1dab2
Author: Andrew Tridgell tri...@samba.org
Date:   Tue Jun 7 12:55:31 2011 +1000

s4-provision: fixed detection of V4/V6 addresses

Autobuild-User: Andrew Tridgell tri...@samba.org
Autobuild-Date: Tue Jun  7 06:07:24 CEST 2011 on sn-devel-104

commit 3ccb72d7496aadbdf35b0aee3b2384466d9dd3b8
Author: Andrew Tridgell tri...@samba.org
Date:   Tue Jun 7 12:55:09 2011 +1000

s4-ipv6: fixed iface_list_same_net() for IPv6

commit 64380ff050c77b2b67c0fac4ada8650e834c4b4a
Author: Andrew Tridgell tri...@samba.org
Date:   Tue Jun 7 12:35:10 2011 +1000

s4-ipv6: fixed DNS handling with new IPv6 code

commit 5d7ba305490b5047b4d404353e95c217c8ef7d10
Author: Andrew Tridgell tri...@samba.org
Date:   Tue Jun 7 10:44:48 2011 +1000

s4-dsdb: cope with missing backlinks in rpmd handling

if backlinks have not propogated correctly in a previous replication
this allows us to recover

commit c6252c2e9d9c43496f1b5ecbf66099979096f66e
Author: Andrew Tridgell tri...@samba.org
Date:   Mon Jun 6 15:19:16 2011 +1000

s4-netlogon: force an IPv4 address

this interface is currently V4 only, don't try and return a V6 address
in a V4 structure

commit 6a6d4d8884788c1e860bda886d168301623e1ea3
Author: Andrew Tridgell tri...@samba.org
Date:   Mon Jun 6 15:18:12 2011 +1000

s4-ipv6: fix iface_list_best_ip() for IPv6

return an interface with the same address family as the target

---

Summary of changes:
 source4/cldap_server/netlogon.c|2 +-
 source4/dsdb/samdb/ldb_modules/repl_meta_data.c|   11 +-
 source4/lib/socket/interface.c |   42 ++--
 source4/libcli/resolve/dns_ex.c|   17 +++-
 .../scripting/python/samba/provision/__init__.py   |   31 +-
 5 files changed, 94 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/cldap_server/netlogon.c b/source4/cldap_server/netlogon.c
index e950d70..92f7a4a 100644
--- a/source4/cldap_server/netlogon.c
+++ b/source4/cldap_server/netlogon.c
@@ -300,7 +300,7 @@ NTSTATUS fill_netlogon_samlogon_response(struct ldb_context 
*sam_ctx,
if (src_address) {
pdc_ip = iface_list_best_ip(ifaces, src_address);
} else {
-   pdc_ip = iface_list_n_ip(ifaces, 0);
+   pdc_ip = iface_list_first_v4(ifaces);
}
ZERO_STRUCTP(netlogon);
 
diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c 
b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index 90933c4..04311a4 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -254,7 +254,16 @@ static int replmd_process_backlink(struct ldb_module 
*module, struct la_backlink
msg-elements[0].flags |= LDB_FLAG_INTERNAL_DISABLE_SINGLE_VALUE_CHECK;
 
ret = dsdb_module_modify(module, msg, DSDB_FLAG_NEXT_MODULE, parent);
-   if (ret != LDB_SUCCESS) {
+   if (ret == LDB_ERR_NO_SUCH_ATTRIBUTE  !bl-active) {
+   /* we allow LDB_ERR_NO_SUCH_ATTRIBUTE as success to
+  cope with possible corruption where the backlink has
+  already been removed */
+   DEBUG(0,(WARNING: backlink from %s already removed from %s - 
%s\n,
+ldb_dn_get_linearized(target_dn),
+ldb_dn_get_linearized(source_dn),
+ldb_errstring(ldb)));
+   ret = LDB_SUCCESS;
+   } else if (ret != LDB_SUCCESS) {
ldb_asprintf_errstring(ldb, Failed to %s backlink from %s to 
%s - %s,
   bl-active?add:remove,
   ldb_dn_get_linearized(source_dn),
diff --git a/source4/lib/socket/interface.c b/source4/lib/socket/interface.c
index 96cee2f..9cb8f5e 100644
--- a/source4/lib/socket/interface.c
+++ b/source4/lib/socket/interface.c
@@ -372,6 +372,23 @@ const char *iface_list_first_v4(struct interface *ifaces)
 }
 
 /**
+  return the first IPv6 interface address we have registered
+  **/
+static const char *iface_list_first_v6(struct interface *ifaces)
+{
+   struct interface *i;
+
+#ifdef HAVE_IPV6
+   for (i=ifaces; i; i=i-next)

[SCM] Samba Shared Repository - branch master updated

2011-06-06 Thread Andrew Bartlett 
The branch, master has been updated
   via  78a0195 selftest: Fix 'make quicktest' on systems without LDAP 
development support
  from  8acbc3a s4-provision: fixed detection of V4/V6 addresses

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


- Log -
commit 78a0195cdc0d6f18cc797f2af7d8ca261662979f
Author: Andrew Bartlett abart...@samba.org
Date:   Tue Jun 7 13:22:58 2011 +1000

selftest: Fix 'make quicktest' on systems without LDAP development support

This should ensure that we don't run the Samba3/Samba4 integration
tests on machines without ADS support.

(Some samba3 tests in the full 'make test' may still fail however)

Andrew Bartlett

Autobuild-User: Andrew Bartlett abart...@samba.org
Autobuild-Date: Tue Jun  7 07:17:32 CEST 2011 on sn-devel-104

---

Summary of changes:
 source4/selftest/tests.py |   23 +--
 1 files changed, 17 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 54c2b22..9aeeec4 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -61,11 +61,20 @@ print OPTIONS %s %  .join(torture_options)
 for options in ['-U$USERNAME%$PASSWORD --option=socket:testnonblock=true', 
'-U$USERNAME%$PASSWORD', '-U$USERNAME%$PASSWORD -k yes', 
'-U$USERNAME%$PASSWORD -k no', '-U$USERNAME%$PASSWORD -k no --sign', 
'-U$USERNAME%$PASSWORD -k no --encrypt', '-U$USERNAME%$PASSWORD -k yes 
--encrypt', '-U$USERNAME%$PASSWORD -k yes --sign']:
 plantestsuite(samba4.ldb.ldap with options %s(dc) % options, dc, 
%s/test_ldb.sh ldap $SERVER %s % (bbdir, options))
 
-# see if we support ldaps
+# see if we support ADS on the Samba3 side
 try:
 config_h = os.environ[CONFIG_H]
 except KeyError:
-config_h = os.path.join(samba4bindir, default/source4/include/config.h)
+config_h = os.path.join(samba4bindir, default/include/config.h)
+
+f = open(config_h, 'r')
+try:
+# The other parts of the HAVE_ADS test are always supplied by the top 
level build
+have_ads_support = (HAVE_LDAP 1 in f.read())
+finally:
+f.close()
+
+# see if we support ldaps
 f = open(config_h, 'r')
 try:
 have_tls_support = (ENABLE_GNUTLS 1 in f.read())
@@ -309,8 +318,9 @@ for mech in [
 -k yes]:
 signoptions = %s --signing=off % mech
 name = smb.signing disabled on with %s % signoptions
-for env in [ s4member, s3member ]:
-plantestsuite_loadlist(samba4.%s domain-creds % name, env, 
[valgrindify(smb4torture), $LISTOPT, '//$NETBIOSNAME/tmp', signoptions, 
'-U$DC_USERNAME%$DC_PASSWORD', 'base.xcopy'])
+plantestsuite_loadlist(samba4.%s domain-creds % name, s4member, 
[valgrindify(smb4torture), $LISTOPT, '//$NETBIOSNAME/tmp', signoptions, 
'-U$DC_USERNAME%$DC_PASSWORD', 'base.xcopy'])
+if have_ads_support:
+plantestsuite_loadlist(samba4.%s domain-creds % name, s3member, 
[valgrindify(smb4torture), $LISTOPT, '//$NETBIOSNAME/tmp', signoptions, 
'-U$DC_USERNAME%$DC_PASSWORD', 'base.xcopy'])
 
 for mech in [
 -k no,
@@ -319,8 +329,9 @@ for mech in [
 signoptions = %s --signing=off % mech
 name = smb.signing on with %s % signoptions
 plantestsuite_loadlist(samba4.%s local-creds % name, s4member, 
[valgrindify(smb4torture), $LISTOPT, '//$NETBIOSNAME/tmp', signoptions, 
'-U$NETBIOSNAME/$USERNAME%$PASSWORD', 'base.xcopy'])
-plantestsuite_loadlist(samba4.%s % name, plugin_s4_dc, 
[valgrindify(smb4torture), $LISTOPT, '//$NETBIOSNAME/tmp', signoptions, 
'-U$USERNAME%$PASSWORD', 'base.xcopy'])
-plantestsuite_loadlist(samba4.%s administrator % name, plugin_s4_dc, 
[valgrindify(smb4torture), $LISTOPT, '//$NETBIOSNAME/tmp', signoptions, 
'-U$DC_USERNAME%$DC_PASSWORD', 'base.xcopy'])
+if have_ads_support:
+plantestsuite_loadlist(samba4.%s % name, plugin_s4_dc, 
[valgrindify(smb4torture), $LISTOPT, '//$NETBIOSNAME/tmp', signoptions, 
'-U$USERNAME%$PASSWORD', 'base.xcopy'])
+plantestsuite_loadlist(samba4.%s administrator % name, 
plugin_s4_dc, [valgrindify(smb4torture), $LISTOPT, '//$NETBIOSNAME/tmp', 
signoptions, '-U$DC_USERNAME%$DC_PASSWORD', 'base.xcopy'])
 plantestsuite_loadlist(samba4.smb.signing --signing=yes anon, dc, 
[valgrindify(smb4torture), $LISTOPT, '//$NETBIOSNAME/tmp', '-k', 'no', 
'--signing=yes', '-U%', 'base.xcopy'])
 plantestsuite_loadlist(samba4.smb.signing --signing=required anon, dc, 
[valgrindify(smb4torture), $LISTOPT, '//$NETBIOSNAME/tmp', '-k', 'no', 
'--signing=required', '-U%', 'base.xcopy'])
 plantestsuite_loadlist(samba4.smb.signing --signing=no anon, s4member,  
[valgrindify(smb4torture), $LISTOPT, '//$NETBIOSNAME/tmp', '-k', 'no', 
'--signing=no', '-U%', 'base.xcopy'])


-- 
Samba Shared Repository