The branch, master has been updated
via 926a935... s4:wbclient.h - add compatibility constants
via 78ebc02... Revert "s4:ldb - add a check which has to be done on
beginning of a "modify" operation"
from 5eb14b2... s3-docs: remove xml artefact from net.8.xml.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 926a935a612e3d3d3aec6473303a884126d9ea72
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Mon Oct 12 16:28:34 2009 +0200
s4:wbclient.h - add compatibility constants
This is the result of a discussion on samba-technical on how to deal best
with
existing programs which don't support my changes in the interface yet. Metze
pointed out this "defines" as a possibility and simo and I agreed.
commit 78ebc02146411867c8573b44e541064179895bfa
Author: Matthias Dieter Wallnöfer <[email protected]>
Date: Mon Oct 12 16:19:04 2009 +0200
Revert "s4:ldb - add a check which has to be done on beginning of a
"modify" operation"
This reverts commit f9990e9b391f330a8e6c5c158ee4e4eaa50f6176.
abartlet claims that this behaviour is too AD specific to put here. Btw I
had
also some doubts if this is clean enough. I put it only here to make
"ldap.py"
pass.
I'll try to find a new solution soon.
-----------------------------------------------------------------------
Summary of changes:
nsswitch/libwbclient/wbclient.h | 6 ++++++
source4/lib/ldb/common/ldb.c | 8 --------
2 files changed, 6 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/libwbclient/wbclient.h b/nsswitch/libwbclient/wbclient.h
index ced82d8..e262679 100644
--- a/nsswitch/libwbclient/wbclient.h
+++ b/nsswitch/libwbclient/wbclient.h
@@ -438,6 +438,12 @@ enum wbcPasswordChangeRejectReason {
WBC_PWD_CHANGE_PASSWORD_TOO_LONG=8
};
+/* Note: this defines exist for compatibility reasons with existing code */
+#define WBC_PWD_CHANGE_REJECT_OTHER WBC_PWD_CHANGE_NO_ERROR
+#define WBC_PWD_CHANGE_REJECT_TOO_SHORT WBC_PWD_CHANGE_PASSWORD_TOO_SHORT
+#define WBC_PWD_CHANGE_REJECT_IN_HISTORY WBC_PWD_CHANGE_PWD_IN_HISTORY
+#define WBC_PWD_CHANGE_REJECT_COMPLEXITY WBC_PWD_CHANGE_NOT_COMPLEX
+
/**
* @brief Logoff User Parameters
**/
diff --git a/source4/lib/ldb/common/ldb.c b/source4/lib/ldb/common/ldb.c
index 4c27de7..e9c9245 100644
--- a/source4/lib/ldb/common/ldb.c
+++ b/source4/lib/ldb/common/ldb.c
@@ -1358,14 +1358,6 @@ int ldb_modify(struct ldb_context *ldb,
return ret;
}
- if (message->num_elements == 0) {
- /* this needs also to be returned when the specified object
- doesn't exist. Therefore this test is located here. */
- ldb_asprintf_errstring(ldb, "LDB message has to have
elements/attributes (%s)!",
- ldb_dn_get_linearized(message->dn));
- return LDB_ERR_UNWILLING_TO_PERFORM;
- }
-
ret = ldb_build_mod_req(&req, ldb, ldb,
message,
NULL,
--
Samba Shared Repository
