[SCM] Samba Shared Repository - branch master updated

[Matthieu Patou]

The branch, master has been updated
       via  666e0c3 s4 param: change messaging directory name from messaging to msg
       via  34f12d5 s4 dsdb: fix sign problem on PPC and x86
      from  f794563 s4:lib/registry/util.c - cosmetic - fix indentation, trailing whitespaces

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


- Log -----------------------------------------------------------------
commit 666e0c3cce32c259dfaaf03383fac58940994dbc
Author: Matthieu Patou <mat at matws.net>
Date:   Fri Oct 15 10:16:46 2010 +0400

    s4 param: change messaging directory name from messaging to msg
    
    This saves 6 chars and as in some installation users tends to install
    samba in directory with very long name they have a problem with the
    sockets.
    It will also ease the pain on buildfarms as we tend to have very long
    environnement name (ie. vampire_dc) in path that are already quite long
    leading also to errors on unix socket manipulation.
    
    Autobuild-User: Matthieu Patou <mat at samba.org>
    Autobuild-Date: Fri Oct 15 08:15:56 UTC 2010 on sn-devel-104

commit 34f12d541b0bb2e7d931968b2079dfb7ba84d692
Author: Matthieu Patou <mat at matws.net>
Date:   Thu Oct 14 17:56:23 2010 +0400

    s4 dsdb: fix sign problem on PPC and x86
    
    In LDAP we used signed intege and groups have the highest bit set (ie.
    0x80000002). So it will result with values that are > 2^31 when these
    value are used on some plateforms (x86 and PPC 64bits in this case) it
    causes problem with strtol.

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

Summary of changes:
 source4/dsdb/samdb/ldb_modules/samldb.c |    4 ++--
 source4/param/util.c                    |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c
index 400ae81..ff110b7 100644
--- a/source4/dsdb/samdb/ldb_modules/samldb.c
+++ b/source4/dsdb/samdb/ldb_modules/samldb.c
@@ -793,7 +793,7 @@ static int samldb_objectclass_trigger(struct samldb_ctx *ac)
 		/* Step 1.2: Default values */
 		ret = samdb_find_or_add_attribute(ldb, ac->msg,
 			"userAccountControl",
-			talloc_asprintf(ac->msg, "%u", UF_NORMAL_ACCOUNT));
+			talloc_asprintf(ac->msg, "%d", UF_NORMAL_ACCOUNT));
 		if (ret != LDB_SUCCESS) return ret;
 		ret = samdb_find_or_add_attribute(ldb, ac->msg,
 			"badPwdCount", "0");
@@ -896,7 +896,7 @@ static int samldb_objectclass_trigger(struct samldb_ctx *ac)
 		/* Step 2.2: Default values */
 		ret = samdb_find_or_add_attribute(ldb, ac->msg,
 			"groupType",
-			talloc_asprintf(ac->msg, "%u", GTYPE_SECURITY_GLOBAL_GROUP));
+			talloc_asprintf(ac->msg, "%d", GTYPE_SECURITY_GLOBAL_GROUP));
 		if (ret != LDB_SUCCESS) return ret;
 
 		/* Step 2.3: "groupType" -> "sAMAccountType" */
diff --git a/source4/param/util.c b/source4/param/util.c
index dd1d319..6953857 100644
--- a/source4/param/util.c
+++ b/source4/param/util.c
@@ -296,7 +296,7 @@ init_module_fn *load_samba_modules(TALLOC_CTX *mem_ctx, struct loadparm_context
 const char *lpcfg_messaging_path(TALLOC_CTX *mem_ctx,
 				       struct loadparm_context *lp_ctx)
 {
-	return smbd_tmp_path(mem_ctx, lp_ctx, "messaging");
+	return smbd_tmp_path(mem_ctx, lp_ctx, "msg");
 }
 
 struct smb_iconv_convenience *smb_iconv_convenience_reinit_lp(TALLOC_CTX *mem_ctx,


-- 
Samba Shared Repository