[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0rc2-41-g5b439ea

[Karolin Seeger]

The branch, v3-2-stable has been updated
       via  5b439ea7cf94fdce24eaae62c2a772361ad5b422 (commit)
       via  bb787ab32aaae91c170ec30b0a126d390703ef1c (commit)
       via  23f096504fa53ee9957dce1c2b2902cf4f8ab937 (commit)
      from  4580a491d2341a70a7e8e869e2fb249be2d25dcd (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable


- Log -----------------------------------------------------------------
commit 5b439ea7cf94fdce24eaae62c2a772361ad5b422
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Jun 19 09:50:34 2008 +0200

    Fix the build on FreeBSD 4.6.2
    (cherry picked from commit a475dee8036156d4c8330bae97208ec546342f42)

commit bb787ab32aaae91c170ec30b0a126d390703ef1c
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Jun 20 13:23:31 2008 -0700

    Fix bug #5531 - fix conversion of ns units when converting from nttime to timespec.
    Fix from hkurma at datadomain.com.
    Jeremy.
    (cherry picked from commit c8471dd5793924d482af662706deb92f3fad0bdf)

commit 23f096504fa53ee9957dce1c2b2902cf4f8ab937
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Jun 20 12:49:14 2008 -0700

    Fix bug #5533. Winbindd fails to cope correctly with a workgroup name containing a '.'.
    Jeremy.
    (cherry picked from commit fae027e937c2f0078193b8cc27af6db2d7c233f5)

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

Summary of changes:
 source/lib/dbwrap_rbt.c         |    9 +++++----
 source/lib/time.c               |    8 ++++++--
 source/winbindd/winbindd_util.c |   12 +++---------
 3 files changed, 14 insertions(+), 15 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/dbwrap_rbt.c b/source/lib/dbwrap_rbt.c
index 46459c8..b70ce3d 100644
--- a/source/lib/dbwrap_rbt.c
+++ b/source/lib/dbwrap_rbt.c
@@ -20,7 +20,7 @@
 #include "includes.h"
 #include "rbtree.h"
 
-#define ALIGN(_size_) (((_size_)+15)&~15)
+#define DBWRAP_RBT_ALIGN(_size_) (((_size_)+15)&~15)
 
 struct db_rbt_ctx {
 	struct rb_root tree;
@@ -42,7 +42,7 @@ struct db_rbt_node {
 	 * target for offsetof()
 	 */
 
-	char data[];
+	char data[1];
 };
 
 /*
@@ -243,7 +243,8 @@ static struct db_record *db_rbt_fetch_locked(struct db_context *db_ctx,
 	 * off.
 	 */
 
-	size = ALIGN(sizeof(struct db_record)) + sizeof(struct db_rbt_rec);
+	size = DBWRAP_RBT_ALIGN(sizeof(struct db_record))
+		+ sizeof(struct db_rbt_rec);
 
 	if (!found) {
 		/*
@@ -258,7 +259,7 @@ static struct db_record *db_rbt_fetch_locked(struct db_context *db_ctx,
 	}
 
 	rec_priv = (struct db_rbt_rec *)
-		((char *)result + ALIGN(sizeof(struct db_record)));
+		((char *)result + DBWRAP_RBT_ALIGN(sizeof(struct db_record)));
 	rec_priv->db_ctx = ctx;
 
 	result->store = db_rbt_store;
diff --git a/source/lib/time.c b/source/lib/time.c
index e5fd929..17990b9 100644
--- a/source/lib/time.c
+++ b/source/lib/time.c
@@ -1211,8 +1211,12 @@ struct timespec nt_time_to_unix_timespec(NTTIME *nt)
 	d = (int64)*nt;
 	/* d is now in 100ns units, since jan 1st 1601".
 	   Save off the ns fraction. */
-	
-	ret.tv_nsec = (long) ((d % 100) * 100);
+
+	/*
+	 * Take the last seven decimal digits and multiply by 100.
+	 * to convert from 100ns units to 1ns units.
+	 */
+        ret.tv_nsec = (long) ((d % (1000 * 1000 * 10)) * 100);
 
 	/* Convert to seconds */
 	d /= 1000*1000*10;
diff --git a/source/winbindd/winbindd_util.c b/source/winbindd/winbindd_util.c
index 6a96070..a35ba7b 100644
--- a/source/winbindd/winbindd_util.c
+++ b/source/winbindd/winbindd_util.c
@@ -165,15 +165,9 @@ static struct winbindd_domain *add_trusted_domain(const char *domain_name, const
         
 	ZERO_STRUCTP(domain);
 
-	/* prioritise the short name */
-	if (strchr_m(domain_name, '.') && alternative_name && *alternative_name) {
-		fstrcpy(domain->name, alternative_name);
-		fstrcpy(domain->alt_name, domain_name);
-	} else {
-		fstrcpy(domain->name, domain_name);
-		if (alternative_name) {
-			fstrcpy(domain->alt_name, alternative_name);
-		}
+	fstrcpy(domain->name, domain_name);
+	if (alternative_name) {
+		fstrcpy(domain->alt_name, alternative_name);
 	}
 
 	domain->methods = methods;


-- 
Samba Shared Repository