diff options
| author | Gerald Carter <jerry@samba.org> | 2004-05-07 02:48:03 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:51:28 -0500 |
| commit | 63378d6f0efa4612da1aecb5dee14992ac069d0f (patch) | |
| tree | 380dffa82cd416960fdea169e622bb9726562f9a /source3/libads | |
| parent | 675ecdd5babbcf2d87e807e21375a4c0d81dfa14 (diff) | |
| download | samba-63378d6f0efa4612da1aecb5dee14992ac069d0f.tar.gz samba-63378d6f0efa4612da1aecb5dee14992ac069d0f.tar.bz2 samba-63378d6f0efa4612da1aecb5dee14992ac069d0f.zip | |
r541: fixing segfault in winbindd caused -r527 -- looks like a bug in heimdal; also initialize some pointers
(This used to be commit be74e88d9a4b74fcaf25b0816e3fa8a487c91ab5)
Diffstat (limited to 'source3/libads')
| -rw-r--r-- | source3/libads/kerberos.c | 8 | ||||
| -rw-r--r-- | source3/libads/krb5_setpw.c | 6 | ||||
| -rw-r--r-- | source3/libads/sasl.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/source3/libads/kerberos.c b/source3/libads/kerberos.c index 70f6f3386c..e8bf4b0846 100644 --- a/source3/libads/kerberos.c +++ b/source3/libads/kerberos.c @@ -56,9 +56,9 @@ kerb_prompter(krb5_context ctx, void *data, */ int kerberos_kinit_password(const char *principal, const char *password, int time_offset, time_t *expire_time) { - krb5_context ctx; + krb5_context ctx = NULL; krb5_error_code code = 0; - krb5_ccache cc; + krb5_ccache cc = NULL; krb5_principal me; krb5_creds my_creds; @@ -142,8 +142,8 @@ int ads_kinit_password(ADS_STRUCT *ads) int ads_kdestroy(const char *cc_name) { krb5_error_code code; - krb5_context ctx; - krb5_ccache cc; + krb5_context ctx = NULL; + krb5_ccache cc = NULL; if ((code = krb5_init_context (&ctx))) { DEBUG(3, ("ads_kdestroy: kdb5_init_context rc=%d\n", code)); diff --git a/source3/libads/krb5_setpw.c b/source3/libads/krb5_setpw.c index 16d3df83e9..5c859f0e99 100644 --- a/source3/libads/krb5_setpw.c +++ b/source3/libads/krb5_setpw.c @@ -463,12 +463,12 @@ ADS_STATUS ads_krb5_set_password(const char *kdc_host, const char *princ, ADS_STATUS aret; krb5_error_code ret; - krb5_context context; + krb5_context context = NULL; krb5_principal principal; char *princ_name; char *realm; krb5_creds creds, *credsp; - krb5_ccache ccache; + krb5_ccache ccache = NULL; ret = krb5_init_context(&context); if (ret) { @@ -578,7 +578,7 @@ static ADS_STATUS ads_krb5_chg_password(const char *kdc_host, { ADS_STATUS aret; krb5_error_code ret; - krb5_context context; + krb5_context context = NULL; krb5_principal princ; krb5_get_init_creds_opt opts; krb5_creds creds; diff --git a/source3/libads/sasl.c b/source3/libads/sasl.c index 971156ae61..18cbb46588 100644 --- a/source3/libads/sasl.c +++ b/source3/libads/sasl.c @@ -273,7 +273,7 @@ static ADS_STATUS ads_sasl_gssapi_bind(ADS_STRUCT *ads) unsigned sec_layer; ADS_STATUS status; krb5_principal principal; - krb5_context ctx; + krb5_context ctx = NULL; krb5_enctype enc_types[] = { #ifdef ENCTYPE_ARCFOUR_HMAC ENCTYPE_ARCFOUR_HMAC, |