svn commit: samba r7306 - in branches/SAMBA_4_0/source/auth: . kerberos

[abartlet at samba.org]

Author: abartlet
Date: 2005-06-05 13:41:32 +0000 (Sun, 05 Jun 2005)
New Revision: 7306

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7306

Log:
Use a consistant #define for detecting support for the Heimdal krb5
log redirection code.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/auth/auth_sam.c
   branches/SAMBA_4_0/source/auth/kerberos/clikrb5.c
   branches/SAMBA_4_0/source/auth/kerberos/kerberos.h


Changeset:
Modified: branches/SAMBA_4_0/source/auth/auth_sam.c
===================================================================
--- branches/SAMBA_4_0/source/auth/auth_sam.c	2005-06-05 13:37:27 UTC (rev 7305)
+++ branches/SAMBA_4_0/source/auth/auth_sam.c	2005-06-05 13:41:32 UTC (rev 7306)
@@ -173,7 +173,7 @@
  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_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 @@
 	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 @@
 	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) {

Modified: branches/SAMBA_4_0/source/auth/kerberos/clikrb5.c
===================================================================
--- branches/SAMBA_4_0/source/auth/kerberos/clikrb5.c	2005-06-05 13:37:27 UTC (rev 7305)
+++ branches/SAMBA_4_0/source/auth/kerberos/clikrb5.c	2005-06-05 13:41:32 UTC (rev 7306)
@@ -484,7 +484,7 @@
 	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 @@
 		}
 	}
 
-#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);
 	

Modified: branches/SAMBA_4_0/source/auth/kerberos/kerberos.h
===================================================================
--- branches/SAMBA_4_0/source/auth/kerberos/kerberos.h	2005-06-05 13:37:27 UTC (rev 7305)
+++ branches/SAMBA_4_0/source/auth/kerberos/kerberos.h	2005-06-05 13:41:32 UTC (rev 7306)
@@ -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
 };