[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  7bad9d1 s3-libads: Print the debug string of a failed call with LDAP_OTHER.
       via  ee156ef krb5wrap: Move mask to the right position.
      from  68f8f4e dsdb-tests ldap.py: Add test for usn behaviour on certain changes

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


- Log -----------------------------------------------------------------
commit 7bad9d1fcd7ad78d060d95953ee6aaff5339bba6
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Jun 12 10:07:22 2013 +0200

    s3-libads: Print the debug string of a failed call with LDAP_OTHER.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Wed Jun 12 13:46:57 CEST 2013 on sn-devel-104

commit ee156ef23511713a29095f4ab5d7750a36ba850c
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Jun 12 10:08:44 2013 +0200

    krb5wrap: Move mask to the right position.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

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

Summary of changes:
 lib/krb5_wrap/krb5_samba.c |    2 +-
 source3/libads/ldap.c      |   18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c
index 3a2401a..024e188 100644
--- a/lib/krb5_wrap/krb5_samba.c
+++ b/lib/krb5_wrap/krb5_samba.c
@@ -1484,7 +1484,6 @@ krb5_error_code kerberos_kinit_keyblock_cc(krb5_context ctx, krb5_ccache cc,
 {
 	krb5_error_code code = 0;
 	krb5_creds my_creds;
-	mode_t mask;
 
 #if defined(HAVE_KRB5_GET_INIT_CREDS_KEYBLOCK)
 	code = krb5_get_init_creds_keyblock(ctx, &my_creds, principal,
@@ -1496,6 +1495,7 @@ krb5_error_code kerberos_kinit_keyblock_cc(krb5_context ctx, krb5_ccache cc,
 	char tmp_name[sizeof(SMB_CREDS_KEYTAB)];
 	krb5_keytab_entry entry;
 	krb5_keytab keytab;
+	mode_t mask;
 
 	memset(&entry, 0, sizeof(entry));
 	entry.principal = principal;
diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index 2a4a83b..c8ef5b5 100644
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -1041,6 +1041,24 @@ static ADS_STATUS ads_do_paged_search_args(ADS_STRUCT *ads,
 	if (rc) {
 		DEBUG(3,("ads_do_paged_search_args: ldap_search_with_timeout(%s) -> %s\n", expr,
 			 ldap_err2string(rc)));
+		if (rc == LDAP_OTHER) {
+			char *ldap_errmsg;
+			int ret;
+
+			ret = ldap_parse_result(ads->ldap.ld,
+						*res,
+						NULL,
+						NULL,
+						&ldap_errmsg,
+						NULL,
+						NULL,
+						0);
+			if (ret == LDAP_SUCCESS) {
+				DEBUG(3, ("ldap_search_with_timeout(%s) "
+					  "error: %s\n", expr, ldap_errmsg));
+				ldap_memfree(ldap_errmsg);
+			}
+		}
 		goto done;
 	}
 


-- 
Samba Shared Repository