[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  1b27b73 s3-net: display full value of "msDS-SupportedEncryptionTypes".
       via  4237138 registry: Don't leave dangling transactions
      from  ae72733 s3-winbindd: Attempt to connect to NETLOGON over NCACN_IP_TCP if we can

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


- Log -----------------------------------------------------------------
commit 1b27b73c6056b8ba1a7192f7a42c7638af445565
Author: Günther Deschner <gd at samba.org>
Date:   Mon Sep 29 16:01:25 2014 +0200

    s3-net: display full value of "msDS-SupportedEncryptionTypes".
    
    Guenther
    
    Signed-off-by: Günther Deschner <gd at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User(master): Günther Deschner <gd at samba.org>
    Autobuild-Date(master): Wed Oct  8 18:18:50 CEST 2014 on sn-devel-104

commit 4237138c464d7e2046de43b431ab9796f80182db
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Oct 8 15:39:28 2014 +0200

    registry: Don't leave dangling transactions
    
    When a createkey fails due to access denied, we need to do a
    transaction_cancel. Otherwise the lock on the db will stay around.
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Guenther Deschner <gd at samba.org>

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

Summary of changes:
 source3/registry/reg_api.c |    2 +-
 source3/utils/net_ads.c    |    7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/registry/reg_api.c b/source3/registry/reg_api.c
index 47a717b..d1c70ec 100644
--- a/source3/registry/reg_api.c
+++ b/source3/registry/reg_api.c
@@ -634,7 +634,7 @@ WERROR reg_createkey(TALLOC_CTX *ctx, struct registry_key *parent,
 				 key->token))
 	{
 		err = WERR_ACCESS_DENIED;
-		goto done;
+		goto trans_done;
 	}
 
 	/*
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 5f18bf4..e96377f 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -2916,11 +2916,10 @@ static int net_ads_enctype_lookup_account(struct net_context *c,
 static void net_ads_enctype_dump_enctypes(const char *username,
 					  const char *enctype_str)
 {
-	int enctypes;
+	int enctypes = atoi(enctype_str);
 
-	d_printf(_("'%s' uses \"msDS-SupportedEncryptionTypes\":\n"), username);
-
-	enctypes = atoi(enctype_str);
+	d_printf(_("'%s' uses \"msDS-SupportedEncryptionTypes\": %d (0x%08x)\n"),
+		username, enctypes, enctypes);
 
 	printf("[%s] 0x%08x DES-CBC-CRC\n",
 		enctypes & ENC_CRC32 ? "X" : " ",


-- 
Samba Shared Repository