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

[Günther Deschner]

The branch, v3-3-test has been updated
       via  5f0b7973e04013cc5e3032cb2e96f5e718fb50b5 (commit)
      from  a264409ec6787ea5a45bdde00817e2dcac3bffa2 (commit)

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


- Log -----------------------------------------------------------------
commit 5f0b7973e04013cc5e3032cb2e96f5e718fb50b5
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Tue Dec 2 12:57:02 2008 +0100

    s3-net: allow to list a keytab generated using net rpc vampire.
    
    Guenther
    (cherry picked from commit c554080dd988791ec2db37c96ff7cc709b0ee6ab)

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

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


Changeset truncated at 500 lines:

diff --git a/source/libads/kerberos_keytab.c b/source/libads/kerberos_keytab.c
index 883f582..c4e6709 100644
--- a/source/libads/kerberos_keytab.c
+++ b/source/libads/kerberos_keytab.c
@@ -725,8 +725,11 @@ int ads_keytab_list(const char *keytab_name)
 
                ret = smb_krb5_enctype_to_string(context, enctype, &etype_s);
                if (ret) {
-                       SAFE_FREE(princ_s);
-                       goto out;
+                       if (asprintf(&etype_s, "UNKNOWN: %d\n", enctype) == -1)
+                       {
+                               SAFE_FREE(princ_s);
+                               goto out;
+                       }
                }
 
                printf("%3d  %s\t\t %s\n", kt_entry.vno, etype_s, princ_s);


-- 
Samba Shared Repository