[SCM] Samba Shared Repository - branch master updated

[Christian Ambach]

The branch, master has been updated
       via  0796a17 s3:lib/charcnv fix typo in pull_ascii_base_talloc()
       via  9755541 s3:libnet increase timeout for machine password change
      from  68698b4 tdb: Slightly simplify tdb_expand_file

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


- Log -----------------------------------------------------------------
commit 0796a17aa6915be039d6f71ae2575ef525ffb6db
Author: Ralph Wuerthner <ralph.wuerthner at de.ibm.com>
Date:   Tue Feb 26 12:32:32 2013 +0100

    s3:lib/charcnv fix typo in pull_ascii_base_talloc()
    
    Signed-off-by: Ralph Wuerthner <ralph.wuerthner at de.ibm.com>
    Reviewed-by: Christian Ambach <ambi at samba.org>
    
    Autobuild-User(master): Christian Ambach <ambi at samba.org>
    Autobuild-Date(master): Tue Mar  5 15:56:56 CET 2013 on sn-devel-104

commit 9755541ed156d71df98607375ee3b925266c3c74
Author: Christian Ambach <ambi at samba.org>
Date:   Tue Mar 5 11:44:03 2013 +0100

    s3:libnet increase timeout for machine password change
    
    DCs might run password filter modules that can delay the setting of
    the machine password for a significant amount of time
    use the same timeout as in the other paths of domain join
    (e.g. rpccli_netlogon_set_trust_password)
    
    Signed-off-by: Christian Ambach <ambi at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 source3/lib/charcnv.c        |    2 +-
 source3/libnet/libnet_join.c |    9 +++++++++
 2 files changed, 10 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index 407a209..71d2c3a 100644
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -173,7 +173,7 @@ static size_t pull_ascii_base_talloc(TALLOC_CTX *ctx,
 	}
 
 	if (src_len == (size_t)-1) {
-		smb_panic("sec_len == -1 in pull_ascii_base_talloc");
+		smb_panic("src_len == -1 in pull_ascii_base_talloc");
 	}
 
 	if (flags & STR_TERMINATE) {
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index 2b4ab0b..dfe7283 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -863,6 +863,7 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx,
 	struct samr_Ids name_types;
 	union samr_UserInfo user_info;
 	struct dcerpc_binding_handle *b = NULL;
+	unsigned int old_timeout = 0;
 
 	DATA_BLOB session_key = data_blob_null;
 	struct samr_CryptPassword crypt_pwd;
@@ -1087,6 +1088,12 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx,
 
 	/* Set password on machine account - first try level 26 */
 
+	/*
+	 * increase the timeout as password filter modules on the DC
+	 * might delay the operation for a significant amount of time
+	 */
+	old_timeout = rpccli_set_timeout(pipe_hnd, 600000);
+
 	init_samr_CryptPasswordEx(r->in.machine_password,
 				  &session_key,
 				  &crypt_pwd_ex);
@@ -1118,6 +1125,8 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx,
 						  &result);
 	}
 
+	old_timeout = rpccli_set_timeout(pipe_hnd, old_timeout);
+
 	if (!NT_STATUS_IS_OK(status)) {
 
 		dcerpc_samr_DeleteUser(b, mem_ctx,


-- 
Samba Shared Repository