[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  9d695c7 Fix incorrect order of arguments in error string
      from  fd90d27 Add DCERPC flag to call unbind hooks without destroying the connection itself upon termination of a connection with outstanding pending calls.

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


- Log -----------------------------------------------------------------
commit 9d695c7372462ace5209659246ba246e260cc42b
Author: Roel van Meer <roel at 1afa.com>
Date:   Tue Apr 14 16:59:13 2015 +0200

    Fix incorrect order of arguments in error string
    
    Reviewed-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Ralph Böhme <rb at sernet.de>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Wed Apr 15 05:57:25 CEST 2015 on sn-devel-104

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

Summary of changes:
 source3/libsmb/passchange.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/passchange.c b/source3/libsmb/passchange.c
index e0a5935..4676b72 100644
--- a/source3/libsmb/passchange.c
+++ b/source3/libsmb/passchange.c
@@ -262,7 +262,7 @@ NTSTATUS remote_password_change(const char *remote_machine, const char *user_nam
 			if (asprintf(err_str, "SAMR connection to machine %s "
 				 "failed. Error was %s, but LANMAN password "
 				 "changes are disabled\n",
-				nt_errstr(result), remote_machine) == -1) {
+				remote_machine, nt_errstr(result)) == -1) {
 				*err_str = NULL;
 			}
 			cli_shutdown(cli);


-- 
Samba Shared Repository