svn commit: samba r17677 - in branches/SAMBA_3_0/source: libads libsmb

[gd at samba.org]

Author: gd
Date: 2006-08-22 00:36:31 +0000 (Tue, 22 Aug 2006)
New Revision: 17677

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

Log:
There is no need for a 2nd krb5_to_nt_status function, is there? 

Michael Adam/Volker, please check.

Guenther

Modified:
   branches/SAMBA_3_0/source/libads/ads_status.c
   branches/SAMBA_3_0/source/libads/krb5_errs.c
   branches/SAMBA_3_0/source/libsmb/errormap.c


Changeset:
Modified: branches/SAMBA_3_0/source/libads/ads_status.c
===================================================================
--- branches/SAMBA_3_0/source/libads/ads_status.c	2006-08-21 23:30:39 UTC (rev 17676)
+++ branches/SAMBA_3_0/source/libads/ads_status.c	2006-08-22 00:36:31 UTC (rev 17677)
@@ -83,7 +83,7 @@
 #endif
 #ifdef HAVE_KRB5
 	case ENUM_ADS_ERROR_KRB5:
-		return krb5_to_ntstatus(status.err.rc);
+		return krb5_to_nt_status(status.err.rc);
 #endif
 	default:
 		break;

Modified: branches/SAMBA_3_0/source/libads/krb5_errs.c
===================================================================
--- branches/SAMBA_3_0/source/libads/krb5_errs.c	2006-08-21 23:30:39 UTC (rev 17676)
+++ branches/SAMBA_3_0/source/libads/krb5_errs.c	2006-08-22 00:36:31 UTC (rev 17677)
@@ -55,6 +55,7 @@
 #if defined(KRB5KRB_ERR_RESPONSE_TOO_BIG)
 	{KRB5KRB_ERR_RESPONSE_TOO_BIG, NT_STATUS_PROTOCOL_UNREACHABLE},
 #endif
+	{KRB5KDC_ERR_NONE, NT_STATUS_OK},
 	{0, NT_STATUS_OK}
 };
 

Modified: branches/SAMBA_3_0/source/libsmb/errormap.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/errormap.c	2006-08-21 23:30:39 UTC (rev 17676)
+++ branches/SAMBA_3_0/source/libsmb/errormap.c	2006-08-22 00:36:31 UTC (rev 17677)
@@ -1566,40 +1566,3 @@
 	/* Default return */
 	return NT_STATUS_ACCESS_DENIED;
 }
-
-#ifdef HAVE_KRB5
-/*********************************************************************
- Map a krb5 error code to an NT error code
-*********************************************************************/
-
-struct krb5_error_map {
-	int krb5_error;
-	NTSTATUS nt_error;
-};
-
-const struct krb5_error_map krb5_nt_errmap[] = {
-	{ KRB5KDC_ERR_PREAUTH_FAILED, NT_STATUS_LOGON_FAILURE },
-	{ KRB5_KDC_UNREACH, NT_STATUS_NO_LOGON_SERVERS },
-	{ KRB5KRB_AP_ERR_SKEW, NT_STATUS_TIME_DIFFERENCE_AT_DC },
-	/* not sure if this mapping is appropriate */
-	{ KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN, NT_STATUS_NO_TRUST_SAM_ACCOUNT },
-	{ KRB5KDC_ERR_NONE, NT_STATUS_OK },
-	/* end of array flag - not used as error code... */
-	{ 0, NT_STATUS_OK }
-};
-
-NTSTATUS krb5_to_ntstatus(int error) 
-{
-	int i = 0;
-
-	while (krb5_nt_errmap[i].krb5_error != 0) {
-		if (krb5_nt_errmap[i].krb5_error == error) {
-			return krb5_nt_errmap[i].nt_error;
-		}
-		i++;
-	}
-
-	return NT_STATUS_ACCESS_DENIED;
-}
-#endif
-