[SCM] SAMBA-CTDB repository - branch v3-2-ctdb updated - b49f6499cd998e410aada0f3e00fb3ba906723a7

[Andrew Tridgell]

The branch, v3-2-ctdb has been updated
       via  b49f6499cd998e410aada0f3e00fb3ba906723a7 (commit)
       via  17f03646199d6eb69e4480c0b17dd33875ed01da (commit)
      from  be4fd1947540f37f1b47eabfa9c130702dcbc39a (commit)

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


- Log -----------------------------------------------------------------
commit b49f6499cd998e410aada0f3e00fb3ba906723a7
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Apr 22 15:41:25 2008 +0200

    Fix wbinfo --group-info if the winbind separator set to non \
    
    In getgrsid_lookupsid_recv() we use parse_domain_user which itself looks at
    lp_winbind_separator(). Thus when building up that group name we should better
    use it as well.

commit 17f03646199d6eb69e4480c0b17dd33875ed01da
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Apr 22 15:59:38 2008 +0200

    Make nsstest valgrind-clean: buf is referred to by the parsed grp struct

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

Summary of changes:
 WHATSNEW.txt                     |   24 ++++++++++++------------
 source/torture/nsstest.c         |    3 ---
 source/winbindd/winbindd_group.c |    6 ++++--
 3 files changed, 16 insertions(+), 17 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 462be44..2a9a7e7 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -254,18 +254,18 @@ o   Volker Lendecke <vl at samba.org>
     * BUG 5307: Fix notify changes.
     * BUG 5317: Fix debug output in domain_client_validate.
     * BUG 5338: Fix format string issue in rpcclient.
-    * Convert account_pol.tdb and share_info.tdb to dbwrap
-    * Protect group_mapping.tdb ops with transactions
-    * BUG 5366: "passwd program" should work on Solaris 10 again now
-    * A level 25 setuserinfo does change the pwdlastset, fixes XP joins
-    * BUG 5350: A Samba DC trusting NT4 should do an anon session setup
-    * BUG 5375: Fix a segfault with "security=share" and [in]valid users
-    * Fix printing from DOS clients -- introduced by inbuf/outbuf rewrite
-    * Fix wbinfo -a trusted\\user%password on a Samba DC with trusts
-    * BUG 5341: Fix async smbclient get command on Solaris
-    * Make winbind use NetSamLogonEx when possible
-    * Merge fixes in the 3-0-ctdb cluster code
-    * Fix a segfault in snprintf replacement code
+    * Convert account_pol.tdb and share_info.tdb to dbwrap.
+    * Protect group_mapping.tdb ops with transactions.
+    * BUG 5366: "passwd program" should work on Solaris 10 again now.
+    * A level 25 setuserinfo does change the pwdlastset, fixes XP joins.
+    * BUG 5350: A Samba DC trusting NT4 should do an anon session setup.
+    * BUG 5375: Fix a segfault with "security=share" and [in]valid users.
+    * Fix printing from DOS clients -- introduced by inbuf/outbuf rewrite.
+    * Fix wbinfo -a trusted\\user%password on a Samba DC with trusts.
+    * BUG 5341: Fix async smbclient get command on Solaris.
+    * Make winbind use NetSamLogonEx when possible.
+    * Merge fixes in the 3-0-ctdb cluster code.
+    * Fix a regression for wbinfo --group-info if winbind separator is set
 
 
 o   Derrell Lipman <derrell at samba.org>
diff --git a/source/torture/nsstest.c b/source/torture/nsstest.c
index ca66226..6bd0efe 100644
--- a/source/torture/nsstest.c
+++ b/source/torture/nsstest.c
@@ -201,7 +201,6 @@ again:
 		SAFE_FREE(buf);
 		return NULL;
 	}
-	SAFE_FREE(buf);
 	return &grp;
 }
 
@@ -240,7 +239,6 @@ again:
 		SAFE_FREE(buf);
 		return NULL;
 	}
-	SAFE_FREE(buf);
 	return &grp;
 }
 
@@ -280,7 +278,6 @@ again:
 		SAFE_FREE(buf);
 		return NULL;
 	}
-	SAFE_FREE(buf);
 	return &grp;
 }
 
diff --git a/source/winbindd/winbindd_group.c b/source/winbindd/winbindd_group.c
index d5d3acc..63fde9f 100644
--- a/source/winbindd/winbindd_group.c
+++ b/source/winbindd/winbindd_group.c
@@ -806,8 +806,10 @@ static void getgrsid_lookupsid_recv( void *private_data, bool success,
 }
 
 	if ( (s->group_name = talloc_asprintf( s->state->mem_ctx, 
-					       "%s\\%s", 
-					       dom_name, name )) == NULL )
+                                               "%s%c%s",
+                                               dom_name,
+					       *lp_winbind_separator(),
+                                               name)) == NULL )
 {
 		DEBUG(1, ("getgrsid_lookupsid_recv: talloc_asprintf() Failed!\n"));
 		request_error(s->state);


-- 
SAMBA-CTDB repository