diff options
| author | Jeremy Allison <jra@samba.org> | 2004-10-30 00:34:58 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:53:05 -0500 |
| commit | cf47845b1c2e83d49f32bdfc455cd9114a234df8 (patch) | |
| tree | abfc04e577412b5d87bb353c0de9a2367affa1c3 /source3/libsmb | |
| parent | 0772ddbae1be394c538f1d3529ea84434eadcf97 (diff) | |
| download | samba-cf47845b1c2e83d49f32bdfc455cd9114a234df8.tar.gz samba-cf47845b1c2e83d49f32bdfc455cd9114a234df8.tar.bz2 samba-cf47845b1c2e83d49f32bdfc455cd9114a234df8.zip | |
r3379: More merging of kerberos keytab and salting fixes from Nalin Dahyabhai <nalin@redhat.com>
(bugid #1717).
Jeremy.
(This used to be commit 30b8807cf6d5c3c5b9947a7e841d69f0b22eb019)
Diffstat (limited to 'source3/libsmb')
| -rw-r--r-- | source3/libsmb/clikrb5.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c index 32a50464e0..f81e86abf4 100644 --- a/source3/libsmb/clikrb5.c +++ b/source3/libsmb/clikrb5.c @@ -77,7 +77,7 @@ pkaddr->contents = (krb5_octet *)&(((struct sockaddr_in *)paddr)->sin_addr); } #else - __ERROR__XX__UNKNOWN_ADDRTYPE +#error UNKNOWN_ADDRTYPE #endif #if defined(HAVE_KRB5_PRINCIPAL2SALT) && defined(HAVE_KRB5_USE_ENCTYPE) && defined(HAVE_KRB5_STRING_TO_KEY) @@ -120,7 +120,7 @@ salt, key); } #else - __ERROR_XX_UNKNOWN_CREATE_KEY_FUNCTIONS +#error UNKNOWN_CREATE_KEY_FUNCTIONS #endif int create_kerberos_key_from_string(krb5_context context, |