diff options
author | Andrew Bartlett <abartlet@samba.org> | 2003-02-24 21:07:03 +0000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2003-02-24 21:07:03 +0000 |
commit | 79aaa35ea5e8c74ff7755ec650aca88cc7e4cf7e (patch) | |
tree | bea100942febf0750d685f4b7a268a00c6e2df83 | |
parent | 05262ea49a3d428e015ef71c975231b108847b72 (diff) | |
download | samba-79aaa35ea5e8c74ff7755ec650aca88cc7e4cf7e.tar.gz samba-79aaa35ea5e8c74ff7755ec650aca88cc7e4cf7e.tar.bz2 samba-79aaa35ea5e8c74ff7755ec650aca88cc7e4cf7e.zip |
Clean up non-krb5 breakages from my modifications to luke howard's patch.
Andrew Bartlett
(This used to be commit 32fd0c49009e38022523cc5c14567dd55de08206)
-rw-r--r-- | source3/include/includes.h | 1 | ||||
-rw-r--r-- | source3/libsmb/clikrb5.c | 8 |
2 files changed, 2 insertions, 7 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 5b4c5a695f..fab02141cb 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1239,6 +1239,7 @@ krb5_const_principal get_principal_from_tkt(krb5_ticket *tkt); krb5_error_code krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters); krb5_error_code get_kerberos_allowed_etypes(krb5_context context, krb5_enctype **enctypes); void free_kerberos_etypes(krb5_context context, krb5_enctype *enctypes); +BOOL krb5_get_smb_session_key(krb5_context context, krb5_auth_context auth_context, uint8 session_key[16]); #endif /* HAVE_KRB5 */ #endif /* _INCLUDES_H */ diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c index 47dec1f171..6b0c7ddaf2 100644 --- a/source3/libsmb/clikrb5.c +++ b/source3/libsmb/clikrb5.c @@ -365,7 +365,7 @@ failed: return data_blob(NULL, 0); } -BOOL krb5_get_smb_session_key(krb5_context context, krb5_auth_context auth_context, uint8 session_key[16]) + BOOL krb5_get_smb_session_key(krb5_context context, krb5_auth_context auth_context, uint8 session_key[16]) { krb5_keyblock *skey; BOOL ret = False; @@ -394,10 +394,4 @@ DATA_BLOB krb5_get_ticket(const char *principal, time_t time_offset) return data_blob(NULL, 0); } -BOOL krb5_get_smb_session_key(krb5_context context, krb5_auth_context ac, uint8 session_key[16]) - { - DEBUG(0,("NO KERBEROS SUPPORT\n")); - memset(session_key, 0, 16); - return False; - } #endif |