diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-06-08 19:06:16 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-06-12 07:45:48 +1000 |
| commit | 9b261c008a395a323e0516f4cd3f3134aa050577 (patch) | |
| tree | 91cf543ba7ccd560313bea52fa8678f0456e8485 /source4/auth/kerberos/kerberos.c | |
| parent | 5cef57ff7d899773a084d23838b7f18a83f6e79d (diff) | |
| download | samba-9b261c008a395a323e0516f4cd3f3134aa050577.tar.gz samba-9b261c008a395a323e0516f4cd3f3134aa050577.tar.bz2 samba-9b261c008a395a323e0516f4cd3f3134aa050577.zip | |
s4:heimdal: import lorikeet-heimdal-200906080040 (commit 904d0124b46eed7a8ad6e5b73e892ff34b6865ba)
Also including the supporting changes required to pass make test
A number of heimdal functions and constants have changed since we last
imported a tree (for the better, but inconvenient for us).
Andrew Bartlett
Diffstat (limited to 'source4/auth/kerberos/kerberos.c')
| -rw-r--r-- | source4/auth/kerberos/kerberos.c | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/source4/auth/kerberos/kerberos.c b/source4/auth/kerberos/kerberos.c index 1889dcab4d..a0b21c891a 100644 --- a/source4/auth/kerberos/kerberos.c +++ b/source4/auth/kerberos/kerberos.c @@ -40,23 +40,27 @@ { krb5_error_code code = 0; krb5_creds my_creds; - krb5_get_init_creds_opt options; + krb5_get_init_creds_opt *options; - krb5_get_init_creds_opt_init(&options); + if ((code = krb5_get_init_creds_opt_alloc(ctx, &options))) { + return code; + } - krb5_get_init_creds_opt_set_default_flags(ctx, NULL, NULL, &options); + krb5_get_init_creds_opt_set_default_flags(ctx, NULL, NULL, options); if ((code = krb5_get_init_creds_keyblock(ctx, &my_creds, principal, keyblock, - 0, NULL, &options))) { + 0, NULL, options))) { return code; } if ((code = krb5_cc_initialize(ctx, cc, principal))) { + krb5_get_init_creds_opt_free(ctx, options); krb5_free_cred_contents(ctx, &my_creds); return code; } if ((code = krb5_cc_store_cred(ctx, cc, &my_creds))) { + krb5_get_init_creds_opt_free(ctx, options); krb5_free_cred_contents(ctx, &my_creds); return code; } @@ -69,6 +73,7 @@ *kdc_time = (time_t) my_creds.times.starttime; } + krb5_get_init_creds_opt_free(ctx, options); krb5_free_cred_contents(ctx, &my_creds); return 0; @@ -84,24 +89,28 @@ { krb5_error_code code = 0; krb5_creds my_creds; - krb5_get_init_creds_opt options; + krb5_get_init_creds_opt *options; - krb5_get_init_creds_opt_init(&options); + if ((code = krb5_get_init_creds_opt_alloc(ctx, &options))) { + return code; + } - krb5_get_init_creds_opt_set_default_flags(ctx, NULL, NULL, &options); + krb5_get_init_creds_opt_set_default_flags(ctx, NULL, NULL, options); if ((code = krb5_get_init_creds_password(ctx, &my_creds, principal, password, NULL, - NULL, 0, NULL, &options))) { + NULL, 0, NULL, options))) { return code; } if ((code = krb5_cc_initialize(ctx, cc, principal))) { + krb5_get_init_creds_opt_free(ctx, options); krb5_free_cred_contents(ctx, &my_creds); return code; } if ((code = krb5_cc_store_cred(ctx, cc, &my_creds))) { + krb5_get_init_creds_opt_free(ctx, options); krb5_free_cred_contents(ctx, &my_creds); return code; } @@ -114,6 +123,7 @@ *kdc_time = (time_t) my_creds.times.starttime; } + krb5_get_init_creds_opt_free(ctx, options); krb5_free_cred_contents(ctx, &my_creds); return 0; |