r5272: BUG 2132, 2134: patch from Jason Mader <jason@ncac.gwu.edu> to remove unused...

(This used to be commit 82c4e2f37f1f4c581cd7c792808c9a81ef80db94)

diff --git a/source3/libsmb/ntlmssp.c b/source3/libsmb/ntlmssp.c
index eb1fce5439202bd98f2213a0855096b369d15294..ec3186255a77a3036eeeb0d2d756e6dc70091b0b 100644 (file)
--- a/source3/libsmb/ntlmssp.c
+++ b/source3/libsmb/ntlmssp.c
@@ -442,13 +442,6 @@ static NTSTATUS ntlmssp_server_negotiate(struct ntlmssp_state *ntlmssp_state,
        /* 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(),

diff --git a/source3/sam/idmap_ldap.c b/source3/sam/idmap_ldap.c
index 28fdbab77e5ac05608113d912677c30d22f0bbe0..5d6931e52b038f783d86e5085a052fa3a4823832 100644 (file)
--- a/source3/sam/idmap_ldap.c
+++ b/source3/sam/idmap_ldap.c
@@ -124,7 +124,6 @@ static BOOL sid_in_use(struct ldap_idmap_state *state,
        fstring filter;
        fstring sid_string;
        LDAPMessage *result = NULL;
-       int count;
        int rc;
        char *sid_attr[] = {LDAP_ATTRIBUTE_SID, NULL};
 
@@ -144,7 +143,7 @@ static BOOL sid_in_use(struct ldap_idmap_state *state,
                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 @@ static NTSTATUS ldap_next_rid(struct ldap_idmap_state *state, uint32 *rid,
                               int rid_type)
 {
        NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
-       int rc;
        LDAPMessage *domain_result = NULL;
        LDAPMessage *entry  = NULL;
        char *dn;
@@ -291,7 +289,7 @@ static NTSTATUS ldap_next_rid(struct ldap_idmap_state *state, uint32 *rid,
                        }
                }
 
-               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;