From: Kurt Zeilenga <kurt@openldap.org>
Date: Tue, 25 Apr 2000 13:18:59 +0000 (+0000)
Subject: LDAP_OPERATIONS_ERROR -> LDAP_OTHER
X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~3071
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=01c4e0f03c8975aae84d1507e7f03b5273c827e4;p=openldap

LDAP_OPERATIONS_ERROR -> LDAP_OTHER
and other error handling changes
---

diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index 0b5a522a80..e7819727fa 100644
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.c
@@ -122,7 +122,7 @@ do_add( Connection *conn, Operation *op )
 			Debug( LDAP_DEBUG_ANY, "no values for type %s\n",
 				mod->ml_type, 0, 0 );
 			send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR,
-				NULL, "no values for type", NULL, NULL );
+				NULL, "no values for attribute type", NULL, NULL );
 			free( mod->ml_type );
 #ifdef SLAPD_SCHEMA_NOT_COMPAT
 			free( mod );
@@ -161,7 +161,7 @@ do_add( Connection *conn, Operation *op )
 #endif
 	{
 		send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR,
-			NULL, "No attributes provided", NULL, NULL );
+			NULL, "no attributes provided", NULL, NULL );
 		goto done;
 	}
 
@@ -193,7 +193,7 @@ do_add( Connection *conn, Operation *op )
 		Debug( LDAP_DEBUG_ANY, "do_add: database is read-only\n",
 		       0, 0, 0 );
 		send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
-			NULL, "database is read-only", NULL, NULL );
+			NULL, "directory is read-only", NULL, NULL );
 		goto done;
 	}
 
@@ -273,7 +273,7 @@ do_add( Connection *conn, Operation *op )
 	} else {
 	    Debug( LDAP_DEBUG_ARGS, "    do_add: HHH\n", 0, 0, 0 );
 		send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
-			NULL, "Function not implemented", NULL, NULL );
+			NULL, "read function not implemented", NULL, NULL );
 	}
 
 done:
diff --git a/servers/slapd/compare.c b/servers/slapd/compare.c
index 2899e38e77..d72acef032 100644
--- a/servers/slapd/compare.c
+++ b/servers/slapd/compare.c
@@ -154,7 +154,7 @@ do_compare(
 		(*be->be_compare)( be, conn, op, dn, ndn, &ava );
 	} else {
 		send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
-			NULL, "Function not implemented", NULL, NULL );
+			NULL, "compare function not implemented", NULL, NULL );
 	}
 
 cleanup:
diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c
index 2e1e98cfa3..1da0f08de9 100644
--- a/servers/slapd/delete.c
+++ b/servers/slapd/delete.c
@@ -91,7 +91,7 @@ do_delete(
 		Debug( LDAP_DEBUG_ANY, "do_delete: database is read-only\n",
 		       0, 0, 0 );
 		send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM,
-		                  NULL, "database is read-only", NULL, NULL );
+		                  NULL, "directory is read-only", NULL, NULL );
 		rc = LDAP_UNWILLING_TO_PERFORM;
 		goto cleanup;
 	}
@@ -130,7 +130,7 @@ do_delete(
 
 	} else {
 		send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
-			NULL, "Function not implemented", NULL, NULL );
+			NULL, "delete function not implemented", NULL, NULL );
 	}
 cleanup:
 	if( ndn != NULL ) free( ndn );
diff --git a/servers/slapd/libslapd.dsp b/servers/slapd/libslapd.dsp
index cf0eadfcfc..152c8525dc 100644
--- a/servers/slapd/libslapd.dsp
+++ b/servers/slapd/libslapd.dsp
@@ -42,6 +42,7 @@ CPP=cl.exe
 # PROP Output_Dir "..\..\Release"
 # PROP Intermediate_Dir "..\..\Release\libslapd"
 # PROP Target_Dir ""
+RSC=rc.exe
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
 BSC32=bscmake.exe
@@ -63,6 +64,7 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\Debug"
 # PROP Intermediate_Dir "..\..\Debug\libslapd"
 # PROP Target_Dir ""
+RSC=rc.exe
 # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX /FD /c
 BSC32=bscmake.exe
@@ -84,6 +86,7 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\SDebug"
 # PROP Intermediate_Dir "..\..\SDebug\libslapd"
 # PROP Target_Dir ""
+RSC=rc.exe
 # ADD BASE CPP /nologo /MTd /W3 /GX /Z7 /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD CPP /nologo /W3 /GX /Z7 /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX /FD /c
 BSC32=bscmake.exe
@@ -105,6 +108,7 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\SRelease"
 # PROP Intermediate_Dir "..\..\SRelease\libslapd"
 # PROP Target_Dir ""
+RSC=rc.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD CPP /nologo /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
 BSC32=bscmake.exe
diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index 87ae7a13fb..58d423e48e 100644
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -193,7 +193,7 @@ do_modify(
 		Debug( LDAP_DEBUG_ANY, "do_modify: database is read-only\n",
 		       0, 0, 0 );
 		send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
-		                  NULL, "database is read-only", NULL, NULL );
+		                  NULL, "directory is read-only", NULL, NULL );
 		goto cleanup;
 	}
 
@@ -269,7 +269,7 @@ do_modify(
 		}
 	} else {
 		send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
-		    NULL, "Function not implemented", NULL, NULL );
+		    NULL, "modify function not implemented", NULL, NULL );
 	}
 
 cleanup:
diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c
index 0bf65de0fd..69e4d42667 100644
--- a/servers/slapd/modrdn.c
+++ b/servers/slapd/modrdn.c
@@ -109,7 +109,7 @@ do_modrdn(
 			Debug( LDAP_DEBUG_ANY, "do_modrdn: invalid new superior (%s)\n",
 				newSuperior, 0, 0 );
 			send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
-				"new superior invalid", NULL, NULL );
+				"invalid new superior DN", NULL, NULL );
 			goto cleanup;
 		}
 
@@ -240,7 +240,7 @@ do_modrdn(
 		}
 	} else {
 		send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
-			NULL, "Function not implemented", NULL, NULL );
+			NULL, "modrdn/moddn function not implemented", NULL, NULL );
 	}
 
 cleanup: