summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2003-04-21 13:10:35 +0000
committerAndrew Bartlett <abartlet@samba.org>2003-04-21 13:10:35 +0000
commit06c99d15e217e265d51778268d5b859dff3c478c (patch)
tree3f08208a8d13e02037fb672de4ae3efdc783803a
parentc75af6b98034e2b6c57065468f98315c3e154885 (diff)
downloadsamba-06c99d15e217e265d51778268d5b859dff3c478c.tar.gz
samba-06c99d15e217e265d51778268d5b859dff3c478c.tar.bz2
samba-06c99d15e217e265d51778268d5b859dff3c478c.zip
Add const, static and fix a double free() (merge from HEAD).
(This used to be commit 9ba88c7314168b87b72a7e9dc3c7588dcce86893)
-rw-r--r--source3/libads/krb5_setpw.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/source3/libads/krb5_setpw.c b/source3/libads/krb5_setpw.c
index a5b9eee4ce..214871b3fb 100644
--- a/source3/libads/krb5_setpw.c
+++ b/source3/libads/krb5_setpw.c
@@ -538,7 +538,6 @@ ADS_STATUS krb5_set_password(const char *kdc_host, const char *princ, const char
krb5_free_creds(context, credsp);
krb5_free_principal(context, creds.client);
- krb5_free_principal(context, creds.server);
krb5_free_principal(context, principal);
krb5_free_context(context);
@@ -571,11 +570,11 @@ kerb_prompter(krb5_context ctx, void *data,
return 0;
}
-ADS_STATUS krb5_chg_password(const char *kdc_host,
- const char *principal,
- const char *oldpw,
- const char *newpw,
- int time_offset)
+static ADS_STATUS krb5_chg_password(const char *kdc_host,
+ const char *principal,
+ const char *oldpw,
+ const char *newpw,
+ int time_offset)
{
ADS_STATUS aret;
krb5_error_code ret;