sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-27 03:21:53 +03:00
Code

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

Browse Source
This commit is contained in:
Gerald Carter 2005-02-07 22:42:43 +00:00 committed by Gerald (Jerry) Carter
parent ba0c711a43
commit 82c4e2f37f
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/libsmb/ntlmssp.c
View File

@ -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(),

6
source/sam/idmap_ldap.c
View File

@ -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;