The branch, master has been updated
via 41cdcd5... s4:provision.ldif - fix the number of available RIDs
via fec489b... s4:provision.ldif - this Win2003 revision level seems
always to be "9" on Windows Server 2008 machines
via 64e19ef... s4:provision_users.ldif - change a group description to
be correct
via 560620a... s4:upgradeprovision - fix include order for "ldb"
via e228b67... s4/ldb: ldb_msg_el_map_remote() should rename the remote
attribute names into local names as defined in simple_ldap_map.c.
via e88f37d... s4:setup/provision.reg - raise version to Windows Server
2008 R2
via b172b7f... s4:libnet_join.c - always use LDB constants
from f34db12... Add parse_setjob_command() to make setting job state
easier for users.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 41cdcd54b7b7e3fb70fdb220e74a1daf30e1891a
Author: Matthias Dieter Wallnöfer <m...@samba.org>
Date: Thu Jun 24 09:35:58 2010 +0200
s4:provision.ldif - fix the number of available RIDs
There should be 4611686014132422209 and not 4611686014132422109.
commit fec489bd8706a7dbb84589ff7f5da08550d86e78
Author: Matthias Dieter Wallnöfer <m...@samba.org>
Date: Thu Jun 24 09:23:32 2010 +0200
s4:provision.ldif - this Win2003 revision level seems always to be "9" on
Windows Server 2008 machines
commit 64e19ef9fb85d31f9428a6714ce485de2704734b
Author: Matthias Dieter Wallnöfer <m...@samba.org>
Date: Thu Jun 24 09:14:24 2010 +0200
s4:provision_users.ldif - change a group description to be correct
commit 560620a53df66ddbaa273afc9db796fc7562b53d
Author: Matthias Dieter Wallnöfer <m...@samba.org>
Date: Thu Jun 24 09:06:49 2010 +0200
s4:upgradeprovision - fix include order for "ldb"
Patch originally posted on the list by Matthieu Patou.
commit e228b67e56ab63414055e64455a97ea0643803e2
Author: Endi S. Dewata <edew...@redhat.com>
Date: Wed Jun 23 07:26:25 2010 -0500
s4/ldb: ldb_msg_el_map_remote() should rename the remote attribute names
into local names as defined in simple_ldap_map.c.
commit e88f37daa068f7effe6f11b8ff8aeb79316e6632
Author: Matthias Dieter Wallnöfer <mwallnoe...@yahoo.de>
Date: Sun Mar 7 21:13:27 2010 +0100
s4:setup/provision.reg - raise version to Windows Server 2008 R2
commit b172b7f467e3c2968ec154fab38399b29ad63d9b
Author: Matthias Dieter Wallnöfer <m...@samba.org>
Date: Wed Jun 23 17:30:10 2010 +0200
s4:libnet_join.c - always use LDB constants
-----------------------------------------------------------------------
Summary of changes:
source4/lib/ldb/ldb_map/ldb_map_outbound.c | 16 +++++++++++++++-
source4/libnet/libnet_join.c | 10 +++++-----
source4/scripting/bin/upgradeprovision | 2 +-
source4/setup/provision.ldif | 4 ++--
source4/setup/provision.reg | 2 +-
source4/setup/provision_users.ldif | 2 +-
6 files changed, 25 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/lib/ldb/ldb_map/ldb_map_outbound.c
b/source4/lib/ldb/ldb_map/ldb_map_outbound.c
index 836aec9..17d77d7 100644
--- a/source4/lib/ldb/ldb_map/ldb_map_outbound.c
+++ b/source4/lib/ldb/ldb_map/ldb_map_outbound.c
@@ -219,6 +219,8 @@ static struct ldb_message_element
*ldb_msg_el_map_remote(struct ldb_module *modu
const char *attr_name,
const struct
ldb_message_element *old)
{
+ const struct ldb_map_context *data = map_get_context(module);
+ const char *local_attr_name = attr_name;
struct ldb_message_element *el;
unsigned int i;
@@ -235,7 +237,19 @@ static struct ldb_message_element
*ldb_msg_el_map_remote(struct ldb_module *modu
return NULL;
}
- el->name = talloc_strdup(el, attr_name);
+ for (i = 0; data->attribute_maps[i].local_name; i++) {
+ struct ldb_map_attribute *am = &data->attribute_maps[i];
+ if ((am->type == LDB_MAP_RENAME &&
+ !strcmp(am->u.rename.remote_name, attr_name))
+ || (am->type == LDB_MAP_CONVERT &&
+ !strcmp(am->u.convert.remote_name, attr_name))) {
+
+ local_attr_name = am->local_name;
+ break;
+ }
+ }
+
+ el->name = talloc_strdup(el, local_attr_name);
if (el->name == NULL) {
talloc_free(el);
map_oom(module);
diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c
index ad3ed81..ea11039 100644
--- a/source4/libnet/libnet_join.c
+++ b/source4/libnet/libnet_join.c
@@ -298,7 +298,7 @@ static NTSTATUS libnet_JoinADSDomain(struct libnet_context
*ctx, struct libnet_J
return NT_STATUS_NO_MEMORY;
}
rtn = samdb_msg_add_string(remote_ldb, tmp_ctx, msg,
"servicePrincipalName", service_principal_name[i]);
- if (rtn == -1) {
+ if (rtn != LDB_SUCCESS) {
r->out.error_string = NULL;
talloc_free(tmp_ctx);
return NT_STATUS_NO_MEMORY;
@@ -306,14 +306,14 @@ static NTSTATUS libnet_JoinADSDomain(struct
libnet_context *ctx, struct libnet_J
}
rtn = samdb_msg_add_string(remote_ldb, tmp_ctx, msg,
"dNSHostName", dns_host_name);
- if (rtn == -1) {
+ if (rtn != LDB_SUCCESS) {
r->out.error_string = NULL;
talloc_free(tmp_ctx);
return NT_STATUS_NO_MEMORY;
}
rtn = dsdb_replace(remote_ldb, msg, 0);
- if (rtn != 0) {
+ if (rtn != LDB_SUCCESS) {
r->out.error_string
= talloc_asprintf(r,
"Failed to replace entries on
%s",
@@ -337,7 +337,7 @@ static NTSTATUS libnet_JoinADSDomain(struct libnet_context
*ctx, struct libnet_J
ENC_RC4_HMAC_MD5 |
ENC_HMAC_SHA1_96_AES128 |
ENC_HMAC_SHA1_96_AES256));
- if (rtn == -1) {
+ if (rtn != LDB_SUCCESS) {
r->out.error_string = NULL;
talloc_free(tmp_ctx);
return NT_STATUS_NO_MEMORY;
@@ -346,7 +346,7 @@ static NTSTATUS libnet_JoinADSDomain(struct libnet_context
*ctx, struct libnet_J
rtn = dsdb_replace(remote_ldb, msg, 0);
/* The remote server may not support this attribute, if it
* isn't a modern schema */
- if (rtn != 0 && rtn != LDB_ERR_NO_SUCH_ATTRIBUTE) {
+ if (rtn != LDB_SUCCESS && rtn != LDB_ERR_NO_SUCH_ATTRIBUTE) {
r->out.error_string
= talloc_asprintf(r,
"Failed to replace
msDS-SupportedEncryptionType on %s",
diff --git a/source4/scripting/bin/upgradeprovision
b/source4/scripting/bin/upgradeprovision
index b247828..9d29d4a 100755
--- a/source4/scripting/bin/upgradeprovision
+++ b/source4/scripting/bin/upgradeprovision
@@ -22,7 +22,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-import ldb
import logging
import optparse
import os
@@ -34,6 +33,7 @@ import traceback
# Allow to run from s4 source directory (without installing samba)
sys.path.insert(0, "bin/python")
+import ldb
import samba
import samba.getopt as options
from samba.credentials import DONT_USE_KERBEROS
diff --git a/source4/setup/provision.ldif b/source4/setup/provision.ldif
index dc08450..bfd3788 100644
--- a/source4/setup/provision.ldif
+++ b/source4/setup/provision.ldif
@@ -457,7 +457,7 @@ objectClass: container
dn: CN=Windows2003Update,CN=DomainUpdates,CN=System,${DOMAINDN}
objectClass: top
objectClass: container
-revision: 8
+revision: 9
# End domain updates
@@ -809,7 +809,7 @@ dn: CN=RID Manager$,CN=System,${DOMAINDN}
objectClass: top
objectClass: rIDManager
systemFlags: -1946157056
-rIDAvailablePool: 1001-1073741823
+rIDAvailablePool: 1601-1073741823
isCriticalSystemObject: TRUE
dn: CN=RpcServices,CN=System,${DOMAINDN}
diff --git a/source4/setup/provision.reg b/source4/setup/provision.reg
index 8136c6c..a5edbcb 100644
--- a/source4/setup/provision.reg
+++ b/source4/setup/provision.reg
@@ -9,7 +9,7 @@ REGEDIT4
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT]
[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion]
-CurrentVersion=6.0
+CurrentVersion=6.1
[HKEY_LOCAL_MACHINE\SYSTEM]
diff --git a/source4/setup/provision_users.ldif
b/source4/setup/provision_users.ldif
index c007095..b85523b 100644
--- a/source4/setup/provision_users.ldif
+++ b/source4/setup/provision_users.ldif
@@ -128,7 +128,7 @@ isCriticalSystemObject: TRUE
dn: CN=Group Policy Creator Owners,CN=Users,${DOMAINDN}
objectClass: top
objectClass: group
-description: Members in this group can modify group policies for the domain
+description: Members in this group can modify group policy for the domain
member: CN=Administrator,CN=Users,${DOMAINDN}
objectSid: ${DOMAINSID}-520
sAMAccountName: Group Policy Creator Owners
--
Samba Shared Repository
