diff options
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/include/includes.h | 1 | ||||
| -rw-r--r-- | source3/libsmb/clikrb5.c | 20 | 
2 files changed, 10 insertions, 11 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index c937f597cd..7513dfb6e0 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1144,7 +1144,6 @@ void krb5_free_unparsed_name(krb5_context ctx, char *val);  /* Samba wrapper function for krb5 functionality. */  bool setup_kaddr( krb5_address *pkaddr, struct sockaddr_storage *paddr);  int create_kerberos_key_from_string(krb5_context context, krb5_principal host_princ, krb5_data *password, krb5_keyblock *key, krb5_enctype enctype); -int create_kerberos_key_from_string_direct(krb5_context context, krb5_principal host_princ, krb5_data *password, krb5_keyblock *key, krb5_enctype enctype);  bool get_auth_data_from_tkt(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, krb5_ticket *tkt);  krb5_const_principal get_principal_from_tkt(krb5_ticket *tkt);  krb5_error_code smb_krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters); diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c index 7688b0bd12..4c535d2bcf 100644 --- a/source3/libsmb/clikrb5.c +++ b/source3/libsmb/clikrb5.c @@ -210,11 +210,11 @@ static krb5_error_code smb_krb5_parse_name_norealm_conv(krb5_context context,  #endif  #if defined(HAVE_KRB5_PRINCIPAL2SALT) && defined(HAVE_KRB5_USE_ENCTYPE) && defined(HAVE_KRB5_STRING_TO_KEY) && defined(HAVE_KRB5_ENCRYPT_BLOCK) - int create_kerberos_key_from_string_direct(krb5_context context, -					krb5_principal host_princ, -					krb5_data *password, -					krb5_keyblock *key, -					krb5_enctype enctype) +static int create_kerberos_key_from_string_direct(krb5_context context, +						  krb5_principal host_princ, +						  krb5_data *password, +						  krb5_keyblock *key, +						  krb5_enctype enctype)  {  	int ret;  	krb5_data salt; @@ -231,11 +231,11 @@ static krb5_error_code smb_krb5_parse_name_norealm_conv(krb5_context context,  	return ret;  }  #elif defined(HAVE_KRB5_GET_PW_SALT) && defined(HAVE_KRB5_STRING_TO_KEY_SALT) - int create_kerberos_key_from_string_direct(krb5_context context, -					krb5_principal host_princ, -					krb5_data *password, -					krb5_keyblock *key, -					krb5_enctype enctype) +static int create_kerberos_key_from_string_direct(krb5_context context, +						  krb5_principal host_princ, +						  krb5_data *password, +						  krb5_keyblock *key, +						  krb5_enctype enctype)  {  	int ret;  	krb5_salt salt;  | 
