sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

r6769: Fix bugzilla #2538 and #2527. Unused variables found by Jason Mader.

Browse Source 
(This used to be commit 68b1c1f533)
This commit is contained in:
Tim Potter 2005-05-13 07:46:29 +00:00 committed by Gerald (Jerry) Carter
parent ec495efbf1
commit 70490aae0c
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source3/groupdb/mapping.c
View File

@ -896,7 +896,6 @@ BOOL get_local_group_from_sid(DOM_SID *sid, GROUP_MAP *map)
BOOL get_builtin_group_from_sid(DOM_SID *sid, GROUP_MAP *map)
{
struct group *grp;
BOOL ret;
@ -920,7 +919,7 @@ BOOL get_builtin_group_from_sid(DOM_SID *sid, GROUP_MAP *map)
return False;
}
if ( (grp=getgrgid(map->gid)) == NULL) {
if ( getgrgid(map->gid) == NULL) {
return False;
}
@ -934,7 +933,6 @@ Returns a GROUP_MAP struct based on the gid.
****************************************************************************/
BOOL get_group_from_gid(gid_t gid, GROUP_MAP *map)
{
struct group *grp;
BOOL ret;
if(!init_group_mapping()) {
@ -942,7 +940,7 @@ BOOL get_group_from_gid(gid_t gid, GROUP_MAP *map)
return(False);
}
if ( (grp=getgrgid(gid)) == NULL)
if ( getgrgid(gid) == NULL)
return False;
become_root();

3
source3/utils/net_rpc_join.c
View File

@ -48,7 +48,6 @@ static int net_rpc_join_ok(const char *domain)
uchar stored_md4_trust_password[16];
int retval = 1;
uint32 channel;
NTSTATUS result;
/* Connect to remote machine */
if (!(cli = net_make_ipc_connection(NET_FLAGS_ANONYMOUS | NET_FLAGS_PDC))) {
@ -69,7 +68,7 @@ static int net_rpc_join_ok(const char *domain)
/* ensure that schannel uses the right domain */
fstrcpy(cli->domain, domain);
if (! NT_STATUS_IS_OK(result = cli_nt_establish_netlogon(cli, channel, stored_md4_trust_password))) {
if (! NT_STATUS_IS_OK(cli_nt_establish_netlogon(cli, channel, stored_md4_trust_password))) {
DEBUG(0,("Error in domain join verfication (fresh connection)\n"));
goto done;
}