diff options
| author | Simo Sorce <idra@samba.org> | 2010-08-18 09:36:54 -0400 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2010-08-18 09:37:56 -0400 |
| commit | 1ab17f13a27429d34439c0ba3b77685e3a55c2c3 (patch) | |
| tree | 7291562f01d98c30f18f465938cbad38e171c520 | |
| parent | d7c8fb21bb0a29bb7227d4b242aba2f1524f6c48 (diff) | |
| download | samba-1ab17f13a27429d34439c0ba3b77685e3a55c2c3.tar.gz samba-1ab17f13a27429d34439c0ba3b77685e3a55c2c3.tar.bz2 samba-1ab17f13a27429d34439c0ba3b77685e3a55c2c3.zip | |
s3-ads: Remove unused wrapper and make function static
| -rw-r--r-- | source3/include/krb5_protos.h | 8 | ||||
| -rw-r--r-- | source3/libads/kerberos_keytab.c | 39 |
2 files changed, 12 insertions, 35 deletions
diff --git a/source3/include/krb5_protos.h b/source3/include/krb5_protos.h index 0b8aa71288..e229a14412 100644 --- a/source3/include/krb5_protos.h +++ b/source3/include/krb5_protos.h @@ -124,14 +124,6 @@ krb5_error_code smb_krb5_keytab_name(TALLOC_CTX *mem_ctx, krb5_context context, krb5_keytab keytab, const char **keytab_name); -int smb_krb5_kt_add_entry_ext(krb5_context context, - krb5_keytab keytab, - krb5_kvno kvno, - const char *princ_s, - krb5_enctype *enctypes, - krb5_data password, - bool no_salt, - bool keep_old_entries); krb5_error_code smb_krb5_get_credentials(krb5_context context, krb5_ccache ccache, krb5_principal me, diff --git a/source3/libads/kerberos_keytab.c b/source3/libads/kerberos_keytab.c index d2215ecbb5..10c7087c96 100644 --- a/source3/libads/kerberos_keytab.c +++ b/source3/libads/kerberos_keytab.c @@ -180,14 +180,14 @@ out: return ret; } -int smb_krb5_kt_add_entry_ext(krb5_context context, - krb5_keytab keytab, - krb5_kvno kvno, - const char *princ_s, - krb5_enctype *enctypes, - krb5_data password, - bool no_salt, - bool keep_old_entries) +static int smb_krb5_kt_add_entry(krb5_context context, + krb5_keytab keytab, + krb5_kvno kvno, + const char *princ_s, + krb5_enctype *enctypes, + krb5_data password, + bool no_salt, + bool keep_old_entries) { krb5_error_code ret; krb5_keytab_entry kt_entry; @@ -250,23 +250,6 @@ out: return (int)ret; } -static int smb_krb5_kt_add_entry(krb5_context context, - krb5_keytab keytab, - krb5_kvno kvno, - const char *princ_s, - krb5_enctype *enctypes, - krb5_data password) -{ - return smb_krb5_kt_add_entry_ext(context, - keytab, - kvno, - princ_s, - enctypes, - password, - false, - false); -} - /********************************************************************** Adds a single service principal, i.e. 'host' to the system keytab ***********************************************************************/ @@ -415,7 +398,8 @@ int ads_keytab_add_entry(ADS_STRUCT *ads, const char *srvPrinc) /* add the fqdn principal to the keytab */ ret = smb_krb5_kt_add_entry(context, keytab, kvno, - princ_s, enctypes, password); + princ_s, enctypes, password, + false, false); if (ret) { DEBUG(1, (__location__ ": Failed to add entry to keytab\n")); goto out; @@ -424,7 +408,8 @@ int ads_keytab_add_entry(ADS_STRUCT *ads, const char *srvPrinc) /* add the short principal name if we have one */ if (short_princ_s) { ret = smb_krb5_kt_add_entry(context, keytab, kvno, - short_princ_s, enctypes, password); + short_princ_s, enctypes, password, + false, false); if (ret) { DEBUG(1, (__location__ ": Failed to add short entry to keytab\n")); |