diff options
| author | Gerald Carter <jerry@samba.org> | 2004-07-08 15:36:23 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:52:10 -0500 |
| commit | 824bc32be71afafdbaaea94a6cf104a1b3d329ec (patch) | |
| tree | cd6099fb10bd35bf536824b3a1b16bcfc885bdc4 | |
| parent | 8c518daa86518f5752b1f571f08bd34b0143d10e (diff) | |
| download | samba-824bc32be71afafdbaaea94a6cf104a1b3d329ec.tar.gz samba-824bc32be71afafdbaaea94a6cf104a1b3d329ec.tar.bz2 samba-824bc32be71afafdbaaea94a6cf104a1b3d329ec.zip | |
r1399: applying heimdal krb5 fixes from Guenther and fixing compile warnings in libadskerberos_keyatb.c
(This used to be commit 837f56ec8bc171497fb84d332002776313c26305)
| -rw-r--r-- | source3/libsmb/clikrb5.c | 4 | ||||
| -rw-r--r-- | source3/script/mkproto.awk | 2 | ||||
| -rw-r--r-- | source3/utils/net_ads.c | 10 |
3 files changed, 9 insertions, 7 deletions
diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c index 4929bd63ef..abb1eb4acb 100644 --- a/source3/libsmb/clikrb5.c +++ b/source3/libsmb/clikrb5.c @@ -425,7 +425,9 @@ failed: SuSE 9.1 Pro */ if (ccdef) +#if 0 /* redisabled by gd :) at least until any official heimdal version has it fixed. */ krb5_cc_close(context, ccdef); +#endif if (auth_context) krb5_auth_con_free(context, auth_context); krb5_free_context(context); @@ -473,7 +475,7 @@ failed: } #endif - krb5_error_code smb_krb5_kt_free_entry(krb5_context context, krb5_keytab_entry *kt_entry) +krb5_error_code smb_krb5_kt_free_entry(krb5_context context, krb5_keytab_entry *kt_entry) { #if defined(HAVE_KRB5_KT_FREE_ENTRY) return krb5_kt_free_entry(context, kt_entry); diff --git a/source3/script/mkproto.awk b/source3/script/mkproto.awk index 4c9507dcf9..ab9f7d7cb7 100644 --- a/source3/script/mkproto.awk +++ b/source3/script/mkproto.awk @@ -132,7 +132,7 @@ END { gotstart = 1; } - if( $0 ~ /^WINBINDD_PW|^WINBINDD_GR|^NT_PRINTER_INFO_LEVEL_2|^LOGIN_CACHE|^krb5_error_code|^LDAP/ ) { + if( $0 ~ /^WINBINDD_PW|^WINBINDD_GR|^NT_PRINTER_INFO_LEVEL_2|^LOGIN_CACHE|^krb5_error_code|^LDAP|^krb5_error_code/ ) { gotstart = 1; } diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c index b25303a97e..7b8ace85b6 100644 --- a/source3/utils/net_ads.c +++ b/source3/utils/net_ads.c @@ -180,7 +180,7 @@ retry: second_time = True; goto retry; } else { - DEBUG(1,("ads_connect: %s\n", ads_errstr(status))); + DEBUG(0,("ads_connect: %s\n", ads_errstr(status))); return NULL; } } @@ -1163,7 +1163,7 @@ int net_ads_changetrustpw(int argc, const char **argv) { ADS_STRUCT *ads; char *host_principal; - fstring my_fqdn; + fstring my_name; ADS_STATUS ret; if (!secrets_init()) { @@ -1179,9 +1179,9 @@ int net_ads_changetrustpw(int argc, const char **argv) return -1; } - name_to_fqdn(my_fqdn, global_myname()); - strlower_m(my_fqdn); - asprintf(&host_principal, "%s@%s", my_fqdn, ads->config.realm); + fstrcpy(my_name, global_myname()); + strlower_m(my_name); + asprintf(&host_principal, "%s@%s", my_name, ads->config.realm); d_printf("Changing password for principal: HOST/%s\n", host_principal); ret = ads_change_trust_account_password(ads, host_principal); |