Build status as of Fri Sep 24 06:00:02 2010

2010-09-23 Thread build
URL: http://build.samba.org/

--- /home/build/master/cache/broken_results.txt.old 2010-09-23 
00:00:02.0 -0600
+++ /home/build/master/cache/broken_results.txt 2010-09-24 00:01:02.0 
-0600
@@ -1,4 +1,4 @@
-Build status as of Thu Sep 23 06:00:01 2010
+Build status as of Fri Sep 24 06:00:02 2010
 
 Build counts:
 Tree Total  Broken Panic 
@@ -13,10 +13,10 @@
 rsync32 13 0 
 samba-docs   0  0  0 
 samba-web0  0  0 
-samba_3_current 32 32 4 
-samba_3_master 32 29 0 
-samba_3_next 32 31 3 
-samba_4_0_waf 35 33 0 
+samba_3_current 32 30 0 
+samba_3_master 32 28 0 
+samba_3_next 32 31 2 
+samba_4_0_waf 35 30 0 
 talloc   32 6  0 
 tdb  30 8  0 
 


[SCM] Samba Shared Repository - branch master updated

2010-09-23 Thread Andrew Bartlett
The branch, master has been updated
   via  c9b19d9 s4-kerberos Rework keytab handling to export 
servicePrincipalName entries
  from  d8814b1 Fix bug 7694 - Crash bug with invalid SPNEGO token.

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


- Log -
commit c9b19d9b696d8528e59eade89695c60a40461ec9
Author: Andrew Bartlett 
Date:   Fri Sep 24 14:17:58 2010 +1000

s4-kerberos Rework keytab handling to export servicePrincipalName entries

This creates keytab entries with all the servicePrincipalNames listed
in the secrets.ldb entry.

Andrew Bartlett

---

Summary of changes:
 source4/auth/kerberos/kerberos.h   |6 +-
 source4/auth/kerberos/kerberos_util.c  |  284 +--
 source4/dsdb/samdb/ldb_modules/update_keytab.c |8 +-
 source4/setup/secrets_dns.ldif |2 +-
 4 files changed, 171 insertions(+), 129 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/auth/kerberos/kerberos.h b/source4/auth/kerberos/kerberos.h
index 091242d..94de096 100644
--- a/source4/auth/kerberos/kerberos.h
+++ b/source4/auth/kerberos/kerberos.h
@@ -147,10 +147,12 @@ struct ldb_context;
 uint32_t kerberos_enctype_to_bitmap(krb5_enctype enc_type_enum);
 /* Translate between the Microsoft msDS-SupportedEncryptionTypes values and 
the IETF encryption type values */
 krb5_enctype kerberos_enctype_bitmap_to_enctype(uint32_t enctype_bitmap);
-krb5_error_code smb_krb5_update_keytab(struct smb_krb5_context 
*smb_krb5_context,
+krb5_error_code smb_krb5_update_keytab(TALLOC_CTX *parent_ctx,
+  struct smb_krb5_context 
*smb_krb5_context,
   struct ldb_context *ldb, 
   struct ldb_message *msg,
-  bool delete_all_kvno);
+  bool delete_all_kvno,
+  const char **error_string);
 
 #include "auth/kerberos/proto.h"
 
diff --git a/source4/auth/kerberos/kerberos_util.c 
b/source4/auth/kerberos/kerberos_util.c
index dbe8c83..37a5ae6 100644
--- a/source4/auth/kerberos/kerberos_util.c
+++ b/source4/auth/kerberos/kerberos_util.c
@@ -33,6 +33,7 @@
 struct principal_container {
struct smb_krb5_context *smb_krb5_context;
krb5_principal principal;
+   const char *string_form; /* Optional */
 };
 
 static krb5_error_code free_principal(struct principal_container *pc)
@@ -79,29 +80,22 @@ static krb5_error_code parse_principal(TALLOC_CTX 
*parent_ctx,
return 0;
 }
 
-static krb5_error_code principal_from_msg(TALLOC_CTX *parent_ctx, 
- struct ldb_message *msg,
- struct smb_krb5_context 
*smb_krb5_context,
- krb5_principal *principal,
- char **_princ_string,
- const char **error_string)
+static krb5_error_code principals_from_msg(TALLOC_CTX *parent_ctx,
+  struct ldb_message *msg,
+  struct smb_krb5_context 
*smb_krb5_context,
+  struct principal_container 
***principals_out,
+  const char **error_string)
 {
+   unsigned int i;
krb5_error_code ret;
char *upper_realm;
-   const char *servicePrincipalName = ldb_msg_find_attr_as_string(msg, 
"servicePrincipalName", NULL);
const char *realm = ldb_msg_find_attr_as_string(msg, "realm", NULL);
const char *samAccountName = ldb_msg_find_attr_as_string(msg, 
"samAccountName", NULL);
-   struct principal_container *mem_ctx = talloc(parent_ctx, struct 
principal_container);
+   struct ldb_message_element *spn_el = ldb_msg_find_element(msg, 
"servicePrincipalName");
TALLOC_CTX *tmp_ctx;
-   char *princ_string;
-   if (!mem_ctx) {
-   *error_string = "Cannot allocate mem_ctx";
-   return ENOMEM;
-   }
-
-   tmp_ctx = talloc_new(mem_ctx);
+   struct principal_container **principals;
+   tmp_ctx = talloc_new(parent_ctx);
if (!tmp_ctx) {
-   talloc_free(mem_ctx);
*error_string = "Cannot allocate tmp_ctx";
return ENOMEM;
}
@@ -113,46 +107,80 @@ static krb5_error_code principal_from_msg(TALLOC_CTX 
*parent_ctx,
 
upper_realm = strupper_talloc(tmp_ctx, realm);
if (!upper_realm) {
-   talloc_free(mem_ctx);
+   talloc_free(tmp_ctx);
*error_string = "Cannot allocate full upper case realm";
return ENOMEM;
}
+
+   principals = talloc_array(tmp_ctx, struct 

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

2010-09-23 Thread Andrew Bartlett
The branch, v3-6-test has been updated
   via  9788a68 s3-krb5 Fix Kerberos on FreeBSD with Samba4 DCs
  from  e54527f Fix bug 7694 - Crash bug with invalid SPNEGO token.

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


- Log -
commit 9788a681adf405f10e6aa2a2af5e5424a4c840ac
Author: Andrew Bartlett 
Date:   Sat Sep 11 16:13:33 2010 +1000

s3-krb5 Fix Kerberos on FreeBSD with Samba4 DCs

The idea of this patch is: Don't support a mix of different kerberos
features.

Either we should prepare a GSSAPI (8003) checksum and mark the request as
such, or we should use the old behaviour (a normal kerberos checksum of 0 
data).

Sending the GSSAPI checksum data, but without marking it as GSSAPI broke
Samba4, and seems well outside the expected behaviour, even if Windows 
accepts it.

Andrew Bartlett

---

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


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c
index 344fdac..a572413 100644
--- a/source3/libsmb/clikrb5.c
+++ b/source3/libsmb/clikrb5.c
@@ -840,7 +840,7 @@ static krb5_error_code ads_krb5_mk_req(krb5_context context,
goto cleanup_creds;
}
 
-#if defined(TKT_FLG_OK_AS_DELEGATE ) && defined(HAVE_KRB5_FWD_TGT_CREDS) && 
defined(HAVE_KRB5_AUTH_CON_SETUSERUSERKEY) && 
defined(KRB5_AUTH_CONTEXT_USE_SUBKEY)
+#if defined(TKT_FLG_OK_AS_DELEGATE ) && defined(HAVE_KRB5_FWD_TGT_CREDS) && 
defined(HAVE_KRB5_AUTH_CON_SETUSERUSERKEY) && 
defined(KRB5_AUTH_CONTEXT_USE_SUBKEY) && 
defined(HAVE_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE)
if( credsp->ticket_flags & TKT_FLG_OK_AS_DELEGATE ) {
/* Fetch a forwarded TGT from the KDC so that we can hand off a 
2nd ticket
 as part of the kerberos exchange. */
@@ -902,7 +902,6 @@ static krb5_error_code ads_krb5_mk_req(krb5_context context,
gss_flags |= GSS_C_DELEG_FLAG;
}
}
-#endif
 
/* Frees and reallocates in_data into a GSS checksum blob. */
retval = create_gss_checksum(&in_data, gss_flags);
@@ -910,7 +909,6 @@ static krb5_error_code ads_krb5_mk_req(krb5_context context,
goto cleanup_data;
}
 
-#if defined(HAVE_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE)
/* We always want GSS-checksum types. */
retval = krb5_auth_con_set_req_cksumtype(context, *auth_context, 
GSSAPI_CHECKSUM );
if (retval) {


-- 
Samba Shared Repository


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

2010-09-23 Thread Jeremy Allison
The branch, v3-6-test has been updated
   via  e54527f Fix bug 7694 - Crash bug with invalid SPNEGO token.
  from  96ab093 s3: tdbdump does not use our libs (cherry picked via commit 
aea64ef275b6e94ca7afb8fa2bb172416773abdf and 
82c0e79b8d8c693c128e83d8062e1543f3bb311d)

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


- Log -
commit e54527f19f676eb8f604b1353cfb63c89d3a17d2
Author: Jeremy Allison 
Date:   Thu Sep 23 21:45:53 2010 -0700

Fix bug 7694 - Crash bug with invalid SPNEGO token.

Found by the CodeNomicon test suites at the SNIA plugfest.

http://www.codenomicon.com/

If an invalid SPNEGO packet contains no OIDs we crash in the SMB1/SMB2 
server
as we indirect the first returned value OIDs[0], which is returned as NULL.

Jeremy.

---

Summary of changes:
 source3/libads/sasl.c |3 ++-
 source3/libsmb/cliconnect.c   |3 ++-
 source3/rpc_server/srv_pipe.c |2 +-
 source3/smbd/sesssetup.c  |3 ++-
 4 files changed, 7 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libads/sasl.c b/source3/libads/sasl.c
index 051fc96..653d546 100644
--- a/source3/libads/sasl.c
+++ b/source3/libads/sasl.c
@@ -785,7 +785,8 @@ static ADS_STATUS ads_sasl_spnego_bind(ADS_STRUCT *ads)
 
/* the server sent us the first part of the SPNEGO exchange in the 
negprot 
   reply */
-   if (!spnego_parse_negTokenInit(talloc_tos(), blob, OIDs, 
&given_principal, NULL)) {
+   if (!spnego_parse_negTokenInit(talloc_tos(), blob, OIDs, 
&given_principal, NULL) ||
+   OIDs[0] == NULL) {
data_blob_free(&blob);
status = ADS_ERROR(LDAP_OPERATIONS_ERROR);
goto failed;
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 1c104c9..1623cab 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -1227,7 +1227,8 @@ ADS_STATUS cli_session_setup_spnego(struct cli_state 
*cli, const char *user,
 * negprot reply. It is WRONG to depend on the principal sent in the
 * negprot reply, but right now we do it. If we don't receive one,
 * we try to best guess, then fall back to NTLM.  */
-   if (!spnego_parse_negTokenInit(talloc_tos(), blob, OIDs, &principal, 
NULL)) {
+   if (!spnego_parse_negTokenInit(talloc_tos(), blob, OIDs, &principal, 
NULL) ||
+   OIDs[0] == NULL) {
data_blob_free(&blob);
return ADS_ERROR_NT(NT_STATUS_INVALID_PARAMETER);
}
diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
index e704d75..c1d5af6 100644
--- a/source3/rpc_server/srv_pipe.c
+++ b/source3/rpc_server/srv_pipe.c
@@ -625,7 +625,7 @@ static bool pipe_spnego_auth_bind_negotiate(struct 
pipes_struct *p,
 
/* parse out the OIDs and the first sec blob */
if (!spnego_parse_negTokenInit(talloc_tos(),
-   pauth_info->credentials, OIDs, NULL, &secblob)) {
+   pauth_info->credentials, OIDs, NULL, &secblob) || 
OIDs[0] == NULL) {
DEBUG(0,("pipe_spnego_auth_bind_negotiate: Failed to parse the 
security blob.\n"));
goto err;
 }
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index 35b8c04..bc3c7e0 100644
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -738,7 +738,8 @@ NTSTATUS parse_spnego_mechanisms(TALLOC_CTX *ctx,
*kerb_mechOID = NULL;
 
/* parse out the OIDs and the first sec blob */
-   if (!spnego_parse_negTokenInit(ctx, blob_in, OIDs, NULL, pblob_out)) {
+   if (!spnego_parse_negTokenInit(ctx, blob_in, OIDs, NULL, pblob_out) ||
+   (OIDs[0] == NULL)) {
return NT_STATUS_LOGON_FAILURE;
}
 


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch master updated

2010-09-23 Thread Jeremy Allison
The branch, master has been updated
   via  d8814b1 Fix bug 7694 - Crash bug with invalid SPNEGO token.
  from  0a1d153 s3-waf: add check for seteuid method.

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


- Log -
commit d8814b1a48adaf1f428c7119b97c87b69123e6fa
Author: Jeremy Allison 
Date:   Thu Sep 23 21:44:24 2010 -0700

Fix bug 7694 - Crash bug with invalid SPNEGO token.

Found by the CodeNomicon test suites at the SNIA plugfest.

http://www.codenomicon.com/

If an invalid SPNEGO packet contains no OIDs we crash in the SMB1/SMB2 
server
as we indirect the first returned value OIDs[0], which is returned as NULL.

Jeremy.

---

Summary of changes:
 source3/libads/sasl.c  |3 ++-
 source3/libsmb/cliconnect.c|3 ++-
 source3/rpc_server/dcesrv_spnego.c |2 +-
 source3/smbd/sesssetup.c   |3 ++-
 4 files changed, 7 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libads/sasl.c b/source3/libads/sasl.c
index 051fc96..653d546 100644
--- a/source3/libads/sasl.c
+++ b/source3/libads/sasl.c
@@ -785,7 +785,8 @@ static ADS_STATUS ads_sasl_spnego_bind(ADS_STRUCT *ads)
 
/* the server sent us the first part of the SPNEGO exchange in the 
negprot 
   reply */
-   if (!spnego_parse_negTokenInit(talloc_tos(), blob, OIDs, 
&given_principal, NULL)) {
+   if (!spnego_parse_negTokenInit(talloc_tos(), blob, OIDs, 
&given_principal, NULL) ||
+   OIDs[0] == NULL) {
data_blob_free(&blob);
status = ADS_ERROR(LDAP_OPERATIONS_ERROR);
goto failed;
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 92e5bb2..f76f17c 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -1229,7 +1229,8 @@ ADS_STATUS cli_session_setup_spnego(struct cli_state 
*cli, const char *user,
 * negprot reply. It is WRONG to depend on the principal sent in the
 * negprot reply, but right now we do it. If we don't receive one,
 * we try to best guess, then fall back to NTLM.  */
-   if (!spnego_parse_negTokenInit(talloc_tos(), blob, OIDs, &principal, 
NULL)) {
+   if (!spnego_parse_negTokenInit(talloc_tos(), blob, OIDs, &principal, 
NULL) ||
+   OIDs[0] == NULL) {
data_blob_free(&blob);
return ADS_ERROR_NT(NT_STATUS_INVALID_PARAMETER);
}
diff --git a/source3/rpc_server/dcesrv_spnego.c 
b/source3/rpc_server/dcesrv_spnego.c
index 4686534..fb758e3 100644
--- a/source3/rpc_server/dcesrv_spnego.c
+++ b/source3/rpc_server/dcesrv_spnego.c
@@ -230,7 +230,7 @@ NTSTATUS spnego_server_auth_start(TALLOC_CTX *mem_ctx,
 
ret = spnego_parse_negTokenInit(sp_ctx, *spnego_in,
sp_ctx->oid_list, NULL, &token_in);
-   if (!ret) {
+   if (!ret || sp_ctx->oid_list[0] == NULL) {
DEBUG(3, ("Invalid SPNEGO message\n"));
status = NT_STATUS_INVALID_PARAMETER;
goto done;
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index 0b999b3..b227d2b 100644
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -575,7 +575,8 @@ NTSTATUS parse_spnego_mechanisms(TALLOC_CTX *ctx,
*kerb_mechOID = NULL;
 
/* parse out the OIDs and the first sec blob */
-   if (!spnego_parse_negTokenInit(ctx, blob_in, OIDs, NULL, pblob_out)) {
+   if (!spnego_parse_negTokenInit(ctx, blob_in, OIDs, NULL, pblob_out) ||
+   (OIDs[0] == NULL)) {
return NT_STATUS_LOGON_FAILURE;
}
 


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch master updated

2010-09-23 Thread Günther Deschner
The branch, master has been updated
   via  0a1d153 s3-waf: add check for seteuid method.
  from  00be7ea s3-waf: fix the build.

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


- Log -
commit 0a1d153b256e45d7862235ab0fdaa9e92ae883f2
Author: Günther Deschner 
Date:   Thu Sep 23 18:15:09 2010 -0700

s3-waf: add check for seteuid method.

Thanks to Kai and Metze!

Guenther

---

Summary of changes:
 source3/wscript |   44 
 1 files changed, 44 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/wscript b/source3/wscript
index 54342d5..5bb8f69 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -600,6 +600,50 @@ return 0;
 if conf.env.with_iconv:
 conf.DEFINE('HAVE_ICONV', 1)
 
+seteuid = False
+if not seteuid:
+seteuid = conf.CHECK_CODE('''
+   #define AUTOCONF_TEST 1
+   #define USE_SETREUID 1
+   #include "./lib/util_sec.c"
+   ''',
+   'USE_SETREUID',
+   addmain=False,
+   execute=True,
+   msg="Checking whether setreuid is available")
+if not seteuid:
+seteuid = conf.CHECK_CODE('''
+   #define AUTOCONF_TEST 1
+   #define USE_SETRESUID 1
+   #include "./lib/util_sec.c"
+   ''',
+   'USE_SETRESUID',
+   addmain=False,
+   execute=True,
+   msg="Checking whether setresuid is available")
+if not seteuid:
+seteuid = conf.CHECK_CODE('''
+   #define AUTOCONF_TEST 1
+   #define USE_SETEUID 1
+   #include "./lib/util_sec.c"
+   ''',
+   'USE_SETEUID',
+   addmain=False,
+   execute=True,
+   msg="Checking whether seteuid is available")
+if not seteuid:
+seteuid = conf.CHECK_CODE('''
+   #define AUTOCONF_TEST 1
+   #define USE_SETUIDX 1
+   #include "./lib/util_sec.c"
+   ''',
+   'USE_SETUIDX',
+   addmain=False,
+   execute=True,
+   mandatory=True,
+   msg="Checking whether setuidx is available")
+
+
 # FIXME: these should be tests for features, but the old build system just
 # checks for OSes.
 import sys


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch master updated

2010-09-23 Thread Günther Deschner
The branch, master has been updated
   via  00be7ea s3-waf: fix the build.
   via  260ad23 s3-waf: add more diroptions.
  from  0b0a717 s3 waf: more correctly generate symbols for 
pdb/vfs/auth/etc. modules

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


- Log -
commit 00be7ea4130955021704066401f6d47bd1c717e7
Author: Günther Deschner 
Date:   Thu Sep 23 16:40:43 2010 -0700

s3-waf: fix the build.

Guenther

commit 260ad237273d3a1c34811a970680488ad3a83013
Author: Günther Deschner 
Date:   Thu Sep 23 16:39:41 2010 -0700

s3-waf: add more diroptions.

Guenther

---

Summary of changes:
 source3/build/dynconfig.py |   12 +++-
 source3/wscript_build  |7 +++
 2 files changed, 18 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/build/dynconfig.py b/source3/build/dynconfig.py
index ad9d245..4bc97e5 100644
--- a/source3/build/dynconfig.py
+++ b/source3/build/dynconfig.py
@@ -2,7 +2,7 @@ import string, Utils
 
 # list of directory options to offer in configure
 dir_options = {
-'with-piddir' : [ '${PREFIX}/var/run', 'where to 
put pid files' ],
+'with-piddir' : [ '${PREFIX}/var/locks', 'where to 
put pid files' ],
 'with-privatedir' : [ '${PREFIX}/private', 'Where to 
put sam.ldb and other private files' ],
 'with-winbindd-socket-dir': [ '${PREFIX}/var/lib/winbindd', 
'winbind socket directory' ],
 'with-winbindd-privileged-socket-dir' : [ 
'${PREFIX}/var/lib/winbindd_privileged', 'winbind privileged socket directory'],
@@ -11,6 +11,16 @@ dir_options = {
 'with-codepagedir': [ '${PREFIX}/lib/samba', 'where to 
put codepages' ],
 'with-privatedir' : [ '${PREFIX}/private', 'where to 
put smbpasswd' ],
 'with-cachedir'   : [ '${PREFIX}/var/locks', 'where to 
put temporary cache files' ],
+'with-logfilebase': [ '${PREFIX}/var/log/samba', 
'Where to put log files' ],
+'with-configdir'  : [ '${PREFIX}/etc/samba', 'Where to 
put configuration files' ],
+'with-swatdir': [ '${PREFIX}/swat', 'Where to put 
SWAT files' ],
+'with-statedir'   : [ '${PREFIX}/var/locks', 'where to 
put persistent state files' ],
+'with-cachedir'   : [ '${PREFIX}/var/locks', 'where to 
put temporary cache files' ],
+'with-ncalrpcdir' : [ '${PREFIX}/var/ncalrpc', 'where 
to put ncalrpc sockets' ],
+'with-pammodulesdir'  : [ '', 'Which directory to use for 
PAM modules' ],
+'with-codepagedir': [ '${PREFIX}/lib/samba', 'Where to 
put codepages' ],
+'with-selftest-prefix': [ '', 'The prefix where make test 
will be run' ],
+'with-selftest-shrdir': [ '', 'The share directory that 
make test will be run against' ]
 }
 
 # list of cflags to use for dynconfig.c
diff --git a/source3/wscript_build b/source3/wscript_build
index 75c7e0b..98b609b 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -1345,6 +1345,9 @@ bld.SAMBA_SUBSYSTEM('NDR_STANDARD',
 source=LIBNDR_SRC,
 vars=locals())
 
+#FIXME
+bld.SAMBA_SUBSYSTEM('dcerpc', '')
+
 bld.SAMBA_SUBSYSTEM('LZXPRESS',
deps='replace',
source='../lib/compression/lzxpress.c')
@@ -1358,6 +1361,10 @@ bld.SAMBA_SUBSYSTEM('NDR_DCERPC',
 source='../librpc/gen_ndr/ndr_dcerpc.c',
 vars=locals())
 
+bld.SAMBA_SUBSYSTEM('NDR_SRVSVC',
+source='../librpc/gen_ndr/ndr_srvsvc.c',
+vars=locals())
+
 bld.SAMBA_SUBSYSTEM('LIBSAMBA-ERRORS',
source='../libcli/util/doserr.c libsmb/nterr.c')
 


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch master updated

2010-09-23 Thread Kai Blin
The branch, master has been updated
   via  0b0a717 s3 waf: more correctly generate symbols for 
pdb/vfs/auth/etc. modules
  from  0bc3e15 selftest Don't run 'speed' tests for very long

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


- Log -
commit 0b0a717255e8249b31570c2289f7b73ddc678ea9
Author: Kai Blin 
Date:   Thu Sep 23 16:29:06 2010 -0700

s3 waf: more correctly generate symbols for pdb/vfs/auth/etc. modules

---

Summary of changes:
 source3/wscript_build |   40 +++-
 1 files changed, 27 insertions(+), 13 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/wscript_build b/source3/wscript_build
index 73a6c22..75c7e0b 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -605,7 +605,7 @@ IDMAP_SRC = 'winbindd/idmap.c winbindd/idmap_util.c 
${IDMAP_RW_SRC} ${IDMAP_STAT
 #FIXME: set NSS_INFO_STATIC during configuration
 NSS_INFO_STATIC = ''
 NSS_INFO_TEMPLATE_SRC = 'winbindd/nss_info_template.c'
-NSS_INFO_SRC = 'winbindd/nss_info.c ${NSS_INFO_STATIC}'
+NSS_INFO_SRC = 'winbindd/nss_info.c'
 
 IDMAP_HASH_SRC = '''winbindd/idmap_hash/idmap_hash.c
 winbindd/idmap_hash/mapfile.c'''
@@ -778,7 +778,7 @@ SMBD_SRC_SRV = '''smbd/server_reload.c smbd/files.c 
smbd/connection.c
smbd/smb2_setinfo.c
smbd/smb2_break.c
../libcli/smb/smb2_create_blob.c
-   ${MANGLE_SRC} ${VFS_STATIC}'''
+   ${MANGLE_SRC}'''
 
 SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
 ${RPC_SERVER_SRC}
@@ -797,7 +797,6 @@ SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
 ${RPC_CLIENT_SCHANNEL_SRC}
 rpc_client/init_netlogon.c
 rpc_client/init_samr.c
-${AUTH_SRC}
 ${PRIVILEGES_BASIC_SRC}
 ${REGFIO_SRC}
 ${REG_API_REGF_SRC}
@@ -1169,17 +1168,14 @@ for prefix in bld.env.MODULE_PREFIXES:
 static_key = "%s_STATIC" % prefix.upper()
 shared_key = "%s_SHARED" % prefix.upper()
 
-# Set up the static modules
-static_src = locals()[static_key]
 for module in bld.env[static_key]:
-static_src += "${%s_SRC} " % module
-# for some reason static_src doesn't seem to be a reference, so save it
-# back to the locals
-locals()[static_key] = static_src
+bld.SAMBA_SUBSYSTEM(module,
+source="${%s_SRC}" % module,
+vars=locals())
 
 # Set up subsystems for the shared modules
 for module in bld.env[shared_key]:
-bld.SAMBA_SUBSYSTEM(module,
+bld.SAMBA_MODULE(module,
 source="${%s_SRC}" % module,
 vars=locals())
 
@@ -1236,6 +1232,13 @@ bld.SAMBA_SUBSYSTEM('ASN1_UTIL',
 deps='talloc',
 local_include=False)
 
+bld.SAMBA_SUBSYSTEM('AUTH',
+source=AUTH_SRC,
+deps='''AUTH_SAM AUTH_UNIX AUTH_WINBIND AUTH_WBC
+AUTH_SERVER AUTH_DOMAIN AUTH_BUILTIN
+AUTH_NETLOGOND''',
+vars=locals())
+
 bld.SAMBA_SUBSYSTEM('AVAHI',
 source=AVAHI_SRC,
 deps='avahi-common avahi-client',
@@ -1250,7 +1253,8 @@ bld.SAMBA_SUBSYSTEM('TLDAP',
 
 bld.SAMBA_SUBSYSTEM('PASSDB',
 source=PASSDB_SRC,
-deps='GROUPDB TLDAP SECRETS SMBLDAP',
+deps='''GROUPDB TLDAP SECRETS SMBLDAP PDB_SMBPASSWD
+PDB_TDBSAM PDB_WBC_SAM PDB_LDAP''',
 vars=locals())
 
 bld.SAMBA_SUBSYSTEM('PARAM_WITHOUT_REG',
@@ -1321,9 +1325,17 @@ bld.SAMBA_SUBSYSTEM('SMBD_BASE',
 deps='''tdb tevent dl krb5 ldap gssapi gssapi_krb5
 NSS_WRAPPER DYNCONFIG libwbclient crypt nsl cups cap 
resolv ZLIB PASSDB
 PARAM_WITHOUT_REG LIBS LIBSMB POPT_SAMBA KRBCLIENT AVAHI
-LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER 
LIBADS_PRINTER''',
+LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER LIBADS_PRINTER
+VFS_DEFAULT RPC_MODULES AUTH''',
 vars=locals())
 
+bld.SAMBA_SUBSYSTEM('RPC_MODULES',
+source='',
+deps='''RPC_LSARPC RPC_SAMR RPC_WINREG RPC_INITSHUTDOWN
+RPC_DSSETUP RPC_WKSSVC RPC_SVCCTL RPC_NTSVCS
+RPC_NETLOGON RPC_NETDFS RPC_SRVSVC RPC_SPOOLSS
+RPC_EVENTLOG''')
+
 bld.SAMBA_SUBSYSTEM('LIBNDR',
 source=LIBNDR_SRC,
 vars=locals())
@@ -1378,7 +1390,9 @@ bld.SAMBA_BINARY('winbindd/winbindd',
  source=WINBINDD_SRC,
  deps='''talloc tdb tevent cap dl ZLIB NSS

[SCM] Samba Shared Repository - branch master updated

2010-09-23 Thread Andrew Bartlett
The branch, master has been updated
   via  0bc3e15 selftest Don't run 'speed' tests for very long
   via  b00dc83 s4-selftest Run slow tests less often
   via  e823cb8 s4-libnet_join Use header constant for 'all encryption 
types' in msDS-SupportedEncryptionTypes
   via  f03913e s4-kerberos Move 'set key into keytab' code out of 
credentials.
   via  062b0eb s4-libnet Remove libnet_samdump_keytab() and net samdump 
keytab
   via  f9698cf s4-kerberos Fix kerberos_enctype_bitmap_to_enctypes()
   via  964f992 s4:repl_meta_data - also on delete operations the new RDN 
attribute has to be casefolded correctly
   via  30afa65 s4:lazy_commit LDB module - the "show_deleted" control is 
initialised by the "show_deleted" LDB module
   via  29e3806 s4:rootdse LDB module - make use of 
"dsdb_forest_functional_level"
   via  9123bcb s4:ldap.py - add tests for the "dsServiceName", 
"serverName", "dnsHostName" and "ldapServiceName" rootDSE attributes
   via  76c346d s4:provision - rootdse - remove static "ldapServiceName" 
attribute
   via  1d9a348 s4:rootdse LDB module - introduce dynamic "ldapServiceName"
   via  ccc67a0 s4:provision - rootdse - remove static "dnsHostName" 
attribute
   via  681106a s4:rootdse LDB module - introduce dynamic "dnsHostName" 
attribute
   via  5f60f5e s4:provision - rootdse - remove the static attribute 
"serverName"
   via  5fd7bc8 s4:rootdse LDB module - make "serverName" dynamic
   via  e446ef1 s4:rootdse LDB module - remove "priv" checks where not 
needed
   via  f153569 s4:rootdse LDB module - better that the "edn" control 
handling is done last
   via  b6eb1b2 s4:torture/rpc/netlogon.c - remove the dependency on 
"samdb_server_site_name"
   via  65ca9e6 s4:provision.py - support still not fully provisioned trees 
regarding the rootDSE module
   via  439d7ff s4:provision.py - make more use of "names.serverdn" on NTDS 
settings location
   via  679eb33 s4:samldb LDB module - it isn't allowed to create 
user/computer accounts with a primary group specified
   via  2e91399 s4:dsdb/common/util_samr.c - remove the primary group 
specifications
   via  c03ec03 s4:ldap.py - test default primary groups on modify 
operations
   via  f46c623 s4:samldb LDB module - support the "userAccountControl" -> 
"primaryGroupID" detection also on modify operations
   via  72bb8c3 s4:ldap.py - enhance SAM user/groups behaviour test 
regarding default primary groups
   via  4492d0a libds:flag_mapping.c - support also the default read-only 
DC primary group
   via  f45848e s4:python/samba/join.py - add a comment to point out that 
NCs have to be assigned dynamically
   via  8223342 s4:python/samba/join.py - use constant for DC function level
   via  f84724c s4:rootdse LDB module - make more use of LDB result 
constants
   via  0829845 s4:rootdse LDB module - fix comment typo
   via  7a1a0cd s4:password_hash LDB module - don't assign "lp_ctx" twice
   via  9ca8214 ldb:ldb_match.c - fix counter variable type
   via  0f163eb ldb:ldb_msg_add_linearized_dn - handle NULL DNs
   via  e59cdaf s4:rootdse LDB module - fix counter types
   via  1a1be71 s4:extended_dn_in LDB module - fix a counter type
   via  6c349d4 s4:drepl_out_helpers.c - fix a counter type
   via  80f3e92 s4:rpc_server/dcerpc_server.c - fix a "const" warning
   via  ae60328 s4:libcli/resolve/file.c - fix "const" warning
  from  8ba3eac s3-waf: remove duplicate CONFIGFILE from dynconfig.py which 
caused sysconfigdir to be ignored.

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


- Log -
commit 0bc3e159316b437a2ba2253c7b7893a1f3049a0e
Author: Andrew Bartlett 
Date:   Thu Sep 23 17:32:46 2010 +1000

selftest Don't run 'speed' tests for very long

'make test' is too long, and the main thing we need with these
tests is to ensure they don't segfault - there is no need to benchmark
every box in the build farm, and we have no 'fail' metric in any case.

Andrew Bartlett

commit b00dc8399290988dbc8fd3d04fb9654d026d8dd8
Author: Andrew Bartlett 
Date:   Thu Sep 23 17:11:24 2010 +1000

s4-selftest Run slow tests less often

These tests don't need to be run twice - basic parsing errors that
will show up with the various options will be caught quite well
by other tests.

Andrew Bartlett

commit e823cb8cacd9301609314ed52d2b51856294e58c
Author: Andrew Bartlett 
Date:   Thu Sep 23 17:02:31 2010 +1000

s4-libnet_join Use header constant for 'all encryption types' in 
msDS-SupportedEncryptionTypes

commit f03913e2ccfcd75a9d569a5b6e9152b091e0014f
Author: Andrew Bartlett 
Date:   Thu Sep 23 17:01:44 2010 +1000

s4-kerberos Move 'set key into keytab' code out of credentials.

This code never really belonged in the credentials layer, and
is easier done with direct ac

[SCM] Samba Shared Repository - branch master updated

2010-09-23 Thread Günther Deschner
The branch, master has been updated
   via  8ba3eac s3-waf: remove duplicate CONFIGFILE from dynconfig.py which 
caused sysconfigdir to be ignored.
   via  b828dc0 s3-waf: fix the build of nsstest with --enable-nss-wrapper.
  from  0261b96 s4-waf: move the RPC_NDR subsystems to main librpc 
wscript_build.

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


- Log -
commit 8ba3eacf6b8ef4e6e681d4626b1efd99b04eca33
Author: Günther Deschner 
Date:   Thu Sep 23 15:33:43 2010 -0700

s3-waf: remove duplicate CONFIGFILE from dynconfig.py which caused 
sysconfigdir
to be ignored.

Guenther

commit b828dc055e9e3c6f1f174e191fb3bbc09528ec6a
Author: Günther Deschner 
Date:   Thu Sep 23 15:13:23 2010 -0700

s3-waf: fix the build of nsstest with --enable-nss-wrapper.

Guenther

---

Summary of changes:
 source3/build/dynconfig.py |1 -
 source3/wscript_build  |1 +
 2 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/build/dynconfig.py b/source3/build/dynconfig.py
index d04fe3d..ad9d245 100644
--- a/source3/build/dynconfig.py
+++ b/source3/build/dynconfig.py
@@ -26,7 +26,6 @@ dyn_cflags = {
 'DATADIR': '${DATADIR}',
 'LOGFILEBASE': '${LOCALSTATEDIR}',
 'CONFIGDIR'  : '${SYSCONFDIR}',
-'CONFIGFILE' : '${LIBDIR}/smb.conf',
 'NCALRPCDIR' : '${LOCALSTATEDIR}/ncalrpc',
 'SWATDIR': '${PREFIX}/swat',
 'PRIVATE_DIR': '${PRIVATEDIR}',
diff --git a/source3/wscript_build b/source3/wscript_build
index f833b59..73a6c22 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -1530,6 +1530,7 @@ bld.SAMBA_BINARY('locktest',
 
 bld.SAMBA_BINARY('nsstest',
  source=NSSTEST_SRC,
+ deps='NSS_WRAPPER',
  vars=locals())
 
 bld.SAMBA_BINARY('pdbtest',


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch master updated

2010-09-23 Thread Günther Deschner
The branch, master has been updated
   via  0261b96 s4-waf: move the RPC_NDR subsystems to main librpc 
wscript_build.
  from  859f3cd s4/eventlog6: Add dummy implementation for calls 0x5 and 0xB

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


- Log -
commit 0261b96bd86ed8026328bc3d1516dcb97a2ee84c
Author: Günther Deschner 
Date:   Thu Sep 23 13:55:18 2010 -0700

s4-waf: move the RPC_NDR subsystems to main librpc wscript_build.

Guenther

---

Summary of changes:
 librpc/wscript_build |  187 +++
 source4/librpc/wscript_build |  222 --
 2 files changed, 187 insertions(+), 222 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/wscript_build b/librpc/wscript_build
index d4f941e..a9ce148 100644
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -230,3 +230,190 @@ bld.SAMBA_SUBSYSTEM('NDR_NBT',
public_headers='../librpc/gen_ndr/nbt.h',
 header_path='gen_ndr'
)
+
+bld.SAMBA_SUBSYSTEM('RPC_NDR_XATTR',
+   source='../librpc/gen_ndr/ndr_xattr_c.c',
+   public_deps='NDR_XATTR dcerpc'
+   )
+
+bld.SAMBA_SUBSYSTEM('RPC_NDR_ROT',
+   source='../librpc/gen_ndr/ndr_rot_c.c',
+   public_deps='NDR_ROT dcerpc'
+   )
+
+bld.SAMBA_SUBSYSTEM('RPC_NDR_AUDIOSRV',
+   source='../librpc/gen_ndr/ndr_audiosrv_c.c',
+   public_deps='NDR_AUDIOSRV dcerpc'
+   )
+
+bld.SAMBA_SUBSYSTEM('RPC_NDR_ECHO',
+   source='../librpc/gen_ndr/ndr_echo_c.c',
+   public_deps='dcerpc NDR_STANDARD'
+   )
+
+bld.SAMBA_SUBSYSTEM('RPC_NDR_DSBACKUP',
+   source='../librpc/gen_ndr/ndr_dsbackup_c.c',
+   public_deps='dcerpc NDR_DSBACKUP'
+   )
+
+bld.SAMBA_SUBSYSTEM('RPC_NDR_EFS',
+   source='../librpc/gen_ndr/ndr_efs_c.c',
+   public_deps='dcerpc NDR_EFS'
+   )
+
+bld.SAMBA_SUBSYSTEM('RPC_NDR_LSA',
+   source='../librpc/gen_ndr/ndr_lsa_c.c',
+   public_deps='dcerpc NDR_STANDARD'
+   )
+
+bld.SAMBA_SUBSYSTEM('RPC_NDR_DFS',
+   source='../librpc/gen_ndr/ndr_dfs_c.c',
+   public_deps='dcerpc NDR_STANDARD'
+   )
+
+bld.SAMBA_SUBSYSTEM('RPC_NDR_FRSAPI',
+   source='../librpc/gen_ndr/ndr_frsapi_c.c',
+   public_deps='dcerpc NDR_FRSAPI'
+   )
+
+bld.SAMBA_SUBSYSTEM('RPC_NDR_DRSUAPI',
+   source='../librpc/gen_ndr/ndr_drsuapi_c.c',
+   public_deps='dcerpc NDR_DRSUAPI'
+   )
+
+bld.SAMBA_SUBSYSTEM('RPC_NDR_DRSBLOBS',
+   source='../librpc/gen_ndr/ndr_drsblobs_c.c',
+   public_deps='dcerpc NDR_DRSBLOBS'
+   )
+
+bld.SAMBA_SUBSYSTEM('RPC_NDR_POLICYAGENT',
+   source='../librpc/gen_ndr/ndr_policyagent_c.c',
+   public_deps='dcerpc NDR_POLICYAGENT'
+   )
+
+bld.SAMBA_SUBSYSTEM('RPC_NDR_UNIXINFO',
+   source='../librpc/gen_ndr/ndr_unixinfo_c.c',
+   public_deps='dcerpc NDR_UNIXINFO'
+   )
+
+bld.SAMBA_SUBSYSTEM('RPC_NDR_BROWSER',
+   source='../librpc/gen_ndr/ndr_browser_c.c',
+   public_deps='dcerpc NDR_BROWSER'
+   )
+
+bld.SAMBA_SUBSYSTEM('RPC_NDR_SPOOLSS',
+   source='../librpc/gen_ndr/ndr_spoolss_c.c',
+   public_deps='dcerpc NDR_SPOOLSS'
+   )
+
+bld.SAMBA_SUBSYSTEM('RPC_NDR_NBT',
+   source='../librpc/gen_ndr/ndr_nbt_c.c',
+   public_deps='dcerpc NDR_NBT'
+   )
+
+bld.SAMBA_SUBSYSTEM('RPC_NDR_WKSSVC',
+   source='../librpc/gen_ndr/ndr_wkssvc_c.c',
+   public_deps='dcerpc NDR_STANDARD'
+   )
+
+bld.SAMBA_SUBSYSTEM('RPC_NDR_SRVSVC',
+   source='../librpc/gen_ndr/ndr_srvsvc_c.c',
+   public_deps='dcerpc NDR_SRVSVC'
+   )
+
+bld.SAMBA_SUBSYSTEM('RPC_NDR_SVCCTL',
+   source='../librpc/gen_ndr/ndr_svcctl_c.c',
+   public_deps='dcerpc NDR_STANDARD',
+   public_headers='../librpc/gen_ndr/ndr_svcctl_c.h',
+header_path='gen_ndr'
+   )
+
+bld.SAMBA_SUBSYSTEM('RPC_NDR_EVENTLOG',
+   source='../librpc/gen_ndr/ndr_eventlog_c.c',
+   public_deps='dcerpc NDR_STANDARD'
+   )
+
+bld.SAMBA_SUBSYSTEM('RPC_NDR_EPMAPPER',
+   source='../librpc/gen_ndr/ndr_epmapper_c.c',
+   public_deps='tevent NDR_EPMAPPER'
+   )
+
+bld.SAMBA_SUBSYSTEM('RPC_NDR_DBGIDL',
+   source='../librpc/gen_ndr/ndr_dbgidl_c.c',
+   public_deps='dcerpc NDR_DBGIDL'
+   )
+
+bld.SAMBA_SUBSYSTEM('RPC_NDR_DSSETUP',
+   source='../librpc/gen_ndr/ndr_dssetup_c.c',
+   public_deps='dcerpc NDR_DSSETUP'
+   )
+
+bld.SAMBA_SUBSYSTEM('RPC_NDR_MSGSVC',
+   source='../librpc/gen_ndr/ndr_msgsvc_c.c',
+   public_deps='dcerpc NDR_MSGSVC'
+   )
+
+bld.SAMBA_SUBSYSTEM('RPC_NDR_WINREG',
+   source='../librpc/gen_ndr/ndr_winreg_c.c',
+   public_deps='dcerpc NDR_STANDARD'
+   )
+
+bld.SAMBA_SUBSYSTEM('RPC_NDR_INITSHUTDOWN',
+   source='../librpc/gen_ndr/ndr_initshutdown_c.c',
+   public_deps='dcerpc NDR_STANDARD'
+   )
+
+bld.SAMB

[SCM] Samba Shared Repository - branch master updated

2010-09-23 Thread Anatoliy Atanasov
The branch, master has been updated
   via  859f3cd s4/eventlog6: Add dummy implementation for calls 0x5 and 0xB
   via  411e6bc s4/eventlog6: Build and hook EventLog6 RPC endpont mapper 
and idl
   via  b236098 s4/eventlog6: Add endpoint server for EventLog6 RPC
   via  55fe86b s4/eventlog6: Add idl for EventLog6 RPC
   via  bea4948 pidl:NDR/Parser: fix range() for arrays
  from  6673146 tdb: add restore

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


- Log -
commit 859f3cdd4a9d282594f195b032a65ea1c2db2703
Author: Anatoliy Atanasov 
Date:   Thu Sep 23 11:45:16 2010 -0700

s4/eventlog6: Add dummy implementation for calls 0x5 and 0xB

The code is enough to let us run all dcdiag tests against samba4 server

commit 411e6bc3f2d18c675475113fbab6c586204472be
Author: Anatoliy Atanasov 
Date:   Thu Sep 23 11:39:47 2010 -0700

s4/eventlog6: Build and hook EventLog6 RPC endpont mapper and idl

commit b23609812a72fb90cb80351de5bc144601a4a82d
Author: Anatoliy Atanasov 
Date:   Thu Sep 23 11:38:19 2010 -0700

s4/eventlog6: Add endpoint server for EventLog6 RPC

The file is generated using PIDL --template command.

commit 55fe86bccc4c579e77fab8a20a53e4bbb2a55bc8
Author: Anatoliy Atanasov 
Date:   Thu Sep 23 11:31:32 2010 -0700

s4/eventlog6: Add idl for EventLog6 RPC

The idl is translated from [MS-EVEN6].pdf.

commit bea4948acb4bbee2fbf886adeb53edbc84de96da
Author: Stefan Metzmacher 
Date:   Tue Sep 21 05:41:37 2010 +0200

pidl:NDR/Parser: fix range() for arrays

metze

---

Summary of changes:
 librpc/idl/eventlog6.idl   |  343 
 librpc/idl/wscript_build   |2 +-
 pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm   |   33 +++-
 source4/librpc/wscript_build   |2 +-
 source4/param/loadparm.c   |2 +-
 source4/rpc_server/config.mk   |   14 +
 source4/rpc_server/dcerpc_server.c |1 +
 source4/rpc_server/eventlog/dcesrv_eventlog6.c |  323 ++
 source4/rpc_server/wscript_build   |6 +
 9 files changed, 722 insertions(+), 4 deletions(-)
 create mode 100644 librpc/idl/eventlog6.idl
 create mode 100644 source4/rpc_server/eventlog/dcesrv_eventlog6.c


Changeset truncated at 500 lines:

diff --git a/librpc/idl/eventlog6.idl b/librpc/idl/eventlog6.idl
new file mode 100644
index 000..0cda95b
--- /dev/null
+++ b/librpc/idl/eventlog6.idl
@@ -0,0 +1,343 @@
+#include "idl_types.h"
+
+
+import "misc.idl";
+
+cpp_quote("#define MAX_RPC_GUID_ARRAY_COUNT (MAX_PAYLOAD / sizeof(struct 
GUID))")
+cpp_quote("#define eventlog6_EvtRpcSubscribePull0x1000")
+cpp_quote("#define eventlog6_EvtRpcVarFlagsModified 0x0001")
+
+[
+uuid (f6beaff7-1e19-4fbb-9f8f-b89e2018337c),
+version(1.0),
+endpoint("ncacn_ip_tcp:"),
+helpstring("Eventlog6"),
+pointer_default(unique)
+]
+interface eventlog6
+{
+   const int MAX_PAYLOAD  = 2 * 1024 * 1024;
+   const int MAX_RPC_QUERY_LENGTH = MAX_PAYLOAD / sizeof(uint16_t);
+   const int MAX_RPC_CHANNEL_NAME_LENGTH  = 512;
+   const int MAX_RPC_QUERY_CHANNEL_SIZE   = 512;
+   const int MAX_RPC_EVENT_ID_SIZE= 256;
+   const int MAX_RPC_FILE_PATH_LENGTH = 32768;
+   const int MAX_RPC_CHANNEL_PATH_LENGTH  = 32768;
+   const int MAX_RPC_BOOKMARK_LENGTH  = MAX_PAYLOAD / sizeof(uint16_t);
+   const int MAX_RPC_PUBLISHER_ID_LENGTH  = 2048;
+   const int MAX_RPC_PROPERTY_BUFFER_SIZE = MAX_PAYLOAD;
+   const int MAX_RPC_FILTER_LENGTH= MAX_RPC_QUERY_LENGTH;
+   const int MAX_RPC_RECORD_COUNT = 1024;
+   const int MAX_RPC_EVENT_SIZE   = MAX_PAYLOAD;
+   const int MAX_RPC_BATCH_SIZE   = MAX_PAYLOAD;
+   const int MAX_RPC_RENDERED_STRING_SIZE = MAX_PAYLOAD;
+   const int MAX_RPC_CHANNEL_COUNT= 8192;
+   const int MAX_RPC_PUBLISHER_COUNT  = 8192;
+   const int MAX_RPC_EVENT_METADATA_COUNT = 256;
+   const int MAX_RPC_VARIANT_LIST_COUNT   = 256;
+   const int MAX_RPC_BOOLEAN8_ARRAY_COUNT = MAX_PAYLOAD / sizeof(uint8_t);
+   const int MAX_RPC_UINT32_ARRAY_COUNT   = MAX_PAYLOAD / sizeof(uint32_t);
+   const int MAX_RPC_UINT64_ARRAY_COUNT   = MAX_PAYLOAD / sizeof(uint64_t);
+   const int MAX_RPC_STRING_ARRAY_COUNT   = MAX_PAYLOAD / 512;
+   const int MAX_RPC_STRING_LENGTH= MAX_PAYLOAD / sizeof(uint16_t);
+
+   typedef struct {
+   uint32 error;
+   uint32 sub_err;
+   uint32 sub_err_param;
+   } eventlog6_RpcInfo;
+
+   typedef struct {
+   [range(0, MAX_RPC_BOOLEAN8_ARRAY_COUNT)] uint32 count;
+   [size_is(count)] boolean8* ptr;
+   } eventlog6_boolean8Array;
+

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

2010-09-23 Thread Björn Jacke
The branch, v3-6-test has been updated
   via  96ab093 s3: tdbdump does not use our libs (cherry picked via commit 
aea64ef275b6e94ca7afb8fa2bb172416773abdf and 
82c0e79b8d8c693c128e83d8062e1543f3bb311d)
  from  95d3591 tdb: add restore

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


- Log -
commit 96ab0938ebf5c03228183ec90e48f4a136e6680c
Author: Volker Lendecke 
Date:   Wed Sep 22 18:00:10 2010 +0200

s3: tdbdump does not use our libs
(cherry picked via commit aea64ef275b6e94ca7afb8fa2bb172416773abdf and 
82c0e79b8d8c693c128e83d8062e1543f3bb311d)

---

Summary of changes:
 source3/Makefile.in |5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 35ab705..ba75c9e 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -3024,10 +3024,9 @@ bin/tdbt...@exeext@: $(BINARY_PREREQS) $(TDBTOOL_OBJ) 
$(LIBTALLOC) $(LIBTDB)
@$(CC) -o $@ $(LDFLAGS) $(TDBTOOL_OBJ) $(DYNEXP) \
$(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
 
-bin/tdbd...@exeext@: $(BINARY_PREREQS) $(TDBDUMP_OBJ) $(LIBTALLOC) $(LIBTDB)
+bin/tdbd...@exeext@: $(BINARY_PREREQS) $(TDBDUMP_OBJ) $(LIBTDB)
@echo Linking $@
-   @$(CC) -o $@ $(LDFLAGS) $(TDBDUMP_OBJ) $(DYNEXP) \
-   $(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
+   @$(CC) -o $@ $(LDFLAGS) $(TDBDUMP_OBJ) $(DYNEXP) $(LIBTDB_LIBS) 
$(LIBREPLACE_LIBS)
 
 bin/tdbrest...@exeext@: $(BINARY_PREREQS) $(TDBRESTORE_OBJ) $(LIBTDB)
@echo Linking $@


-- 
Samba Shared Repository


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

2010-09-23 Thread Volker Lendecke
The branch, v3-6-test has been updated
   via  95d3591 tdb: add restore
  from  4ffe968 Thank goodness for code reviews. Volker caught - this 
should be lp_posix_pathnames() not lp_unix_extensions().

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


- Log -
commit 95d3591dee6fe6fb2c63da7695bf7bd1b3accdf1
Author: Volker Lendecke 
Date:   Sat Sep 18 10:56:10 2010 +0400

tdb: add restore

Based on an idea by Simon McVittie, largely rewritten

---

Summary of changes:
 lib/tdb/config.mk  |9 +
 .../tdb/manpages/tdbrestore.8.xml  |   31 ++--
 lib/tdb/tdb.mk |7 +-
 lib/tdb/tools/tdbrestore.c |  226 
 lib/tdb/wscript|4 +
 source3/Makefile.in|9 +
 source3/configure.in   |2 +
 7 files changed, 273 insertions(+), 15 deletions(-)
 copy docs-xml/manpages-3/tdbdump.8.xml => lib/tdb/manpages/tdbrestore.8.xml 
(56%)
 create mode 100644 lib/tdb/tools/tdbrestore.c


Changeset truncated at 500 lines:

diff --git a/lib/tdb/config.mk b/lib/tdb/config.mk
index b2e322c..22caada 100644
--- a/lib/tdb/config.mk
+++ b/lib/tdb/config.mk
@@ -35,6 +35,15 @@ PRIVATE_DEPENDENCIES = \
 tdbtorture_OBJ_FILES = $(tdbsrcdir)/tools/tdbtorture.o
 
 
+# Start BINARY tdbrestore
+[BINARY::tdbrestore]
+INSTALLDIR = BINDIR
+PRIVATE_DEPENDENCIES = \
+   LIBTDB
+# End BINARY tdbrestore
+
+
+
 # Start BINARY tdbdump
 [BINARY::tdbdump]
 INSTALLDIR = BINDIR
diff --git a/docs-xml/manpages-3/tdbdump.8.xml 
b/lib/tdb/manpages/tdbrestore.8.xml
similarity index 56%
copy from docs-xml/manpages-3/tdbdump.8.xml
copy to lib/tdb/manpages/tdbrestore.8.xml
index 90465e5..64c0ba2 100644
--- a/docs-xml/manpages-3/tdbdump.8.xml
+++ b/lib/tdb/manpages/tdbrestore.8.xml
@@ -1,9 +1,9 @@
 
 http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd";>
-
+
 
 
-   tdbdump
+   tdbrestore
8
Samba
System Administration tools
@@ -12,14 +12,14 @@
 
 
 
-   tdbdump
-   tool for printing the contents of a TDB file
+   tdbrestore
+   tool for creating a TDB file out of a tdbdump 
output
 
 
 

-   tdbdump
-   filename
+   tdbrestore
+   tdbfilename

 
 
@@ -29,13 +29,15 @@
This tool is part of the 
samba
1 suite.
 
-   tdbdump is a very simple utility that 'dumps' 
the 
-   contents of a TDB (Trivial DataBase) file to standard output in 
a 
-   human-readable format.
+   tdbrestore is a very simple utility that 
'restores' the
+   contents of dump file into TDB (Trivial DataBase) file. The 
dump file is obtained from the tdbdump
+   command.

 
-   This tool can be used when debugging problems with TDB files. It 
is 
-   intended for those who are somewhat familiar with Samba 
internals.
+   This tool wait on the standard input for the content of the dump 
and will write the tdb in the tdbfilename
+  parameter.
+   
+   This tool can be used for unpacking the content of tdb as backup 
mean.

 
 
@@ -53,9 +55,12 @@
The original Samba software and related utilities were created by 
Andrew Tridgell.
Samba is now developed by the Samba Team as an Open Source project 
similar to the way
the Linux kernel is developed.
-
 
-   The tdbdump man page was written by Jelmer Vernooij.
+This tool was initially written by Volker Lendecke based on an
+idea by Simon McVittie.
+   
+
+   The tdbrestore man page was written by Matthieu Patou.
 
 
 
diff --git a/lib/tdb/tdb.mk b/lib/tdb/tdb.mk
index 0dcd419..64d7996 100644
--- a/lib/tdb/tdb.mk
+++ b/lib/tdb/tdb.mk
@@ -1,7 +1,7 @@
 dirs::
@mkdir -p bin common tools
 
-PROGS = bin/tdbtool$(EXEEXT) bin/tdbdump$(EXEEXT) bin/tdbbackup$(EXEEXT)
+PROGS = bin/tdbtool$(EXEEXT) bin/tdbrestore$(EXEEXT) bin/tdbdump$(EXEEXT) 
bin/tdbbackup$(EXEEXT)
 PROGS_NOINSTALL = bin/tdbtest$(EXEEXT) bin/tdbtorture$(EXEEXT)
 ALL_PROGS = $(PROGS) $(PROGS_NOINSTALL)
 
@@ -23,6 +23,9 @@ bin/tdbtorture$(EXEEXT): tools/tdbtorture.o $(TDB_LIB)
 bin/tdbdump$(EXEEXT): tools/tdbdump.o $(TDB_LIB)
$(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbdump tools/tdbdump.o -L. -ltdb 
$(TDB_DEPS)
 
+bin/tdbrestore$(EXEEXT): tools/tdbrestore.o $(TDB_LIB)
+   $(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbrestore tools/tdbrestore.o -L. 
-ltdb $(TDB_DEPS)
+
 bin/tdbbackup$(EXEEXT): tools/tdbbackup.o $(TDB_LIB)
$(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbbackup tools/t

[SCM] Samba Shared Repository - branch master updated

2010-09-23 Thread Volker Lendecke
The branch, master has been updated
   via  6673146 tdb: add restore
  from  e74b709 selftest: Pass prefix to setup_env function.

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


- Log -
commit 66731461a6882faf5ec6ba23944e4d4b357125b7
Author: Volker Lendecke 
Date:   Sat Sep 18 10:56:10 2010 +0400

tdb: add restore

Based on an idea by Simon McVittie, largely rewritten

---

Summary of changes:
 lib/tdb/config.mk  |9 +
 .../manpages/{tdbdump.8.xml => tdbrestore.8.xml}   |   31 ++--
 lib/tdb/tdb.mk |7 +-
 lib/tdb/tools/tdbrestore.c |  226 
 lib/tdb/wscript|4 +
 source3/Makefile.in|9 +
 source3/configure.in   |2 +
 7 files changed, 273 insertions(+), 15 deletions(-)
 copy lib/tdb/manpages/{tdbdump.8.xml => tdbrestore.8.xml} (56%)
 create mode 100644 lib/tdb/tools/tdbrestore.c


Changeset truncated at 500 lines:

diff --git a/lib/tdb/config.mk b/lib/tdb/config.mk
index b2e322c..22caada 100644
--- a/lib/tdb/config.mk
+++ b/lib/tdb/config.mk
@@ -35,6 +35,15 @@ PRIVATE_DEPENDENCIES = \
 tdbtorture_OBJ_FILES = $(tdbsrcdir)/tools/tdbtorture.o
 
 
+# Start BINARY tdbrestore
+[BINARY::tdbrestore]
+INSTALLDIR = BINDIR
+PRIVATE_DEPENDENCIES = \
+   LIBTDB
+# End BINARY tdbrestore
+
+
+
 # Start BINARY tdbdump
 [BINARY::tdbdump]
 INSTALLDIR = BINDIR
diff --git a/lib/tdb/manpages/tdbdump.8.xml b/lib/tdb/manpages/tdbrestore.8.xml
similarity index 56%
copy from lib/tdb/manpages/tdbdump.8.xml
copy to lib/tdb/manpages/tdbrestore.8.xml
index 90465e5..64c0ba2 100644
--- a/lib/tdb/manpages/tdbdump.8.xml
+++ b/lib/tdb/manpages/tdbrestore.8.xml
@@ -1,9 +1,9 @@
 
 http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd";>
-
+
 
 
-   tdbdump
+   tdbrestore
8
Samba
System Administration tools
@@ -12,14 +12,14 @@
 
 
 
-   tdbdump
-   tool for printing the contents of a TDB file
+   tdbrestore
+   tool for creating a TDB file out of a tdbdump 
output
 
 
 

-   tdbdump
-   filename
+   tdbrestore
+   tdbfilename

 
 
@@ -29,13 +29,15 @@
This tool is part of the 
samba
1 suite.
 
-   tdbdump is a very simple utility that 'dumps' 
the 
-   contents of a TDB (Trivial DataBase) file to standard output in 
a 
-   human-readable format.
+   tdbrestore is a very simple utility that 
'restores' the
+   contents of dump file into TDB (Trivial DataBase) file. The 
dump file is obtained from the tdbdump
+   command.

 
-   This tool can be used when debugging problems with TDB files. It 
is 
-   intended for those who are somewhat familiar with Samba 
internals.
+   This tool wait on the standard input for the content of the dump 
and will write the tdb in the tdbfilename
+  parameter.
+   
+   This tool can be used for unpacking the content of tdb as backup 
mean.

 
 
@@ -53,9 +55,12 @@
The original Samba software and related utilities were created by 
Andrew Tridgell.
Samba is now developed by the Samba Team as an Open Source project 
similar to the way
the Linux kernel is developed.
-
 
-   The tdbdump man page was written by Jelmer Vernooij.
+This tool was initially written by Volker Lendecke based on an
+idea by Simon McVittie.
+   
+
+   The tdbrestore man page was written by Matthieu Patou.
 
 
 
diff --git a/lib/tdb/tdb.mk b/lib/tdb/tdb.mk
index 0dcd419..64d7996 100644
--- a/lib/tdb/tdb.mk
+++ b/lib/tdb/tdb.mk
@@ -1,7 +1,7 @@
 dirs::
@mkdir -p bin common tools
 
-PROGS = bin/tdbtool$(EXEEXT) bin/tdbdump$(EXEEXT) bin/tdbbackup$(EXEEXT)
+PROGS = bin/tdbtool$(EXEEXT) bin/tdbrestore$(EXEEXT) bin/tdbdump$(EXEEXT) 
bin/tdbbackup$(EXEEXT)
 PROGS_NOINSTALL = bin/tdbtest$(EXEEXT) bin/tdbtorture$(EXEEXT)
 ALL_PROGS = $(PROGS) $(PROGS_NOINSTALL)
 
@@ -23,6 +23,9 @@ bin/tdbtorture$(EXEEXT): tools/tdbtorture.o $(TDB_LIB)
 bin/tdbdump$(EXEEXT): tools/tdbdump.o $(TDB_LIB)
$(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbdump tools/tdbdump.o -L. -ltdb 
$(TDB_DEPS)
 
+bin/tdbrestore$(EXEEXT): tools/tdbrestore.o $(TDB_LIB)
+   $(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbrestore tools/tdbrestore.o -L. 
-ltdb $(TDB_DEPS)
+
 bin/tdbbackup$(EXEEXT): tools/tdbbackup.o $(TDB_LIB)
$(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbbackup tools/tdbbackup.o -L. -ltdb 
$(TDB_DEPS)
 
@@ -53,7 +56,7 @@ tdb.$(SHLIBEXT): libtdb.$(SHLIBEXT) pytdb.o
 ins

[SCM] Samba Shared Repository - branch master updated

2010-09-23 Thread Jelmer Vernooij
The branch, master has been updated
   via  e74b709 selftest: Pass prefix to setup_env function.
   via  4c3985b selftest: Use variable for clientdir.
   via  4b901f6 torture: Remove unused variable.
  from  133878f s3-waf: convert LIBMSRPC into a subsystem.

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


- Log -
commit e74b7091cd97eba52227d8e93d003043a2f1a0cf
Author: Jelmer Vernooij 
Date:   Thu Sep 23 10:28:22 2010 -0700

selftest: Pass prefix to setup_env function.

commit 4c3985b584e89cb90e49c352f53da5621107c453
Author: Jelmer Vernooij 
Date:   Thu Sep 23 01:42:57 2010 -0700

selftest: Use variable for clientdir.

commit 4b901f6d8b898a7582a167835071c856f267536f
Author: Jelmer Vernooij 
Date:   Wed Sep 22 23:40:20 2010 -0700

torture: Remove unused variable.

---

Summary of changes:
 lib/torture/torture.c |1 -
 selftest/selftest.pl  |   46 --
 2 files changed, 24 insertions(+), 23 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/torture/torture.c b/lib/torture/torture.c
index 379f1dd..74dfce1 100644
--- a/lib/torture/torture.c
+++ b/lib/torture/torture.c
@@ -339,7 +339,6 @@ static bool internal_torture_run_test(struct 
torture_context *context,
  const char **restricted)
 {
bool success;
-   char *old_testname = NULL;
char *subunit_testname = NULL;
 
if (tcase == NULL || strcmp(test->name, tcase->name) != 0) { 
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 4ed168c..37360b9 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -529,31 +529,33 @@ my $interfaces = join(',', ("127.0.0.11/8",
"127.0.0.15/8",
"127.0.0.16/8"));
 
-my $conffile = "$prefix_abs/client/client.conf";
+my $clientdir = "$prefix_abs/client";
+
+my $conffile = "$clientdir/client.conf";
 $ENV{SMB_CONF_PATH} = $conffile;
 
-sub write_clientconf($$)
+sub write_clientconf($$$)
 {
-   my ($conffile, $vars) = @_;
+   my ($conffile, $clientdir, $vars) = @_;
 
-   mkdir("$prefix/client", 0777) unless -d "$prefix/client";
+   mkdir("$clientdir", 0777) unless -d "$clientdir";
 
-   if ( -d "$prefix/client/private" ) {
-   unlink <$prefix/client/private/*>;
+   if ( -d "$clientdir/private" ) {
+   unlink <$clientdir/private/*>;
} else {
-   mkdir("$prefix/client/private", 0777);
+   mkdir("$clientdir/private", 0777);
}
 
-   if ( -d "$prefix/client/lockdir" ) {
-   unlink <$prefix/client/lockdir/*>;
+   if ( -d "$clientdir/lockdir" ) {
+   unlink <$clientdir/lockdir/*>;
} else {
-   mkdir("$prefix/client/lockdir", 0777);
+   mkdir("$clientdir/lockdir", 0777);
}
 
-   if ( -d "$prefix_abs/client/ncalrpcdir" ) {
-   unlink <$prefix/client/ncalrpcdir/*>;
+   if ( -d "$clientdir/ncalrpcdir" ) {
+   unlink <$clientdir/ncalrpcdir/*>;
} else {
-   mkdir("$prefix/client/ncalrpcdir", 0777);
+   mkdir("$clientdir/ncalrpcdir", 0777);
}
 
open(CF, ">$conffile");
@@ -574,9 +576,9 @@ sub write_clientconf($$)
print CF "\tinterfaces = $interfaces\n";
}
print CF "
-   private dir = $prefix_abs/client/private
-   lock dir = $prefix_abs/client/lockdir
-   ncalrpc dir = $prefix_abs/client/ncalrpcdir
+   private dir = $clientdir/private
+   lock dir = $clientdir/lockdir
+   ncalrpc dir = $clientdir/ncalrpcdir
name resolve order = bcast file
panic action = $RealBin/gdb_backtrace \%PID\% \%PROG\%
max xmit = 32K
@@ -585,7 +587,7 @@ sub write_clientconf($$)
system:anonymous = true
client lanman auth = Yes
log level = 1
-   torture:basedir = $prefix_abs/client
+   torture:basedir = $clientdir
 #We don't want to pass our self-tests if the PAC code is wrong
gensec:require_pac = true
modules dir = $ENV{LD_SAMBA_MODULE_PATH}
@@ -807,9 +809,9 @@ $SIG{INT} = $SIG{QUIT} = $SIG{TERM} = sub {
die("Received signal $signame");
 };
 
-sub setup_env($)
+sub setup_env($$)
 {
-   my ($name) = @_;
+   my ($name, $prefix) = @_;
 
my $testenv_vars = undef;
 
@@ -843,7 +845,7 @@ sub setup_env($)
$ENV{SMB_CONF_PATH} = $testenv_vars->{SERVERCONFFILE};
} elsif ($option eq "client") {
SocketWrapper::set_default_iface(11);
-   write_clientconf($conffile, $testenv_vars);
+   write_clientconf($conffile, $clientdir, $testenv_vars);
$ENV{SMB_CONF_PATH} = $conffile;
} else {
die("Unknown option[$option] for envname[$envname]");
@@ 

[SCM] Samba Shared Repository - branch master updated

2010-09-23 Thread Günther Deschner
The branch, master has been updated
   via  133878f s3-waf: convert LIBMSRPC into a subsystem.
  from  43b5f20 s3-waf: fix the build after rpc_server crypto changes.

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


- Log -
commit 133878fe68b2522a46d1c347815779fe0c1ede01
Author: Günther Deschner 
Date:   Thu Sep 23 11:14:00 2010 -0700

s3-waf: convert LIBMSRPC into a subsystem.

Guenther

---

Summary of changes:
 source3/wscript_build |   50 ++--
 1 files changed, 23 insertions(+), 27 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/wscript_build b/source3/wscript_build
index 09d28e2..f833b59 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -719,7 +719,6 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c
../nsswitch/libwbclient/wb_reqtrans.c'''
 
 WINBINDD_SRC = '''${WINBINDD_SRC1}
-  ${LIBMSRPC_SRC}
   ${PROFILE_SRC} ${SLCACHE_SRC}
   ${DCUTIL_SRC} ${IDMAP_SRC} ${NSS_INFO_SRC}
   ${AFS_SRC} ${AFS_SETTOKEN_SRC}
@@ -786,7 +785,6 @@ SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
 ${LOCKING_SRC} ${PRINTING_SRC}
 ${PROFILE_SRC} ${PRINTBACKEND_SRC}
 ${OPLOCK_SRC} ${NOTIFY_SRC} ${FNAME_UTIL_SRC}
-${LIBMSRPC_SRC}
 ${REG_FULL_SRC}
 ${BUILDOPT_SRC}
 ${LIBNET_SRC} ${LIBSMBCONF_SRC}
@@ -842,7 +840,6 @@ SWAT_SRC1 = '''web/cgi.c web/diagnose.c web/startstop.c 
web/statuspage.c
 SWAT_SRC = '''${SWAT_SRC1} ${PRINTING_SRC} ${PRINTBASE_SRC}
${LOCKING_SRC}
${PLAINTEXT_AUTH_SRC}
-   ${LIBMSRPC_SRC}
${PASSCHANGE_SRC} ${FNAME_UTIL_SRC}
${LIBCLI_SAMR_SRC}
rpc_client/init_lsa.c'''
@@ -856,7 +853,6 @@ SMBCONTROL_SRC = '''utils/smbcontrol.c ${PRINTBASE_SRC}'''
 
 SMBTREE_SRC = '''utils/smbtree.c
  ${PROFILE_SRC}
- ${LIBMSRPC_SRC}
  ${LIBCLI_SRVSVC_SRC}'''
 
 TESTPARM_SRC = 'utils/testparm.c'
@@ -868,7 +864,6 @@ TEST_LP_LOAD_SRC = '''param/test_lp_load.c'''
 PASSWD_UTIL_SRC = 'utils/passwd_util.c'
 
 SMBPASSWD_SRC = '''utils/smbpasswd.c ${PASSWD_UTIL_SRC} ${PASSCHANGE_SRC}
-${LIBMSRPC_SRC}
 ${LIBCLI_SAMR_SRC}
 rpc_client/init_lsa.c'''
 
@@ -891,7 +886,6 @@ RPCCLIENT_SRC1 = '''rpcclient/rpcclient.c 
rpcclient/cmd_lsarpc.c
 ${DISPLAY_SEC_SRC}'''
 
 RPCCLIENT_SRC = '''${RPCCLIENT_SRC1}
-   ${LIBMSRPC_SRC}
${READLINE_SRC}
${DCUTIL_SRC}
${LIBCLI_SPOOLSS_SRC}
@@ -930,7 +924,6 @@ LIBSMBCLIENT_SRC0 = '''libsmb/libsmb_cache.c
 libsmb/libsmb_setget.c'''
 
 LIBSMBCLIENT_SRC1 = '''${LIBSMBCLIENT_SRC0}
-${LIBMSRPC_SRC}
 ${LIBCLI_SRVSVC_SRC}
 ${LIBCLI_LSA_SRC}'''
 
@@ -960,7 +953,6 @@ LIBNETAPI_SRC0 = '''lib/netapi/netapi.c
 LIBNETAPI_SRC = '''${LIBNETAPI_SRC0} ${LIBNET_SRC}
${LIBSMBCONF_SRC}
${REG_SMBCONF_SRC}
-   ${LIBMSRPC_SRC}
${DCUTIL_SRC} ${PRIVILEGES_BASIC_SRC}
auth/token_util.c
${LIBCLI_INITSHUTDOWN_SRC}
@@ -976,8 +968,7 @@ LIBNETAPI_SRC = '''${LIBNETAPI_SRC0} ${LIBNET_SRC}
 # FIXME:  bigballofmud
 
 CLIENT_SRC1 = '''client/client.c client/clitar.c
- client/dnsbrowse.c
- ${LIBMSRPC_SRC}'''
+ client/dnsbrowse.c'''
 
 CLIENT_SRC = '''${CLIENT_SRC1}
 ${READLINE_SRC} ${DISPLAY_SEC_SRC}
@@ -1046,7 +1037,6 @@ NET_SRC2 = 'utils/net_registry_util.c 
utils/net_help_common.c'
 
 NET_SRC = '''${NET_SRC1}
  ${NET_SRC2}
- ${LIBMSRPC_SRC}
  ${DCUTIL_SRC}
  ${AFS_SRC} ${AFS_SETTOKEN_SRC} ${READLINE_SRC}
  ${LIBGPO_SRC} ${DISPLAY_SEC_SRC}
@@ -1087,11 +1077,9 @@ LOCKTEST2_SRC = '''torture/locktest2.c ${LOCKING_SRC}
 ${FNAME_UTIL_SRC}'''
 
 SMBCACLS_SRC = '''utils/smbcacls.c
-${LIBMSRPC_SRC}
 ${LIBCLI_LSA_SRC}'''
 
 SMBCQUOTAS_SRC = '''utils/smbcquotas.c
-${LIBMSRPC_SRC}
 ${LIBCLI_LSA_SRC}'''
 
 EVTLOGADM_SRC0 = 'utils/eventlogadm.c'
@@ -1142,7 +1130,7 @@ VLP_SRC = '''printing/tests/vlp.c
   ${LIBSAMBAUTIL_SRC}
   param/util.c'''
 
-RPC_OPEN_TCP_SRC = 'torture/rpc_open_tcp.c ${LIBMSRPC_SRC}'
+RPC_OPEN_TCP_SRC = 'torture/rpc_open_tcp.c'
 
 DBWRAP_TOOL_SRC = 'utils/dbwrap_tool.c'
 
@@ -1214,12 +1202,13 @@ bld.SAMBA_LIBRARY('libnetapi',
 source=LIBNETAPI_SRC,
 public_deps='''talloc tdb cap libwbclient LIB_NONSMBD 
LIBSMB KRBCLIENT
 PA

[SCM] Samba Shared Repository - branch master updated

2010-09-23 Thread Günther Deschner
The branch, master has been updated
   via  43b5f20 s3-waf: fix the build after rpc_server crypto changes.
  from  76f249f s3-dcerps: check auth_type

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


- Log -
commit 43b5f209f138039517742a3bf9e7fe64f596f7d1
Author: Günther Deschner 
Date:   Thu Sep 23 11:05:56 2010 -0700

s3-waf: fix the build after rpc_server crypto changes.

Guenther

---

Summary of changes:
 source3/wscript_build |   12 
 1 files changed, 8 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/wscript_build b/source3/wscript_build
index a78cab6..09d28e2 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -347,9 +347,9 @@ LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c 
libsmb/clifile.c
 LIBMSRPC_SRC = '''
${SCHANNEL_SRC}
rpc_client/cli_pipe.c
-   librpc/rpc/dcerpc_krb5.c
-   librpc/rpc/dcerpc_gssapi.c
-   librpc/rpc/dcerpc_spnego.c
+   librpc/crypto/gse_krb5.c
+   librpc/crypto/gse.c
+   librpc/crypto/cli_spnego.c
librpc/rpc/rpc_common.c
rpc_client/rpc_transport_np.c
rpc_client/rpc_transport_sock.c
@@ -465,8 +465,12 @@ RPC_NCACN_NP = '''rpc_server/srv_pipe_register.c 
rpc_server/rpc_ncacn_np.c
 
 RPC_SERVICE = '''rpc_server/rpc_server.c'''
 
+RPC_CRYPTO = '''rpc_server/dcesrv_ntlmssp.c
+rpc_server/dcesrv_gssapi.c
+rpc_server/dcesrv_spnego.c'''
+
 RPC_PIPE_SRC = '''rpc_server/srv_pipe_hnd.c rpc_server/srv_pipe.c
-   ${RPC_NCACN_NP} ${RPC_SERVICE}'''
+   ${RPC_NCACN_NP} ${RPC_SERVICE} ${RPC_CRYPTO}'''
 
 RPC_RPCECHO_SRC = '''rpc_server/srv_echo_nt.c ../librpc/gen_ndr/srv_echo.c'''
 


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch master updated

2010-09-23 Thread Günther Deschner
The branch, master has been updated
   via  76f249f s3-dcerps: check auth_type
   via  926a3f4 s3-dcerpc: Use spnego own sign/seal functions
   via  6789934 libcli: fix compile warning
   via  b11fff1 s3-dcerpc: remove auth_data_free_func
   via  3453bc7 s3-dcerpc: make auth context opaque
   via  0ec3720 srv_pipe: reorganize code so that related functions are 
close to each other
   via  d10e192 s3-dcerpc: finally remove the legaqcy spnego_type variable 
from pipe_auth_data
   via  b475cfd s3-dcerpc: use new spnego server code
   via  4cdee9b s3-dcerpc: add spnego server helpers
   via  77c73a5 spnego: make spnego_context public
   via  2c9f420 s3-dcerpc: move client spnego stuff in /librpc/crypto
   via  59722ef spnego: avoid explicit dependency on dcerpc specific 
structures
   via  62d7226 s3-dcesrv: use gssapi helper in srv_pipe.c
   via  28c22d0 s3-dcerpc: add server helpers for gssapi auth
   via  8efd31c s3-dcesrv: use ntlmssp helper in srv_pipe.c
   via  bbf5357 s3-dcerpc: add server helpers for ntlmssp auth
   via  4194383 gssapi: remove unused function argument
   via  412ebad gssapi: avoid explicit dependency on dcerpc specific 
structures
   via  0e5eb82 s3-dcerpc: move crypto stuff in /librpc/crypto
  from  ffdfcfb s3-dsgetdcname: always pass in messaging context.

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


- Log -
commit 76f249fb44599450a12b7f0c62f5f3830d203a24
Author: Simo Sorce 
Date:   Sat Sep 11 09:52:42 2010 -0400

s3-dcerps: check auth_type

make sure the auth type used throught the auth operation is consistent.

Signed-off-by: Günther Deschner 

commit 926a3f4fcdb82c86dff94a9ac78010d59a04ea1b
Author: Simo Sorce 
Date:   Sat Sep 11 09:46:08 2010 -0400

s3-dcerpc: Use spnego own sign/seal functions

Signed-off-by: Günther Deschner 

commit 678993470fdc86a57841c7d35ec9c60f6b81c1cc
Author: Simo Sorce 
Date:   Fri Sep 3 16:43:38 2010 -0400

libcli: fix compile warning

Signed-off-by: Günther Deschner 

commit b11fff1f481a21d84b713421cfbfd42ef1e73f4b
Author: Simo Sorce 
Date:   Fri Sep 3 16:33:45 2010 -0400

s3-dcerpc: remove auth_data_free_func

Everything is using a talloc pointer now, no need to have an
accessor function to free data anymore.

Signed-off-by: Günther Deschner 

commit 3453bc7b1108390354c0825ee6b2b0bb28fca2f3
Author: Simo Sorce 
Date:   Fri Sep 3 16:27:47 2010 -0400

s3-dcerpc: make auth context opaque

This way we always double check in advance that the context
is of the right type with talloc_get_type_abort instead of
potentially accessing random memory by addressing the wrong
structure in the union.

Signed-off-by: Günther Deschner 

commit 0ec372057308198cd2f1742c4a56868e6dab7213
Author: Simo Sorce 
Date:   Fri Sep 3 15:09:34 2010 -0400

srv_pipe: reorganize code so that related functions are close to each other

Signed-off-by: Günther Deschner 

commit d10e192b83e2c016873d7c2198f62173834287f0
Author: Simo Sorce 
Date:   Fri Sep 3 11:03:49 2010 -0400

s3-dcerpc: finally remove the legaqcy spnego_type variable from 
pipe_auth_data

Signed-off-by: Günther Deschner 

commit b475cfd0b2376fdf2a8426f33be8c940b035fe26
Author: Simo Sorce 
Date:   Fri Sep 3 10:19:27 2010 -0400

s3-dcerpc: use new spnego server code

Signed-off-by: Günther Deschner 

commit 4cdee9b0eddd47ad2cfb866f63cdeb3f65200a3e
Author: Simo Sorce 
Date:   Tue Aug 31 15:08:31 2010 -0400

s3-dcerpc: add spnego server helpers

squashed: add michlistMIC signature checks

Signed-off-by: Günther Deschner 

commit 77c73a5ec92f9294195dfef977f66dfe66182c6d
Author: Simo Sorce 
Date:   Fri Sep 3 09:38:57 2010 -0400

spnego: make spnego_context public

Signed-off-by: Günther Deschner 

commit 2c9f420d75ac0a231b84c2d85e9470bb595d6daf
Author: Simo Sorce 
Date:   Thu Sep 2 17:50:21 2010 -0400

s3-dcerpc: move client spnego stuff in /librpc/crypto

Signed-off-by: Günther Deschner 

commit 59722ef2fb6973ac06de5c17c3f84995bac20816
Author: Simo Sorce 
Date:   Thu Sep 2 17:43:21 2010 -0400

spnego: avoid explicit dependency on dcerpc specific structures

Signed-off-by: Günther Deschner 

commit 62d7226b7898ade0dc19a5b13a9632fd096c5771
Author: Simo Sorce 
Date:   Wed Sep 1 18:31:05 2010 -0400

s3-dcesrv: use gssapi helper in srv_pipe.c

Signed-off-by: Günther Deschner 

commit 28c22d04fb816f1c4418b95e9e69710e488af94c
Author: Simo Sorce 
Date:   Wed Sep 1 18:27:53 2010 -0400

s3-dcerpc: add server helpers for gssapi auth

Signed-off-by: Günther Deschner 

commit 8efd31ccad96bb6da1bdb6bf2fbb8fe9d67b640e
Author: Simo Sorce 
Date:   Wed Sep 1 17:09:52 2010 -0400

s3-dcesrv: use ntlmssp helper in srv_pipe.c

Signed-off-by: Günther Deschner

[SCM] Samba Shared Repository - branch master updated

2010-09-23 Thread Günther Deschner
The branch, master has been updated
   via  ffdfcfb s3-dsgetdcname: always pass in messaging context.
  from  c3f5d99 s3:registry: try to fix the build of reg_parse_internal on 
HP-UX

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


- Log -
commit ffdfcfb514c1a0849ba334ae6b9b00d3ad3c2227
Author: Günther Deschner 
Date:   Tue Sep 21 20:56:23 2010 -0700

s3-dsgetdcname: always pass in messaging context.

Volker, please check.

Guenther

---

Summary of changes:
 source3/lib/netapi/getdc.c |6 +-
 source3/lib/netapi/joindomain.c|   18 +++---
 source3/lib/netapi/netapi_private.h|2 ++
 source3/libnet/libnet_samsync.c|4 
 source3/libnet/libnet_samsync.h|1 +
 source3/libnet/libnet_samsync_keytab.c |   22 --
 source3/libsmb/dsgetdcname.c   |   28 ++--
 source3/utils/net.c|6 ++
 source3/utils/net.h|1 +
 source3/utils/net_ads.c|2 ++
 source3/utils/net_lookup.c |2 +-
 11 files changed, 51 insertions(+), 41 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/netapi/getdc.c b/source3/lib/netapi/getdc.c
index 565ccbc..9042702 100644
--- a/source3/lib/netapi/getdc.c
+++ b/source3/lib/netapi/getdc.c
@@ -112,9 +112,13 @@ WERROR DsGetDcName_l(struct libnetapi_ctx *ctx,
 struct DsGetDcName *r)
 {
NTSTATUS status;
+   struct libnetapi_private_ctx *priv;
+
+   priv = talloc_get_type_abort(ctx->private_data,
+   struct libnetapi_private_ctx);
 
status = dsgetdcname(ctx,
-NULL,
+priv->msg_ctx,
 r->in.domain_name,
 r->in.domain_guid,
 r->in.site_name,
diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index 89a7c93..e5777a0 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -36,8 +36,12 @@ WERROR NetJoinDomain_l(struct libnetapi_ctx *mem_ctx,
   struct NetJoinDomain *r)
 {
struct libnet_JoinCtx *j = NULL;
+   struct libnetapi_private_ctx *priv;
WERROR werr;
 
+   priv = talloc_get_type_abort(mem_ctx->private_data,
+   struct libnetapi_private_ctx);
+
if (!r->in.domain) {
return WERR_INVALID_PARAM;
}
@@ -55,7 +59,7 @@ WERROR NetJoinDomain_l(struct libnetapi_ctx *mem_ctx,
uint32_t flags = DS_DIRECTORY_SERVICE_REQUIRED |
 DS_WRITABLE_REQUIRED |
 DS_RETURN_DNS_NAME;
-   status = dsgetdcname(mem_ctx, NULL, r->in.domain,
+   status = dsgetdcname(mem_ctx, priv->msg_ctx, r->in.domain,
 NULL, NULL, flags, &info);
if (!NT_STATUS_IS_OK(status)) {
libnetapi_set_error_string(mem_ctx,
@@ -154,6 +158,10 @@ WERROR NetUnjoinDomain_l(struct libnetapi_ctx *mem_ctx,
struct dom_sid domain_sid;
const char *domain = NULL;
WERROR werr;
+   struct libnetapi_private_ctx *priv;
+
+   priv = talloc_get_type_abort(mem_ctx->private_data,
+   struct libnetapi_private_ctx);
 
if (!secrets_fetch_domain_sid(lp_workgroup(), &domain_sid)) {
return WERR_SETUP_NOT_JOINED;
@@ -178,7 +186,7 @@ WERROR NetUnjoinDomain_l(struct libnetapi_ctx *mem_ctx,
uint32_t flags = DS_DIRECTORY_SERVICE_REQUIRED |
 DS_WRITABLE_REQUIRED |
 DS_RETURN_DNS_NAME;
-   status = dsgetdcname(mem_ctx, NULL, domain,
+   status = dsgetdcname(mem_ctx, priv->msg_ctx, domain,
 NULL, NULL, flags, &info);
if (!NT_STATUS_IS_OK(status)) {
libnetapi_set_error_string(mem_ctx,
@@ -348,8 +356,12 @@ WERROR NetGetJoinableOUs_l(struct libnetapi_ctx *ctx,
const char *dc = NULL;
uint32_t flags = DS_DIRECTORY_SERVICE_REQUIRED |
 DS_RETURN_DNS_NAME;
+   struct libnetapi_private_ctx *priv;
+
+   priv = talloc_get_type_abort(ctx->private_data,
+   struct libnetapi_private_ctx);
 
-   status = dsgetdcname(ctx, NULL, r->in.domain,
+   status = dsgetdcname(ctx, priv->msg_ctx, r->in.domain,
 NULL, NULL, flags, &info);
if (!NT_STATUS_IS_OK(status)) {
libnetapi_set_error_string(ctx, "%s",
diff --git a/source3/lib/netapi/netapi_private.h 
b/source3/lib/netapi/netapi_private.h
index d0f7756..859c064 100644
--- a/source3/lib/netapi/netapi_private.

[SCM] Samba Shared Repository - branch master updated

2010-09-23 Thread Michael Adam
The branch, master has been updated
   via  c3f5d99 s3:registry: try to fix the build of reg_parse_internal on 
HP-UX
  from  82c0e79 s3: fix tdbdump build on Solaris and other boxes

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


- Log -
commit c3f5d990652aec4b4f1f23a5e1c7b644cd46cbe7
Author: Michael Adam 
Date:   Thu Sep 23 18:48:25 2010 +0200

s3:registry: try to fix the build of reg_parse_internal on HP-UX

The HP compiler does not seem to like {} for char[4].

---

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


Changeset truncated at 500 lines:

diff --git a/source3/registry/reg_parse_internal.c 
b/source3/registry/reg_parse_internal.c
index 64c4e06..3d3cf47 100644
--- a/source3/registry/reg_parse_internal.c
+++ b/source3/registry/reg_parse_internal.c
@@ -262,7 +262,7 @@ static const struct {
{"UTF-16LE", CH_UTF16LE, 2, {0xFF, 0xFE}},
{"UTF-16BE", CH_UTF16BE, 2, {0xFE, 0xFF}},
{"UTF-32BE", CH_INVALID, 4, {0x00, 0x00, 0xFE, 0xFF}},
-   {NULL,   CH_INVALID, 0, {}}
+   {NULL,   CH_INVALID, 0}
 };
 
 bool srprs_bom(const char** ptr, const char** name, charset_t* ctype)


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch master updated

2010-09-23 Thread Björn Jacke
The branch, master has been updated
   via  82c0e79 s3: fix tdbdump build on Solaris and other boxes
  from  80e240f s3 waf: Remove iniparser source list from 
source3/wscript_build

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


- Log -
commit 82c0e79b8d8c693c128e83d8062e1543f3bb311d
Author: Björn Jacke 
Date:   Thu Sep 23 09:25:58 2010 -0700

s3: fix tdbdump build on Solaris and other boxes

needed to fix up aea64ef275b6e94ca7afb8fa2bb172416773abdf

---

Summary of changes:
 source3/Makefile.in |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 25d121a..2f32251 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -3034,7 +3034,7 @@ bin/tdbt...@exeext@: $(BINARY_PREREQS) $(TDBTOOL_OBJ) 
$(LIBTALLOC) $(LIBTDB)
 
 bin/tdbd...@exeext@: $(BINARY_PREREQS) $(TDBDUMP_OBJ) $(LIBTDB)
@echo Linking $@
-   @$(CC) -o $@ $(LDFLAGS) $(TDBDUMP_OBJ) $(DYNEXP) $(LIBTDB_LIBS)
+   @$(CC) -o $@ $(LDFLAGS) $(TDBDUMP_OBJ) $(DYNEXP) $(LIBTDB_LIBS) 
$(LIBREPLACE_LIBS)
 
 bin/tdbtort...@exeext@: $(BINARY_PREREQS) $(TDBTORTURE_OBJ) $(LIBTALLOC) 
$(LIBTDB)
@echo Linking $@


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch master updated

2010-09-23 Thread Kai Blin
The branch, master has been updated
   via  80e240f s3 waf: Remove iniparser source list from 
source3/wscript_build
  from  67b6252 s4/dsdb:kcc: cleanup and improve readability

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


- Log -
commit 80e240fe17b9f12663e09a84a29955d2bf8ed1cd
Author: Kai Blin 
Date:   Thu Sep 23 09:16:05 2010 -0700

s3 waf: Remove iniparser source list from source3/wscript_build

---

Summary of changes:
 source3/wscript_build |6 +-
 1 files changed, 1 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/wscript_build b/source3/wscript_build
index 41fbcd0..a78cab6 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -907,8 +907,7 @@ RPCCLIENT_SRC = '''${RPCCLIENT_SRC1}
rpc_client/init_netlogon.c
rpc_client/init_samr.c'''
 
-PAM_WINBIND_SRC = '''../nsswitch/pam_winbind.c ${WBCOMMON_SRC}
-  ${LIBREPLACE_SRC} ${INIPARSER_SRC}'''
+PAM_WINBIND_SRC = '../nsswitch/pam_winbind.c ${WBCOMMON_SRC} ${LIBREPLACE_SRC}'
 
 LIBSMBCLIENT_THREAD_SRC = '''libsmb/libsmb_thread_impl.c
 libsmb/libsmb_thread_posix.c'''
@@ -1124,9 +1123,6 @@ WINBIND_KRB5_LOCATOR_SRC = 
'''${WINBIND_KRB5_LOCATOR_SRC1} ${LIBREPLACE_SRC}'''
 POPT_SRC = '''../lib/popt/findme.c ../lib/popt/popt.c ../lib/popt/poptconfig.c 
\
   ../lib/popt/popthelp.c ../lib/popt/poptparse.c'''
 
-INIPARSER_SRC = '''../lib/iniparser_build/iniparser.c 
../lib/iniparser_build/dictionary.c
-../lib/iniparser_build/strlib.c'''
-
 NTLM_AUTH_SRC1 = '''utils/ntlm_auth.c utils/ntlm_auth_diagnostics.c'''
 
 NTLM_AUTH_SRC = '''${NTLM_AUTH_SRC1}


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch master updated

2010-09-23 Thread Anatoliy Atanasov
The branch, master has been updated
   via  67b6252 s4/dsdb:kcc: cleanup and improve readability
   via  519180c s4:dsdb/kcc: we don't need to manually allocate [out,ref] 
pointers anymore
   via  224fbbe s4:irpc: use LIBNDR_FLAG_REF_ALLOC for the server side when 
pulling
   via  be0ed31 s4:irpc: add padding to the IPRC header for 8 byte alignment
  from  148d4fa s3-waf: first run in using NDR_ subsystems (mostly from 
shared directory).

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


- Log -
commit 67b6252eedbde910da4effb3c3f62af449e3503a
Author: Anatoliy Atanasov 
Date:   Wed Sep 22 19:20:21 2010 -0700

s4/dsdb:kcc: cleanup and improve readability

commit 519180c341edd1be51fbbb622132c2f5d9a37731
Author: Stefan Metzmacher 
Date:   Wed Sep 22 19:18:25 2010 -0700

s4:dsdb/kcc: we don't need to manually allocate [out,ref] pointers anymore

metze

Signed-off-by: Anatoliy Atanasov 

commit 224fbbe33fbb4acea1c0907b1b7566d749521a92
Author: Stefan Metzmacher 
Date:   Wed Sep 22 19:04:58 2010 -0700

s4:irpc: use LIBNDR_FLAG_REF_ALLOC for the server side when pulling

The dcerpc server also uses it, so it was surprising that the
IRPC server side doesn't used it.

The reason to have this is that we want to handle error cases
and returns like NT_STATUS_NOT_SUPPORTED sane, without crashing
while marshalling the response.

metze

Signed-off-by: Anatoliy Atanasov 

commit be0ed310b335b5098f2ba475a709c1832de10127
Author: Stefan Metzmacher 
Date:   Wed Sep 22 18:55:40 2010 -0700

s4:irpc: add padding to the IPRC header for 8 byte alignment

As we marshall the iprc header and the payload to the ndr_push
context, we should pad the irpc header to let the payload start
at an 8 byte boundary.

This way we get the alignment still be correct if we remove the
header before passing the raw payload to the caller.

As we use IRPC more and more for complex NDR marshalled structures
we need to get this right, in order to not get random ndr_pull failures.

metze

Signed-off-by: Anatoliy Atanasov 

---

Summary of changes:
 source4/dsdb/kcc/kcc_drs_replica_info.c |   16 ++--
 source4/lib/messaging/messaging.c   |2 ++
 source4/librpc/idl/irpc.idl |1 +
 3 files changed, 9 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/kcc/kcc_drs_replica_info.c 
b/source4/dsdb/kcc/kcc_drs_replica_info.c
index 1701056..05f9434 100644
--- a/source4/dsdb/kcc/kcc_drs_replica_info.c
+++ b/source4/dsdb/kcc/kcc_drs_replica_info.c
@@ -630,10 +630,11 @@ static WERROR 
kccdrs_replica_get_info_neighbours(TALLOC_CTX *mem_ctx,
 
/* append the neighbour to the 
neighbours array */
reply->neighbours->array = 
talloc_realloc(mem_ctx,
-   
reply->neighbours->array,
-   
struct drsuapi_DsReplicaNeighbour,
-   
reply->neighbours->count + 1);
-   
reply->neighbours->array[reply->neighbours->count++] = neigh;
+   
  reply->neighbours->array,
+   
  struct drsuapi_DsReplicaNeighbour,
+   
  reply->neighbours->count + 1);
+   
reply->neighbours->array[reply->neighbours->count] = neigh;
+   reply->neighbours->count++;
j++;
}
 
@@ -813,12 +814,7 @@ NTSTATUS kccdrs_replica_get_info(struct irpc_message *msg,
value_dn = req2->value_dn_str;
}
 
-   /* allocate the reply and fill in some fields */
-   reply = talloc_zero(mem_ctx, union drsuapi_DsReplicaInfo);
-   NT_STATUS_HAVE_NO_MEMORY(reply);
-   req->out.info = reply;
-   req->out.info_type = talloc(mem_ctx, enum drsuapi_DsReplicaInfoType);
-   NT_STATUS_HAVE_NO_MEMORY(req->out.info_type);
+   reply = req->out.info;
*req->out.info_type = info_type;
 
/* Based on the infoType requested, retrieve the corresponding
diff --git a/source4/lib/messaging/messaging.c 
b/source4/lib/messaging/messaging.c
index d880c63..724d66a 100644
--- a/source4/lib/messaging/messaging.c
+++ b/source4/lib/messaging/messaging.c
@@ -769,6 +769,8 @@ static void irpc_handler_request(struct messaging_contex

[SCM] Samba Shared Repository - branch master updated

2010-09-23 Thread Günther Deschner
The branch, master has been updated
   via  148d4fa s3-waf: first run in using NDR_ subsystems (mostly from 
shared directory).
   via  ce6ef80 s4-waf: add NDR_LSARPC and NDR_SAMR.
   via  6abf9cc s3-waf: convert LIBADS_PRINTER into a subsystem.
   via  5fb686c s3-waf: convert LIBADS_SERVER into a subsystem.
   via  29b1588 s3-waf: convert LIBADS into a subsystem.
   via  697090f s3-waf: convert smbd into a subsystem.
   via  d6121bd s3-waf: add libaddns.so.
   via  9bba222 s3-waf: recurse into ../lib/crypto.
   via  43e3555 s4-waf: move two more NDR_ subsystems to main directory.
   via  2475210 s3-waf: convert LIBMSRPC_GEN into a subsystem.
   via  ea228cd s3-build: move epmapper client to LIBMSRPC.
   via  e8df0db s3-waf: move epmapper client to LIBMSRPC.
   via  494dc55 s3-waf: recurse into main wscript_build from main librpc 
directory.
  from  7f53773 waf: fix generated nbt.h path, should fix s4 install.

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


- Log -
commit 148d4fa6899abab05481efae593cfc43cfe21d3c
Author: Günther Deschner 
Date:   Thu Sep 23 07:58:33 2010 -0700

s3-waf: first run in using NDR_ subsystems (mostly from shared directory).

Guenther

commit ce6ef803ce36b69f914f59b3e494e8e9398342ff
Author: Günther Deschner 
Date:   Thu Sep 23 07:56:38 2010 -0700

s4-waf: add NDR_LSARPC and NDR_SAMR.

Guenther

commit 6abf9cc89c98bd5172d27a72a7f634d9fb45e786
Author: Günther Deschner 
Date:   Thu Sep 23 07:05:11 2010 -0700

s3-waf: convert LIBADS_PRINTER into a subsystem.

Guenther

commit 5fb686cbc5c2e407772ad257da1a30628e6927e8
Author: Günther Deschner 
Date:   Thu Sep 23 07:01:52 2010 -0700

s3-waf: convert LIBADS_SERVER into a subsystem.

Guenther

commit 29b1588adf50a520e78f70c40b3f4707a1bc46b9
Author: Günther Deschner 
Date:   Thu Sep 23 06:56:36 2010 -0700

s3-waf: convert LIBADS into a subsystem.

Guenther

commit 697090fb2d7644ac1e29c19fb9784c90b6860c5e
Author: Günther Deschner 
Date:   Thu Sep 23 06:45:56 2010 -0700

s3-waf: convert smbd into a subsystem.

Guenther

commit d6121bdee06f32ffcf4a22ff50b728ea1e47c394
Author: Günther Deschner 
Date:   Thu Sep 23 06:26:15 2010 -0700

s3-waf: add libaddns.so.

Guenther

commit 9bba222e8a960f790904527fb9c7443299f5882d
Author: Günther Deschner 
Date:   Thu Sep 23 06:15:13 2010 -0700

s3-waf: recurse into ../lib/crypto.

Guenther

commit 43e3555ed94131da9ef7fc9a8bd3d81ce9ec6db4
Author: Günther Deschner 
Date:   Thu Sep 23 05:54:12 2010 -0700

s4-waf: move two more NDR_ subsystems to main directory.

Guenther

commit 247521064ff0fcb6763c1e337f277227b4cef421
Author: Günther Deschner 
Date:   Thu Sep 23 02:14:23 2010 -0700

s3-waf: convert LIBMSRPC_GEN into a subsystem.

Guenther

commit ea228cdf7c73c5fd4ae1f22c118d56629c1c58ec
Author: Günther Deschner 
Date:   Thu Sep 23 01:52:15 2010 -0700

s3-build: move epmapper client to LIBMSRPC.

Guenther

commit e8df0db8c4c2304a8528cd84f6871509321b706a
Author: Günther Deschner 
Date:   Thu Sep 23 01:51:53 2010 -0700

s3-waf: move epmapper client to LIBMSRPC.

Guenther

commit 494dc5565bf3b76c4acb7afb37dda9a4bae51889
Author: Günther Deschner 
Date:   Tue Sep 21 01:24:13 2010 -0700

s3-waf: recurse into main wscript_build from main librpc directory.

Not doing anything with it yet though.

Guenther

---

Summary of changes:
 librpc/wscript_build |   20 
 source3/Makefile.in  |6 +-
 source3/wscript_build|  211 +-
 source4/librpc/wscript_build |   17 +---
 4 files changed, 151 insertions(+), 103 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/wscript_build b/librpc/wscript_build
index 246a054..d4f941e 100644
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -117,6 +117,16 @@ bld.SAMBA_SUBSYSTEM('NDR_REMACT',
public_deps='LIBNDR NDR_ORPC'
)
 
+bld.SAMBA_SUBSYSTEM('NDR_DCOM',
+   source='../librpc/gen_ndr/ndr_dcom.c',
+   public_deps='LIBNDR NDR_SECURITY NDR_ORPC'
+   )
+
+bld.SAMBA_SUBSYSTEM('NDR_WMI',
+   source='../librpc/ndr/ndr_wmi.c ../librpc/gen_ndr/ndr_wmi.c',
+   public_deps='LIBNDR NDR_SECURITY NDR_DCOM'
+   )
+
 bld.SAMBA_SUBSYSTEM('NDR_WZCSVC',
source='../librpc/gen_ndr/ndr_wzcsvc.c',
public_deps='LIBNDR'
@@ -172,6 +182,16 @@ bld.SAMBA_SUBSYSTEM('NDR_NTPRINTING',
public_deps='LIBNDR'
)
 
+bld.SAMBA_SUBSYSTEM('NDR_SAMR',
+   source='../librpc/gen_ndr/ndr_samr.c',
+   public_deps='LIBNDR NDR_SECURITY NDR_LSARPC'
+   )
+
+bld.SAMBA_SUBSYSTEM('NDR_LSARPC',
+   source='../librpc/gen_ndr/ndr_lsa.c',
+   public_deps='LIBNDR NDR_SECURITY'
+   )
+
 b

[SCM] Samba Shared Repository - branch master updated

2010-09-23 Thread Günther Deschner
The branch, master has been updated
   via  7f53773 waf: fix generated nbt.h path, should fix s4 install.
  from  de49623 s3-waf: fix LOCALEDIR usage.

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


- Log -
commit 7f537736088f4e20f211bd25bd512f620b16484b
Author: Günther Deschner 
Date:   Thu Sep 23 02:13:15 2010 -0700

waf: fix generated nbt.h path, should fix s4 install.

Guenther

---

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


Changeset truncated at 500 lines:

diff --git a/librpc/wscript_build b/librpc/wscript_build
index a4b625d..246a054 100644
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -207,6 +207,6 @@ bld.SAMBA_SUBSYSTEM('NDR_SCHANNEL',
 bld.SAMBA_SUBSYSTEM('NDR_NBT',
source='../librpc/gen_ndr/ndr_nbt.c',
public_deps='LIBNDR NDR_NBT_BUF NDR_SECURITY NDR_STANDARD 
LIBCLI_NDR_NETLOGON',
-   public_headers='../../librpc/gen_ndr/nbt.h',
+   public_headers='../librpc/gen_ndr/nbt.h',
 header_path='gen_ndr'
)


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch master updated

2010-09-23 Thread Günther Deschner
The branch, master has been updated
   via  de49623 s3-waf: fix LOCALEDIR usage.
   via  031dd8c waf: move majority of shared NDR_ subsystems to main 
wscript_build.
  from  dc4920b s3-waf: rework libnetapi to have no unresolved symbols.

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


- Log -
commit de49623d4b3bc577694b1601dcdb2eb413692389
Author: Günther Deschner 
Date:   Thu Sep 23 01:32:43 2010 -0700

s3-waf: fix LOCALEDIR usage.

Guenther

commit 031dd8cc623a315e8776faae687b53d126ecb700
Author: Günther Deschner 
Date:   Tue Sep 21 00:41:58 2010 -0700

waf: move majority of shared NDR_ subsystems to main wscript_build.

(so they can be used by s3 waf later)

Guenther

---

Summary of changes:
 librpc/wscript_build |  208 
 source3/build/dynconfig.py   |2 -
 source3/build/wscript|3 +-
 source4/librpc/wscript_build |  240 --
 4 files changed, 210 insertions(+), 243 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/wscript_build b/librpc/wscript_build
index 8846a6a..a4b625d 100644
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -2,3 +2,211 @@
 
 bld.RECURSE('idl')
 
+bld.SAMBA_SUBSYSTEM('NDR_AUDIOSRV',
+   source='../librpc/gen_ndr/ndr_audiosrv.c',
+   public_deps='LIBNDR'
+   )
+
+bld.SAMBA_SUBSYSTEM('NDR_NAMED_PIPE_AUTH',
+   source='../librpc/gen_ndr/ndr_named_pipe_auth.c',
+   public_deps='LIBNDR'
+   )
+
+bld.SAMBA_SUBSYSTEM('NDR_DNSSERVER',
+   source='../librpc/gen_ndr/ndr_dnsserver.c',
+   public_deps='LIBNDR'
+   )
+
+bld.SAMBA_SUBSYSTEM('NDR_DSBACKUP',
+   source='../librpc/gen_ndr/ndr_dsbackup.c',
+   public_deps='LIBNDR'
+   )
+
+bld.SAMBA_SUBSYSTEM('NDR_EFS',
+   source='../librpc/gen_ndr/ndr_efs.c',
+   public_deps='LIBNDR NDR_SECURITY'
+   )
+
+bld.SAMBA_SUBSYSTEM('NDR_ROT',
+   source='../librpc/gen_ndr/ndr_rot.c',
+   public_deps='LIBNDR NDR_ORPC'
+   )
+
+bld.SAMBA_SUBSYSTEM('NDR_FRSRPC',
+   source='../librpc/ndr/ndr_frsrpc.c ../librpc/gen_ndr/ndr_frsrpc.c',
+   public_deps='LIBNDR'
+   )
+
+bld.SAMBA_SUBSYSTEM('NDR_FRSAPI',
+   source='../librpc/gen_ndr/ndr_frsapi.c',
+   public_deps='LIBNDR'
+   )
+
+bld.SAMBA_SUBSYSTEM('NDR_FRSTRANS',
+   source='../librpc/gen_ndr/ndr_frstrans.c',
+   public_deps='LIBNDR'
+   )
+
+bld.SAMBA_SUBSYSTEM('NDR_DFSBLOBS',
+   source='../librpc/gen_ndr/ndr_dfsblobs.c',
+   public_deps='LIBNDR'
+   )
+
+bld.SAMBA_SUBSYSTEM('NDR_POLICYAGENT',
+   source='../librpc/gen_ndr/ndr_policyagent.c',
+   public_deps='LIBNDR'
+   )
+
+bld.SAMBA_SUBSYSTEM('NDR_UNIXINFO',
+   source='../librpc/gen_ndr/ndr_unixinfo.c',
+   public_deps='LIBNDR NDR_SECURITY'
+   )
+
+bld.SAMBA_SUBSYSTEM('NDR_SPOOLSS',
+   source='../librpc/gen_ndr/ndr_spoolss.c',
+   public_deps='LIBNDR NDR_SPOOLSS_BUF NDR_SECURITY'
+   )
+
+bld.SAMBA_SUBSYSTEM('NDR_SPOOLSS_BUF',
+   source='../librpc/ndr/ndr_spoolss_buf.c',
+deps='talloc'
+   )
+
+bld.SAMBA_SUBSYSTEM('NDR_EPMAPPER',
+   source='../librpc/gen_ndr/ndr_epmapper.c',
+   public_deps='LIBNDR'
+   )
+
+bld.SAMBA_SUBSYSTEM('NDR_DBGIDL',
+   source='../librpc/gen_ndr/ndr_dbgidl.c',
+   public_deps='LIBNDR'
+   )
+
+bld.SAMBA_SUBSYSTEM('NDR_DSSETUP',
+   source='../librpc/gen_ndr/ndr_dssetup.c',
+   public_deps='LIBNDR'
+   )
+
+bld.SAMBA_SUBSYSTEM('NDR_MSGSVC',
+   source='../librpc/gen_ndr/ndr_msgsvc.c',
+   public_deps='LIBNDR'
+   )
+
+bld.SAMBA_SUBSYSTEM('NDR_MGMT',
+   source='../librpc/gen_ndr/ndr_mgmt.c',
+   public_deps='LIBNDR'
+   )
+
+bld.SAMBA_SUBSYSTEM('NDR_PROTECTED_STORAGE',
+   source='../librpc/gen_ndr/ndr_protected_storage.c',
+   public_deps='LIBNDR'
+   )
+
+bld.SAMBA_SUBSYSTEM('NDR_ORPC',
+   source='../librpc/ndr/ndr_orpc.c ../librpc/gen_ndr/ndr_orpc.c',
+   public_deps='LIBNDR'
+   )
+
+bld.SAMBA_SUBSYSTEM('NDR_OXIDRESOLVER',
+   source='../librpc/gen_ndr/ndr_oxidresolver.c',
+   public_deps='LIBNDR NDR_ORPC'
+   )
+
+bld.SAMBA_SUBSYSTEM('NDR_REMACT',
+   source='../librpc/gen_ndr/ndr_remact.c',
+   public_deps='LIBNDR NDR_ORPC'
+   )
+
+bld.SAMBA_SUBSYSTEM('NDR_WZCSVC',
+   source='../librpc/gen_ndr/ndr_wzcsvc.c',
+   public_deps='LIBNDR'
+   )
+
+bld.SAMBA_SUBSYSTEM('NDR_BROWSER',
+   source='../librpc/gen_ndr/ndr_browser.c',
+   public_deps='LIBNDR'
+   )
+
+bld.SAMBA_SUBSYSTEM('NDR_W32TIME',
+   source='../librpc/gen_ndr/ndr_w32time.c',
+   public_deps='LIBNDR'
+   )
+
+bld.SAMBA_SUBSYSTEM('NDR_SCERPC',
+   source='../librpc/gen_ndr/ndr_scerpc.c',
+   public_deps='LIBNDR'
+   )
+
+bld.SAM

[SCM] Samba Shared Repository - branch master updated

2010-09-23 Thread Günther Deschner
The branch, master has been updated
   via  dc4920b s3-waf: rework libnetapi to have no unresolved symbols.
   via  4d75255 s3-waf: add libsmbsharemodes.so.
  from  8ccbbe0 lib-subunit: fixed build on systems without subunit devel 
library

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


- Log -
commit dc4920bfa7f55e660c9944049ba0dd66931abcde
Author: Günther Deschner 
Date:   Thu Sep 23 00:48:16 2010 -0700

s3-waf: rework libnetapi to have no unresolved symbols.

Guenther

commit 4d7525537a0090273d85f468af338668920c8dcf
Author: Günther Deschner 
Date:   Thu Sep 23 00:27:34 2010 -0700

s3-waf: add libsmbsharemodes.so.

Guenther

---

Summary of changes:
 source3/wscript_build |   62 +++-
 1 files changed, 45 insertions(+), 17 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/wscript_build b/source3/wscript_build
index df646bd..e0b3ce2 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -951,6 +951,42 @@ LIBSMBCLIENT_SRC1 = '''${LIBSMBCLIENT_SRC0}
 
 LIBSMBCLIENT_SRC = '${LIBSMBCLIENT_SRC1}'
 
+LIBSMBSHAREMODES_SRC0 = 'libsmb/smb_share_modes.c'
+
+LIBSMBSHAREMODES_SRC = '${LIBSMBSHAREMODES_SRC0}'
+
+LIBNETAPI_SRC0 = '''lib/netapi/netapi.c
+lib/netapi/cm.c
+librpc/gen_ndr/ndr_libnetapi.c
+lib/netapi/libnetapi.c
+lib/netapi/joindomain.c
+lib/netapi/serverinfo.c
+lib/netapi/getdc.c
+lib/netapi/user.c
+lib/netapi/group.c
+lib/netapi/localgroup.c
+lib/netapi/samr.c
+lib/netapi/sid.c
+lib/netapi/share.c
+lib/netapi/file.c
+lib/netapi/shutdown.c
+lib/netapi/netlogon.c'''
+
+LIBNETAPI_SRC = '''${LIBNETAPI_SRC0} ${LIBNET_SRC}
+   ${LIBSMBCONF_SRC}
+   ${REG_SMBCONF_SRC}
+   ${LIBMSRPC_SRC} ${LIBMSRPC_GEN_SRC}
+   ${DCUTIL_SRC} ${LIBADS_SRC} ${PRIVILEGES_BASIC_SRC}
+   auth/token_util.c
+   ${LIBCLI_INITSHUTDOWN_SRC}
+   ${LIBCLI_WKSSVC_SRC}
+   ${LIBCLI_SRVSVC_SRC}
+   ${LIBCLI_LSA_SRC}
+   ${LIBCLI_SAMR_SRC}
+   ${LIBCLI_NETLOGON_SRC}
+   ${RPC_CLIENT_SCHANNEL_SRC}
+   rpc_client/init_netlogon.c
+   rpc_client/init_samr.c'''
 
 # FIXME:  bigballofmud
 
@@ -1201,29 +1237,21 @@ bld.SAMBA_LIBRARY('libwbclient',
 public_deps='talloc WBCOMMON')
 
 bld.SAMBA_LIBRARY('libnetapi',
-source='''lib/netapi/netapi.c
-  lib/netapi/cm.c
-  librpc/gen_ndr/ndr_libnetapi.c
-  lib/netapi/libnetapi.c
-  lib/netapi/joindomain.c
-  lib/netapi/serverinfo.c
-  lib/netapi/getdc.c
-  lib/netapi/user.c
-  lib/netapi/group.c
-  lib/netapi/localgroup.c
-  lib/netapi/samr.c
-  lib/netapi/sid.c
-  lib/netapi/share.c
-  lib/netapi/file.c
-  lib/netapi/shutdown.c
-  lib/netapi/netlogon.c''',
-public_deps='''talloc tdb''')
+source=LIBNETAPI_SRC,
+public_deps='''talloc tdb cap libwbclient LIB_NONSMBD 
LIBSMB KRBCLIENT
+PASSDB SMBLDAP GROUPDB PARAM_WITHOUT_REG DYNCONFIG''',
+vars=locals())
 
 bld.SAMBA_LIBRARY('libsmbclient',
 source=LIBSMBCLIENT_SRC,
 public_deps='''talloc tdb libwbclient cap PARAM 
LIB_NONSMBD LIBSMB KRBCLIENT PASSDB SMBLDAP GROUPDB''',
 vars=locals())
 
+bld.SAMBA_LIBRARY('libsmbsharemodes',
+source=LIBSMBSHAREMODES_SRC,
+public_deps='''talloc tdb''',
+vars=locals())
+
 bld.SAMBA_SUBSYSTEM('ASN1_UTIL',
 source='../lib/util/asn1.c',
 deps='talloc',


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch master updated

2010-09-23 Thread Andrew Bartlett
The branch, master has been updated
   via  8ccbbe0 lib-subunit: fixed build on systems without subunit devel 
library
   via  d2008fb s4-kcc: the kcc should not be setting the repsTo attribute
   via  7a05e04 s4-gensec: fixed a client side bug in GENSEC/SASL/SSF 
negotiation
   via  c0ff93b s4-drs: we don't need to decode to utf8 in python dcerpc 
strings any more
   via  bf1f2d4 s4-gensec: prevent a double free in the error path of 
GSSAPI auth
   via  202525d s4-gensec: fixed a GSSAPI SASL negotiation bug
   via  d1cbd68 s4-kcc: added service->am_rodc
   via  c166b44 s4-kcc: pass the service context into the kcc connection 
code
  from  b6f149e s3-waf: add all remaining binaries from the make build.

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


- Log -
commit 8ccbbe042b7fed310de9a75ddccc69e51bae72d4
Author: Andrew Tridgell 
Date:   Wed Sep 22 23:21:56 2010 -0700

lib-subunit: fixed build on systems without subunit devel library

Pair-Programmed-With: Jelmer Vernooij 

commit d2008fbbb951a941d380b4efa0eaf9f3cfe54e13
Author: Andrew Tridgell 
Date:   Wed Sep 22 22:50:05 2010 -0700

s4-kcc: the kcc should not be setting the repsTo attribute

repsTo is set by other DCs, when they ask to be notified about changes
in a partition

commit 7a05e04dfc81d20aff92e17c61af81bbe66d2492
Author: Andrew Tridgell 
Date:   Wed Sep 22 22:41:02 2010 -0700

s4-gensec: fixed a client side bug in GENSEC/SASL/SSF negotiation

this is the client side equivalent change for the previous fix

Pair-Programmed-With: Andrew Bartlett 

commit c0ff93b033da632d5ad4a004d6fff05d08f5cf78
Author: Andrew Tridgell 
Date:   Wed Sep 22 22:35:28 2010 -0700

s4-drs: we don't need to decode to utf8 in python dcerpc strings any more

Pair-Programmed-With: Andrew Bartlett 

commit bf1f2d4eb8c35ca4547993f33a1e19ff0c3c03c2
Author: Andrew Tridgell 
Date:   Wed Sep 22 22:28:58 2010 -0700

s4-gensec: prevent a double free in the error path of GSSAPI auth

the caller frees mem_ctx, so we shouldn't

Pair-Programmed-With: Andrew Bartlett 

commit 202525db1339805af5d5e837712b0aa834e8f5e0
Author: Andrew Tridgell 
Date:   Wed Sep 22 22:20:30 2010 -0700

s4-gensec: fixed a GSSAPI SASL negotiation bug

Fixed a bug that affected mismatched negotiation between the GSSAPI
layer and the SASL SSF subsequent negotiation. This caused some ldap
clients to hang when trying to authentication with a Samba LDAP
server. The client thought the connection should be signed, the server
thought it should be in plain text

Pair-Programmed-With: Andrew Bartlett 

commit d1cbd68bb12c6d5193e864e5b0bae16c7ec4c5f4
Author: Andrew Tridgell 
Date:   Wed Sep 22 11:18:04 2010 -0700

s4-kcc: added service->am_rodc

use a rodc flag on the service instead of calling samdb_rodc each time

commit c166b44b4756c2e038ebbbe27898aff0a5c954da
Author: Andrew Tridgell 
Date:   Wed Sep 22 11:15:56 2010 -0700

s4-kcc: pass the service context into the kcc connection code

this will be used for the RODC changes needed for the kcc

---

Summary of changes:
 lib/torture/wscript_build   |6 +-
 source4/auth/gensec/gensec_gssapi.c |   42 +
 source4/auth/gensec/socket.c|1 -
 source4/dsdb/kcc/kcc_connection.c   |4 +-
 source4/dsdb/kcc/kcc_periodic.c |   41 ++--
 source4/dsdb/kcc/kcc_service.c  |5 +
 source4/dsdb/kcc/kcc_service.h  |2 +
 source4/dsdb/kcc/kcc_topology.c |  146 ---
 source4/scripting/python/samba/drs_utils.py |2 +-
 source4/wscript_build   |1 +
 10 files changed, 109 insertions(+), 141 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/torture/wscript_build b/lib/torture/wscript_build
index 7830b3a..a3ba605 100644
--- a/lib/torture/wscript_build
+++ b/lib/torture/wscript_build
@@ -1,11 +1,9 @@
 #!/usr/bin/env python
 
-
 bld.SAMBA_LIBRARY('torture',
-   source='torture.c subunit.c ../subunit/c/lib/child.c',
+   source='torture.c subunit.c',
vnum='0.0.1',
pc_files='torture.pc',
-   public_deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL LIBSAMBA-ERRORS talloc 
tevent',
+   public_deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL LIBSAMBA-ERRORS talloc 
tevent subunit',
public_headers='torture.h'
)
-
diff --git a/source4/auth/gensec/gensec_gssapi.c 
b/source4/auth/gensec/gensec_gssapi.c
index d2f19e9..ecf2a73 100644
--- a/source4/auth/gensec/gensec_gssapi.c
+++ b/source4/auth/gensec/gensec_gssapi.c
@@ -632,18 +632,21 @@ static NTSTATUS gensec_gssapi_update(struct 
gensec_security *gensec_security,
gensec_gssapi_state->max_wrap_buf_size = 
MIN(R

[SCM] Samba Shared Repository - branch master updated

2010-09-23 Thread Günther Deschner
The branch, master has been updated
   via  b6f149e s3-waf: add all remaining binaries from the make build.
   via  a11d6c7 s3-build: fix the build of split_tokens.
   via  34008ef s3-build: fix the build of test_lp_load.
   via  099394a s3-build: strip down dependencies of smbta-util.
   via  8037a46 s3-waf: reconcile objects to old make-based build.
   via  9ddfbd1 s3-waf: add libsmbclient.
  from  7378b6d s4-selftest: Move credentials tests to standard python 
directory.

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


- Log -
commit b6f149eec38a69aea2efec307c559e08721a26ca
Author: Günther Deschner 
Date:   Thu Sep 23 00:13:34 2010 -0700

s3-waf: add all remaining binaries from the make build.

Guenther

commit a11d6c77e460bdb9755a66a62483b3ad0ae57373
Author: Günther Deschner 
Date:   Thu Sep 23 00:06:17 2010 -0700

s3-build: fix the build of split_tokens.

Guenther

commit 34008ef6b35f09b37a3cc7d99cb085e9ff9c85df
Author: Günther Deschner 
Date:   Thu Sep 23 00:05:31 2010 -0700

s3-build: fix the build of test_lp_load.

Guenther

commit 099394a8f768e16c15b001bd27757ecf4b1d5f0b
Author: Günther Deschner 
Date:   Thu Sep 23 00:04:08 2010 -0700

s3-build: strip down dependencies of smbta-util.

Guenther

commit 8037a46c2e5a2e1ee9479690e38770fdffdcd413
Author: Günther Deschner 
Date:   Wed Sep 22 17:15:15 2010 -0700

s3-waf: reconcile objects to old make-based build.

Guenther

commit 9ddfbd1c4ea38b47854b298dfba22f8e7026c897
Author: Günther Deschner 
Date:   Wed Sep 22 14:22:09 2010 -0700

s3-waf: add libsmbclient.

Guenther

---

Summary of changes:
 source3/Makefile.in  |   10 +-
 source3/param/test_lp_load.c |1 +
 source3/utils/split_tokens.c |1 +
 source3/wscript_build|  527 +++---
 4 files changed, 448 insertions(+), 91 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 7062d31..03a89c5 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -977,7 +977,7 @@ TESTPARM_OBJ = utils/testparm.o \
   $(LIBSMB_ERR_OBJ)
 
 SMBTA_UTIL_OBJ = utils/smbta-util.o $(PARAM_OBJ) $(POPT_LIB_OBJ) \
-   $(LOCKING_OBJ) $(PROFILE_OBJ) $(LIB_NONSMBD_OBJ) \
+   $(LIB_NONSMBD_OBJ) \
$(LIBSMB_ERR_OBJ) $(FNAME_UTIL_OBJ)
 
 TEST_LP_LOAD_OBJ = param/test_lp_load.o \
@@ -3067,11 +3067,11 @@ bin/rpc_open_...@exeext@: $(BINARY_PREREQS) 
$(RPC_OPEN_TCP_OBJ) $(LIBTALLOC) $(L
$(LIBS) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) \
$(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS)
 
-bin/test_lp_l...@exeext@: $(BINARY_PREREQS) $(TEST_LP_LOAD_OBJ) @BUILD_POPT@ 
$(LIBTALLOC) $(LIBTDB)
+bin/test_lp_l...@exeext@: $(BINARY_PREREQS) $(TEST_LP_LOAD_OBJ) @BUILD_POPT@ 
$(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
@echo "Linking $@"
@$(CC) -o $@ $(TEST_LP_LOAD_OBJ) \
$(LDFLAGS) $(DYNEXP) $(LIBS) \
-   $(LDAP_LIBS) \
+   $(LDAP_LIBS) $(LIBWBCLIENT_LIBS) \
$(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
 
 bin/dbwrap_t...@exeext@: $(DBWRAP_TOOL_OBJ) $(LIBTALLOC) $(LIBTDB)
@@ -3095,12 +3095,12 @@ bin/dbwrap_tort...@exeext@: $(DBWRAP_TORTURE_OBJ) 
$(LIBTALLOC) $(LIBTDB)
 install-dbwrap_torture:: bin/dbwrap_tort...@exeext@
@$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) 
$(BINDIR) $<
 
-bin/split_tok...@exeext@: $(BINARY_PREREQS) $(SPLIT_TOKENS_OBJ) @BUILD_POPT@ 
$(LIBTALLOC) $(LIBTDB)
+bin/split_tok...@exeext@: $(BINARY_PREREQS) $(SPLIT_TOKENS_OBJ) @BUILD_POPT@ 
$(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
@echo "Linking $@"
@$(CC) -o $@ $(SPLIT_TOKENS_OBJ) \
$(LDFLAGS) $(DYNEXP) \
$(LIBS) $(POPT_LIBS) \
-   $(LDAP_LIBS) \
+   $(LDAP_LIBS) $(LIBWBCLIENT_LIBS) \
$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
 
 install:: installservers installbin installman \
diff --git a/source3/param/test_lp_load.c b/source3/param/test_lp_load.c
index 1ec123e..53ac23b 100644
--- a/source3/param/test_lp_load.c
+++ b/source3/param/test_lp_load.c
@@ -18,6 +18,7 @@
  */
 
 #include "includes.h"
+#include "popt_common.h"
 
 extern bool AllowDebugChange;
 
diff --git a/source3/utils/split_tokens.c b/source3/utils/split_tokens.c
index ac4f726..6c49b8b 100644
--- a/source3/utils/split_tokens.c
+++ b/source3/utils/split_tokens.c
@@ -24,6 +24,7 @@
  */
 
 #include "includes.h"
+#include "popt_common.h"
 
 extern bool AllowDebugChange;
 
diff --git a/source3/wscript_build b/source3/wscript_build
index a98b07a..df646bd 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -66,6 +66,9 @@ LIBNDR_SCHANNEL_SRC = '''../librpc/gen_ndr/ndr_schannel.c
 LIBNDR_SPOOLSS_SRC = '''../librpc/gen_ndr/ndr_spoolss.c