--- sam/idmap_ldap.c	Tue Jan  4 15:30:36 2005
+++ ../../mod-samba-3.0.11rc1/source/sam/idmap_ldap.c	Sun Jan 30 13:53:14 2005
@@ -124,7 +124,6 @@
 	fstring filter;
 	fstring sid_string;
 	LDAPMessage *result = NULL;
-	int count;
 	int rc;
 	char *sid_attr[] = {LDAP_ATTRIBUTE_SID, NULL};
 
@@ -144,7 +143,7 @@
 		return True;
 	}
 	
-	if ((count = ldap_count_entries(state->smbldap_state->ldap_struct, result)) > 0) {
+	if (ldap_count_entries(state->smbldap_state->ldap_struct, result) > 0) {
 		DEBUG(3, ("Sid %s already in use - trying next RID\n",
 			  sid_string));
 		ldap_msgfree(result);
@@ -168,7 +167,6 @@
                               int rid_type)
 {
 	NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
-	int rc;
 	LDAPMessage *domain_result = NULL;
 	LDAPMessage *entry  = NULL;
 	char *dn;
@@ -291,7 +289,7 @@
 			}
 		}
 
-		if ((rc = smbldap_modify(state->smbldap_state, dn, mods)) == LDAP_SUCCESS) {
+		if (smbldap_modify(state->smbldap_state, dn, mods) == LDAP_SUCCESS) {
 			DOM_SID dom_sid;
 			DOM_SID sid;
 			pstring domain_sid_string;