r23651: Always, always, always compile before commit...
authorGünther Deschner <gd@samba.org>
Fri, 29 Jun 2007 09:58:11 +0000 (09:58 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 17:23:41 +0000 (12:23 -0500)
Guenther
(This used to be commit accb40446ad3f872c5167fc2306d892553293b7b)

source3/libads/kerberos_keytab.c
source3/libsmb/clikrb5.c

index 7847b689c2f03b0aba3734ea72ad64b57aeb4ab5..46d00ba8c474345c5c3212a26f965fc8303804ea 100644 (file)
@@ -550,7 +550,7 @@ int ads_keytab_create_default(ADS_STRUCT *ads)
        ret = smb_krb5_open_keytab(context, NULL, True, &keytab);
        if (ret) {
                DEBUG(1,("ads_keytab_create_default: smb_krb5_open_keytab failed (%s)\n", error_message(ret)));
-               goto out;
+               goto done;
        }
 
        ret = krb5_kt_start_seq_get(context, keytab, &cursor);
index 82796d39ccd329eba3fca7a38c30cfb69e81525e..96c18c3a8c86ad1cbfc439e8dc3d2cc2a432cc37 100644 (file)
@@ -954,7 +954,7 @@ get_key_from_keytab(krb5_context context,
        ret = smb_krb5_open_keytab(context, NULL, False, &keytab);
        if (ret) {
                DEBUG(1,("get_key_from_keytab: smb_krb5_open_keytab failed (%s)\n", error_message(ret)));
-               goto out;
+               return ret;
        }
 
        if ( DEBUGLEVEL >= 10 ) {