[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2878-gec86852

[Günther Deschner]

The branch, v3-3-test has been updated
       via  ec86852fc6ce2d88ad5835c8fcb337c68fd6f6bc (commit)
       via  d20353d30c2e08a6c6d67ae8b8c2faa26004249c (commit)
       via  132b038581a1a91b4e70c7c44f97f52866609812 (commit)
      from  675bb53398ba29c53d2dcf3c7122cf4770c2f938 (commit)

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


- Log -----------------------------------------------------------------
commit ec86852fc6ce2d88ad5835c8fcb337c68fd6f6bc
Author: Günther Deschner <gd at samba.org>
Date:   Tue Jun 17 17:58:38 2008 +0200

    clikrb5: remove unrequired create_kerberos_key_from_string_direct() prototype.
    
    Guenther

commit d20353d30c2e08a6c6d67ae8b8c2faa26004249c
Author: Günther Deschner <gd at samba.org>
Date:   Tue Jun 17 16:18:50 2008 +0200

    dsgetdcname: allow to use NULL mem_ctx.
    
    Guenther

commit 132b038581a1a91b4e70c7c44f97f52866609812
Author: Günther Deschner <gd at samba.org>
Date:   Tue Jun 17 16:17:03 2008 +0200

    libads: fix logic error in ads_get_kvno().
    
    Guenther

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

Summary of changes:
 source/include/includes.h   |    1 -
 source/libads/ldap.c        |    2 +-
 source/libsmb/clikrb5.c     |   20 ++++++++++----------
 source/libsmb/dsgetdcname.c |    2 +-
 4 files changed, 12 insertions(+), 13 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/include/includes.h b/source/include/includes.h
index c937f59..7513dfb 100644
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -1144,7 +1144,6 @@ void krb5_free_unparsed_name(krb5_context ctx, char *val);
 /* Samba wrapper function for krb5 functionality. */
 bool setup_kaddr( krb5_address *pkaddr, struct sockaddr_storage *paddr);
 int create_kerberos_key_from_string(krb5_context context, krb5_principal host_princ, krb5_data *password, krb5_keyblock *key, krb5_enctype enctype);
-int create_kerberos_key_from_string_direct(krb5_context context, krb5_principal host_princ, krb5_data *password, krb5_keyblock *key, krb5_enctype enctype);
 bool get_auth_data_from_tkt(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, krb5_ticket *tkt);
 krb5_const_principal get_principal_from_tkt(krb5_ticket *tkt);
 krb5_error_code smb_krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters);
diff --git a/source/libads/ldap.c b/source/libads/ldap.c
index 37c0c4d..01c4b44 100644
--- a/source/libads/ldap.c
+++ b/source/libads/ldap.c
@@ -1537,7 +1537,7 @@ uint32 ads_get_kvno(ADS_STRUCT *ads, const char *machine_name)
 	}
 	ret = ads_search(ads, &res, filter, attrs);
 	SAFE_FREE(filter);
-	if (!ADS_ERR_OK(ret) && ads_count_replies(ads, res)) {
+	if (!ADS_ERR_OK(ret) || (ads_count_replies(ads, res) != 1)) {
 		DEBUG(1,("ads_get_kvno: Computer Account For %s not found.\n", machine_name));
 		ads_msgfree(ads, res);
 		return kvno;
diff --git a/source/libsmb/clikrb5.c b/source/libsmb/clikrb5.c
index 7688b0b..4c535d2 100644
--- a/source/libsmb/clikrb5.c
+++ b/source/libsmb/clikrb5.c
@@ -210,11 +210,11 @@ static krb5_error_code smb_krb5_parse_name_norealm_conv(krb5_context context,
 #endif
 
 #if defined(HAVE_KRB5_PRINCIPAL2SALT) && defined(HAVE_KRB5_USE_ENCTYPE) && defined(HAVE_KRB5_STRING_TO_KEY) && defined(HAVE_KRB5_ENCRYPT_BLOCK)
- int create_kerberos_key_from_string_direct(krb5_context context,
-					krb5_principal host_princ,
-					krb5_data *password,
-					krb5_keyblock *key,
-					krb5_enctype enctype)
+static int create_kerberos_key_from_string_direct(krb5_context context,
+						  krb5_principal host_princ,
+						  krb5_data *password,
+						  krb5_keyblock *key,
+						  krb5_enctype enctype)
 {
 	int ret;
 	krb5_data salt;
@@ -231,11 +231,11 @@ static krb5_error_code smb_krb5_parse_name_norealm_conv(krb5_context context,
 	return ret;
 }
 #elif defined(HAVE_KRB5_GET_PW_SALT) && defined(HAVE_KRB5_STRING_TO_KEY_SALT)
- int create_kerberos_key_from_string_direct(krb5_context context,
-					krb5_principal host_princ,
-					krb5_data *password,
-					krb5_keyblock *key,
-					krb5_enctype enctype)
+static int create_kerberos_key_from_string_direct(krb5_context context,
+						  krb5_principal host_princ,
+						  krb5_data *password,
+						  krb5_keyblock *key,
+						  krb5_enctype enctype)
 {
 	int ret;
 	krb5_salt salt;
diff --git a/source/libsmb/dsgetdcname.c b/source/libsmb/dsgetdcname.c
index 8d75593..2a445cb 100644
--- a/source/libsmb/dsgetdcname.c
+++ b/source/libsmb/dsgetdcname.c
@@ -119,7 +119,7 @@ void debug_dsdcinfo_flags(int lvl, uint32_t flags)
 
 static char *dsgetdcname_cache_key(TALLOC_CTX *mem_ctx, const char *domain)
 {
-	if (!mem_ctx || !domain) {
+	if (!domain) {
 		return NULL;
 	}
 


-- 
Samba Shared Repository