[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-699-ge940537

Simo Sorce idra at samba.org
Mon Dec 17 20:27:27 GMT 2007


The branch, v3-2-test has been updated
       via  e940537d5be870ae622712a3b76dff891739df8c (commit)
       via  814c1b0e0034fb67c7718760dfcf913904f3e7fa (commit)
      from  545cd2139cfc9484b733693814d4724d37125942 (commit)

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


- Log -----------------------------------------------------------------
commit e940537d5be870ae622712a3b76dff891739df8c
Merge: 814c1b0e0034fb67c7718760dfcf913904f3e7fa 545cd2139cfc9484b733693814d4724d37125942
Author: Simo Sorce <idra at samba.org>
Date:   Mon Dec 17 15:26:16 2007 -0500

    Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-simo

commit 814c1b0e0034fb67c7718760dfcf913904f3e7fa
Author: Simo Sorce <idra at samba.org>
Date:   Mon Dec 17 15:21:38 2007 -0500

    While 'data' is usually 0 terminated, nothing in the spec requires that. The correct way is to copy only 'length' bytes.
    
    Simo.

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

Summary of changes:
 source/libads/kerberos.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/libads/kerberos.c b/source/libads/kerberos.c
index 227f95d..4fc2395 100644
--- a/source/libads/kerberos.c
+++ b/source/libads/kerberos.c
@@ -521,7 +521,10 @@ char *kerberos_get_default_realm_from_ccache( void )
 #if defined(HAVE_KRB5_PRINCIPAL_GET_REALM)
 	realm = SMB_STRDUP(krb5_principal_get_realm(ctx, princ));
 #elif defined(HAVE_KRB5_PRINC_REALM)
-	realm = SMB_STRDUP(krb5_princ_realm(ctx, princ)->data);
+	{
+		krb5_data *realm_data = krb5_princ_realm(ctx, princ);
+		realm = SMB_STRNDUP(realm_data->data, realm_data->length);
+	}
 #endif
 
   out:


-- 
Samba Shared Repository


More information about the samba-cvs mailing list