summaryrefslogtreecommitdiffstats
path: root/source/libsmb/clikrb5.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2004-10-30 00:34:58 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:53:05 -0500
commit30b8807cf6d5c3c5b9947a7e841d69f0b22eb019 (patch)
treeae6eded6a87d89d9ff7ae04b90a95136d1d25d2b /source/libsmb/clikrb5.c
parent7565019286cf44f43c8066c005b1cd5c1556435f (diff)
downloadsamba-30b8807cf6d5c3c5b9947a7e841d69f0b22eb019.tar.gz
samba-30b8807cf6d5c3c5b9947a7e841d69f0b22eb019.tar.xz
samba-30b8807cf6d5c3c5b9947a7e841d69f0b22eb019.zip
r3379: More merging of kerberos keytab and salting fixes from Nalin Dahyabhai <nalin@redhat.com>
(bugid #1717). Jeremy.
Diffstat (limited to 'source/libsmb/clikrb5.c')
-rw-r--r--source/libsmb/clikrb5.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/libsmb/clikrb5.c b/source/libsmb/clikrb5.c
index 32a50464e0c..f81e86abf4c 100644
--- a/source/libsmb/clikrb5.c
+++ b/source/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,