[SCM] Samba Shared Repository - branch master updated

Matthias Dieter Wallnöfer mdw at samba.org
Mon Oct 18 14:33:01 MDT 2010


The branch, master has been updated
       via  1ac19c1 s4:ldap_server - use error code constant
       via  dcbfcbb ldb: always return PROTOCOL_ERROR if an operation is unsupported
      from  902e728 selftest: use full path for selftest.pl instead of relative paths

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 1ac19c1ca3164dc6a1b29ce81047bab81a9af918
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Mon Oct 18 21:22:37 2010 +0200

    s4:ldap_server - use error code constant
    
    Autobuild-User: Matthias Dieter Wallnöfer <mdw at samba.org>
    Autobuild-Date: Mon Oct 18 20:32:40 UTC 2010 on sn-devel-104

commit dcbfcbbceb87e742b642a9dffee1304dcf0b93bb
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Mon Oct 18 21:21:45 2010 +0200

    ldb: always return PROTOCOL_ERROR if an operation is unsupported
    
    That's exactly the behaviour of various LDAP servers.

-----------------------------------------------------------------------

Summary of changes:
 source4/ldap_server/ldap_backend.c        |    2 +-
 source4/lib/ldb/ldb_ildap/ldb_ildap.c     |    2 +-
 source4/lib/ldb/ldb_ldap/ldb_ldap.c       |    2 +-
 source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c |    2 +-
 source4/lib/ldb/ldb_tdb/ldb_tdb.c         |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/ldap_server/ldap_backend.c b/source4/ldap_server/ldap_backend.c
index 6f2a764..bab5923 100644
--- a/source4/ldap_server/ldap_backend.c
+++ b/source4/ldap_server/ldap_backend.c
@@ -1157,6 +1157,6 @@ NTSTATUS ldapsrv_do_call(struct ldapsrv_call *call)
 	case LDAP_TAG_ExtendedRequest:
 		return ldapsrv_ExtendedRequest(call);
 	default:
-		return ldapsrv_unwilling(call, 2);
+		return ldapsrv_unwilling(call, LDAP_PROTOCOL_ERROR);
 	}
 }
diff --git a/source4/lib/ldb/ldb_ildap/ldb_ildap.c b/source4/lib/ldb/ldb_ildap/ldb_ildap.c
index 774336b..dab5abf 100644
--- a/source4/lib/ldb/ldb_ildap/ldb_ildap.c
+++ b/source4/lib/ldb/ldb_ildap/ldb_ildap.c
@@ -759,7 +759,7 @@ static int ildb_handle_request(struct ldb_module *module, struct ldb_request *re
 		break;
 	default:
 		/* no other op supported */
-		ret = LDB_ERR_OPERATIONS_ERROR;
+		ret = LDB_ERR_PROTOCOL_ERROR;
 		break;
 	}
 
diff --git a/source4/lib/ldb/ldb_ldap/ldb_ldap.c b/source4/lib/ldb/ldb_ldap/ldb_ldap.c
index 8383627..b83ca87 100644
--- a/source4/lib/ldb/ldb_ldap/ldb_ldap.c
+++ b/source4/lib/ldb/ldb_ldap/ldb_ldap.c
@@ -810,7 +810,7 @@ static int lldb_handle_request(struct ldb_module *module, struct ldb_request *re
 		break;
 	default:
 		/* no other op supported */
-		ret = LDB_ERR_OPERATIONS_ERROR;
+		ret = LDB_ERR_PROTOCOL_ERROR;
 		break;
 	}
 
diff --git a/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c b/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
index 2225327..3aa6672 100644
--- a/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
+++ b/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
@@ -1520,7 +1520,7 @@ static void lsql_callback(struct tevent_context *ev,
  */
 	default:
 		/* no other op supported */
-		ret = LDB_ERR_UNWILLING_TO_PERFORM;
+		ret = LDB_ERR_PROTOCOL_ERROR;
 	}
 
 	if (!ctx->callback_failed) {
diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb.c b/source4/lib/ldb/ldb_tdb/ldb_tdb.c
index 4350537..1637c66 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_tdb.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_tdb.c
@@ -1241,7 +1241,7 @@ static void ltdb_callback(struct tevent_context *ev,
 		goto done;
 	default:
 		/* no other op supported */
-		ret = LDB_ERR_UNWILLING_TO_PERFORM;
+		ret = LDB_ERR_PROTOCOL_ERROR;
 	}
 
 	if (!ctx->request_terminated) {


-- 
Samba Shared Repository


More information about the samba-cvs mailing list