svn commit: samba-web r782 - in trunk/patches: .

jerry at samba.org jerry at samba.org
Fri Aug 26 18:57:44 GMT 2005


Author: jerry
Date: 2005-08-26 18:57:42 +0000 (Fri, 26 Aug 2005)
New Revision: 782

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=782

Log:
new group enumeration patch
Added:
   trunk/patches/groupname_enumeration_v3.patch
Removed:
   trunk/patches/groupname_enumeration_v2.patch
Modified:
   trunk/patches/index.html


Changeset:
Deleted: trunk/patches/groupname_enumeration_v2.patch
===================================================================
--- trunk/patches/groupname_enumeration_v2.patch	2005-08-26 14:51:43 UTC (rev 781)
+++ trunk/patches/groupname_enumeration_v2.patch	2005-08-26 18:57:42 UTC (rev 782)
@@ -1,24 +0,0 @@
-diff -uBbrN --exclude-from=/misc/src/samba-cvs/diff.excludes samba-3.0.20-orig/source/rpc_parse/parse_samr.c samba-3.0.20-new/source/rpc_parse/parse_samr.c
---- samba-3.0.20-orig/source/rpc_parse/parse_samr.c	2005-07-28 08:19:49.000000000 -0500
-+++ samba-3.0.20-new/source/rpc_parse/parse_samr.c	2005-08-26 09:44:36.000000000 -0500
-@@ -1720,7 +1720,7 @@
- 		DEBUG(11, ("init_sam_dispinfo_3: entry: %d\n",i));
- 
- 		init_unistr2(&(*sam)->str[i].uni_grp_name,
--			     entries[i].account_name, UNI_FLAGS_NONE);
-+			     entries[i].fullname, UNI_FLAGS_NONE);
- 		init_unistr2(&(*sam)->str[i].uni_grp_desc,
- 			     entries[i].description, UNI_FLAGS_NONE);
- 
-diff -uBbrN --exclude-from=/misc/src/samba-cvs/diff.excludes samba-3.0.20-orig/source/rpc_server/srv_samr_nt.c samba-3.0.20-new/source/rpc_server/srv_samr_nt.c
---- samba-3.0.20-orig/source/rpc_server/srv_samr_nt.c	2005-08-07 18:09:55.000000000 -0500
-+++ samba-3.0.20-new/source/rpc_server/srv_samr_nt.c	2005-08-26 09:44:36.000000000 -0500
-@@ -670,7 +670,7 @@
- 		/*
- 		 * JRA. I think this should include the null. TNG does not.
- 		 */
--		init_unistr2(&uni_name[i], entries[i].account_name,
-+		init_unistr2(&uni_name[i], entries[i].fullname,
- 			     UNI_STR_TERMINATE);
- 		init_sam_entry(&sam[i], &uni_name[i], entries[i].rid);
- 	}

Added: trunk/patches/groupname_enumeration_v3.patch
===================================================================
--- trunk/patches/groupname_enumeration_v3.patch	2005-08-26 14:51:43 UTC (rev 781)
+++ trunk/patches/groupname_enumeration_v3.patch	2005-08-26 18:57:42 UTC (rev 782)
@@ -0,0 +1,32 @@
+Index: passdb/pdb_ldap.c
+===================================================================
+--- passdb/pdb_ldap.c	(revision 9659)
++++ passdb/pdb_ldap.c	(working copy)
+@@ -3692,22 +3692,23 @@
+ 		return False;
+ 	}
+ 
++	/* verify that the 'cn' attribute exists */
++
+ 	vals = ldap_get_values(ld, entry, "cn");
+ 	if ((vals == NULL) || (vals[0] == NULL)) {
+ 		DEBUG(5, ("\"cn\" not found\n"));
+ 		return False;
+ 	}
+-	pull_utf8_talloc(mem_ctx,
+-			 CONST_DISCARD(char **, &result->account_name),
+-			 vals[0]);
+ 	ldap_value_free(vals);
+ 
++	/* display name is the NT group name */
++
+ 	vals = ldap_get_values(ld, entry, "displayName");
+ 	if ((vals == NULL) || (vals[0] == NULL))
+ 		DEBUG(8, ("\"displayName\" not found\n"));
+ 	else
+ 		pull_utf8_talloc(mem_ctx,
+-				 CONST_DISCARD(char **, &result->fullname),
++				 CONST_DISCARD(char **, &result->account_name),
+ 				 vals[0]);
+ 	ldap_value_free(vals);
+ 

Modified: trunk/patches/index.html
===================================================================
--- trunk/patches/index.html	2005-08-26 14:51:43 UTC (rev 781)
+++ trunk/patches/index.html	2005-08-26 18:57:42 UTC (rev 782)
@@ -36,9 +36,10 @@
 
   </tr>
   <tr>
-    <td><a href="/samba/patches/groupname_enumeration_v2.patch">group_enum_v2</a></td>
+    <td><a href="/samba/patches/groupname_enumeration_v3.patch">group_enum_v3 (ldap)</a></td>
     <td>Fixes a regression in which groups in the mapping table where displayed by the 
-        Unix group name and no the display name (e.g. ntadmin rather that 'Domain Admins')</td>
+        Unix group name and no the display name (e.g. ntadmin rather that 'Domain Admins').
+        Only neede for installations using the ldapsam passdb backend.</td>
   </tr>
   <tr>
     <td><a href="/samba/patches/bug3010_v1.patch">AIX 5 &amp; Win98 endless directory loop</a></td>



More information about the samba-cvs mailing list