merge:

ldap and krb5 configure tests
libads/*.c and libcli/raw/clikrb5.c from 3.0

metze
(This used to be commit 64b5bfcd73d7626d6f687a641b11e64821144df7)

1 files changed, 24 insertions, 15 deletions

diff --git a/source4/libads/ads_status.c b/source4/libads/ads_status.c
index 80fdb99eac..463f647f9c 100644
--- a/source4/libads/ads_status.c
+++ b/source4/libads/ads_status.c
@@ -31,10 +31,10 @@ ADS_STATUS ads_build_error(enum ads_error_type etype,
 {
 	ADS_STATUS ret;
 
-	if (etype == ADS_ERROR_NT) {
-		DEBUG(0,("don't use ads_build_error with ADS_ERROR_NT!\n"));
+	if (etype == ENUM_ADS_ERROR_NT) {
+		DEBUG(0,("don't use ads_build_error with ENUM_ADS_ERROR_NT!\n"));
 		ret.err.rc = -1;
-		ret.error_type = ADS_ERROR_SYSTEM;
+		ret.error_type = ENUM_ADS_ERROR_SYSTEM;
 		ret.minor_status = 0;
 		return ret;	
 	}	
@@ -50,10 +50,10 @@ ADS_STATUS ads_build_nt_error(enum ads_error_type etype,
 {
 	ADS_STATUS ret;
 
-	if (etype != ADS_ERROR_NT) {
-		DEBUG(0,("don't use ads_build_nt_error without ADS_ERROR_NT!\n"));
+	if (etype != ENUM_ADS_ERROR_NT) {
+		DEBUG(0,("don't use ads_build_nt_error without ENUM_ADS_ERROR_NT!\n"));
 		ret.err.rc = -1;
-		ret.error_type = ADS_ERROR_SYSTEM;
+		ret.error_type = ENUM_ADS_ERROR_SYSTEM;
 		ret.minor_status = 0;
 		return ret;	
 	}
@@ -69,15 +69,24 @@ ADS_STATUS ads_build_nt_error(enum ads_error_type etype,
 */
 NTSTATUS ads_ntstatus(ADS_STATUS status)
 {
-	if (status.error_type == ADS_ERROR_NT){
+	if (status.error_type == ENUM_ADS_ERROR_NT){
 		return status.err.nt_status;	
 	}
 #ifdef HAVE_LDAP
-	if ((status.error_type == ADS_ERROR_LDAP) 
+	if ((status.error_type == ENUM_ADS_ERROR_LDAP) 
 	    && (status.err.rc == LDAP_NO_MEMORY)) {
 		return NT_STATUS_NO_MEMORY;
 	}
 #endif
+#ifdef HAVE_KRB5
+	if (status.error_type == ENUM_ADS_ERROR_KRB5) { 
+		if (status.err.rc == KRB5KDC_ERR_PREAUTH_FAILED) {
+			return NT_STATUS_LOGON_FAILURE;
+		} else if (status.err.rc == KRB5_KDC_UNREACH) {
+			return NT_STATUS_NO_LOGON_SERVERS;
+		}
+	}
+#endif
 	if (ADS_ERR_OK(status)) return NT_STATUS_OK;
 	return NT_STATUS_UNSUCCESSFUL;
 }
@@ -87,25 +96,25 @@ NTSTATUS ads_ntstatus(ADS_STATUS status)
 */
 const char *ads_errstr(ADS_STATUS status)
 {
-	int msg_ctx;
+	uint32 msg_ctx;
 	static char *ret;
 
 	SAFE_FREE(ret);
 	msg_ctx = 0;
 
 	switch (status.error_type) {
-	case ADS_ERROR_SYSTEM:
+	case ENUM_ADS_ERROR_SYSTEM:
 		return strerror(status.err.rc);
 #ifdef HAVE_LDAP
-	case ADS_ERROR_LDAP:
+	case ENUM_ADS_ERROR_LDAP:
 		return ldap_err2string(status.err.rc);
 #endif
 #ifdef HAVE_KRB5
-	case ADS_ERROR_KRB5: 
+	case ENUM_ADS_ERROR_KRB5: 
 		return error_message(status.err.rc);
 #endif
 #ifdef HAVE_GSSAPI
-	case ADS_ERROR_GSS:
+	case ENUM_ADS_ERROR_GSS:
 	{
 		uint32 minor;
 		
@@ -122,8 +131,8 @@ const char *ads_errstr(ADS_STATUS status)
 		return ret;
 	}
 #endif
-	case ADS_ERROR_NT: 
-		return nt_errstr(ads_ntstatus(status));
+	case ENUM_ADS_ERROR_NT: 
+		return get_friendly_nt_error_msg(ads_ntstatus(status));
 	default:
 		return "Unknown ADS error type!? (not compiled in?)";
 	}