summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2005-06-05 13:41:32 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:17:39 -0500
commit8107bdec7b451fbb980c0cc22e61501cd76545e6 (patch)
tree83ddb20925a5f4529587f15d282caa1c4fe83fcb
parent7f9f0897eb06960e770cd61fa9c43a941526cd7d (diff)
downloadsamba-8107bdec7b451fbb980c0cc22e61501cd76545e6.tar.gz
samba-8107bdec7b451fbb980c0cc22e61501cd76545e6.tar.bz2
samba-8107bdec7b451fbb980c0cc22e61501cd76545e6.zip
r7306: Use a consistant #define for detecting support for the Heimdal krb5
log redirection code. Andrew Bartlett (This used to be commit 93335d587d9f48c46d9c3b91237f649693cf3003)
-rw-r--r--source4/auth/auth_sam.c8
-rw-r--r--source4/auth/kerberos/clikrb5.c4
-rw-r--r--source4/auth/kerberos/kerberos.h6
3 files changed, 9 insertions, 9 deletions
diff --git a/source4/auth/auth_sam.c b/source4/auth/auth_sam.c
index a4dd8984dd..1ad9087bfe 100644
--- a/source4/auth/auth_sam.c
+++ b/source4/auth/auth_sam.c
@@ -173,7 +173,7 @@ static NTSTATUS authsam_account_ok(TALLOC_CTX *mem_ctx,
Look for the specified user in the sam, return ldb result structures
****************************************************************************/
-static NTSTATUS authsam_search_account(TALLOC_CTX *mem_ctx, void *sam_ctx,
+static NTSTATUS authsam_search_account(TALLOC_CTX *mem_ctx, struct ldb_context *sam_ctx,
const char *account_name,
const char *domain_name,
struct ldb_message ***ret_msgs,
@@ -312,7 +312,7 @@ static NTSTATUS authsam_search_account(TALLOC_CTX *mem_ctx, void *sam_ctx,
}
static NTSTATUS authsam_authenticate(const struct auth_context *auth_context,
- TALLOC_CTX *mem_ctx, void *sam_ctx,
+ TALLOC_CTX *mem_ctx, struct ldb_context *sam_ctx,
struct ldb_message **msgs,
struct ldb_message **msgs_domain,
const struct auth_usersupplied_info *user_info,
@@ -362,7 +362,7 @@ static NTSTATUS authsam_authenticate(const struct auth_context *auth_context,
return nt_status;
}
-static NTSTATUS authsam_make_server_info(TALLOC_CTX *mem_ctx, void *sam_ctx,
+static NTSTATUS authsam_make_server_info(TALLOC_CTX *mem_ctx, struct ldb_context *sam_ctx,
struct ldb_message **msgs,
struct ldb_message **msgs_domain,
DATA_BLOB user_sess_key, DATA_BLOB lm_sess_key,
@@ -521,7 +521,7 @@ static NTSTATUS authsam_check_password_internals(struct auth_method_context *ctx
const char *account_name = user_info->account_name;
struct ldb_message **msgs;
struct ldb_message **domain_msgs;
- void *sam_ctx;
+ struct ldb_context *sam_ctx;
DATA_BLOB user_sess_key, lm_sess_key;
if (!account_name || !*account_name) {
diff --git a/source4/auth/kerberos/clikrb5.c b/source4/auth/kerberos/clikrb5.c
index 3858b694a7..431c5cde76 100644
--- a/source4/auth/kerberos/clikrb5.c
+++ b/source4/auth/kerberos/clikrb5.c
@@ -484,7 +484,7 @@ static int smb_krb5_context_destory_1(void *ptr)
return 0;
}
-#ifdef HAVE_KRB5_LOGGING_CONTROL
+#ifdef HAVE_KRB5_LOG_CONTROL
static int smb_krb5_context_destory_2(void *ptr)
{
struct smb_krb5_context *ctx = ptr;
@@ -547,7 +547,7 @@ static void smb_krb5_debug_wrapper(const char *timestr, const char *msg, void *p
}
}
-#ifdef HAVE_KRB5_LOGGING_CONTROL
+#ifdef HAVE_KRB5_LOG_CONTROL
/* TODO: Should we have a different name here? */
ret = krb5_initlog((*smb_krb5_context)->krb5_context, "Samba", &(*smb_krb5_context)->logf);
diff --git a/source4/auth/kerberos/kerberos.h b/source4/auth/kerberos/kerberos.h
index 286e8ceb2e..3e5ad4c502 100644
--- a/source4/auth/kerberos/kerberos.h
+++ b/source4/auth/kerberos/kerberos.h
@@ -22,14 +22,14 @@
#if defined(HAVE_KRB5)
#if defined(HAVE_KRB5_INITLOG) && defined(HAVE_KRB5_ADDLOG_FUNC) && defined(HAVE_KRB5_FREELOG) && defined (HAVE_KRB5_SET_WARN_DEST) && defined(HAVE_KRB5_LOG_FACILITY)
-#define HAVE_KRB5_LOGGGING_CONTROL
+#define HAVE_KRB5_LOG_CONTROL
#else
-#undef HAVE_KRB5_LOGGGING_CONTROL
+#undef HAVE_KRB5_LOG_CONTROL
#endif
struct smb_krb5_context {
krb5_context krb5_context;
-#ifdef HAVE_KRB5_LOGGGING_CONTROL
+#ifdef HAVE_KRB5_LOG_CONTROL
krb5_log_facility *logf;
#endif
};