svn commit: samba r5272 - in branches/SAMBA_3_0/source: libsmb sam

[jerry at samba.org]

Author: jerry
Date: 2005-02-07 22:42:43 +0000 (Mon, 07 Feb 2005)
New Revision: 5272

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

Log:
BUG 2132, 2134: patch from Jason Mader <jason at ncac.gwu.edu> to remove unused variables
Modified:
   branches/SAMBA_3_0/source/libsmb/ntlmssp.c
   branches/SAMBA_3_0/source/sam/idmap_ldap.c


Changeset:
Modified: branches/SAMBA_3_0/source/libsmb/ntlmssp.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/ntlmssp.c	2005-02-07 22:30:56 UTC (rev 5271)
+++ branches/SAMBA_3_0/source/libsmb/ntlmssp.c	2005-02-07 22:42:43 UTC (rev 5272)
@@ -442,13 +442,6 @@
 	/* This creates the 'blob' of names that appears at the end of the packet */
 	if (chal_flags & NTLMSSP_CHAL_TARGET_INFO) 
 	{
-		const char *target_name_dns = "";
-		if (chal_flags |= NTLMSSP_TARGET_TYPE_DOMAIN) {
-			target_name_dns = dnsdomname;
-		} else if (chal_flags |= NTLMSSP_TARGET_TYPE_SERVER) {
-			target_name_dns = dnsname;
-		}
-
 		msrpc_gen(&struct_blob, "aaaaa",
 			  NTLMSSP_NAME_TYPE_DOMAIN, target_name,
 			  NTLMSSP_NAME_TYPE_SERVER, ntlmssp_state->get_global_myname(),

Modified: branches/SAMBA_3_0/source/sam/idmap_ldap.c
===================================================================
--- branches/SAMBA_3_0/source/sam/idmap_ldap.c	2005-02-07 22:30:56 UTC (rev 5271)
+++ branches/SAMBA_3_0/source/sam/idmap_ldap.c	2005-02-07 22:42:43 UTC (rev 5272)
@@ -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;