svn commit: samba r14375 - in trunk/source/passdb: .

[idra at samba.org]

Author: idra
Date: 2006-03-14 13:49:34 +0000 (Tue, 14 Mar 2006)
New Revision: 14375

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

Log:

Restore fix backed out by mistake


Modified:
   trunk/source/passdb/pdb_ldap.c


Changeset:
Modified: trunk/source/passdb/pdb_ldap.c
===================================================================
--- trunk/source/passdb/pdb_ldap.c	2006-03-14 13:04:28 UTC (rev 14374)
+++ trunk/source/passdb/pdb_ldap.c	2006-03-14 13:49:34 UTC (rev 14375)
@@ -338,6 +338,7 @@
 	   * in pstring_sub
 	 */
 	
+
 	all_string_sub(filter, "%u", escape_user, sizeof(pstring));
 	SAFE_FREE(escape_user);
 
@@ -1515,7 +1516,7 @@
 	struct ldapsam_privates *ldap_state = (struct ldapsam_privates *)my_methods->private_data;
 	int rc;
 	
-	if (!my_methods || !newpwd || !dn) {
+	if (!newpwd || !dn) {
 		return NT_STATUS_INVALID_PARAMETER;
 	}
 	
@@ -3075,7 +3076,6 @@
 					   BOOL unix_only)
 {
 	GROUP_MAP map;
-	GROUP_MAP *mapt;
 	size_t entries = 0;
 
 	*p_num_entries = 0;
@@ -3100,17 +3100,14 @@
 			continue;
 		}
 
-		mapt=SMB_REALLOC_ARRAY((*pp_rmap), GROUP_MAP, entries+1);
-		if (!mapt) {
+		(*pp_rmap)=SMB_REALLOC_ARRAY((*pp_rmap), GROUP_MAP, entries+1);
+		if (!(*pp_rmap)) {
 			DEBUG(0,("ldapsam_enum_group_mapping: Unable to "
 				 "enlarge group map!\n"));
-			SAFE_FREE(*pp_rmap);
 			return NT_STATUS_UNSUCCESSFUL;
 		}
-		else
-			(*pp_rmap) = mapt;
 
-		mapt[entries] = map;
+		(*pp_rmap)[entries] = map;
 
 		entries += 1;