sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-05-28 21:05:48 +03:00
Code

Merge indirection, signed/unsigned and uninitialiased-value fixes from HEAD.

Browse Source 
Andrew Bartlett
This commit is contained in:
Andrew Bartlett -
parent 20ebdee36d
commit 2a1adb8f81
5 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/auth/auth_domain.c
View File

@ -432,7 +432,8 @@ static NTSTATUS check_ntdomain_security(const struct auth_context *auth_context,
/* Test if machine password has expired and needs to be changed */
if (lp_machine_password_timeout()) {
if (time(NULL) > (last_change_time +
if (last_change_time > 0 &&
time(NULL) > (last_change_time +
lp_machine_password_timeout())) {
global_machine_password_needs_changing = True;
}

8
source/auth/auth_util.c
View File

@ -475,7 +475,7 @@ BOOL make_user_info_guest(auth_usersupplied_info **user_info)
void debug_nt_user_token(int dbg_class, int dbg_lev, NT_USER_TOKEN *token)
{
fstring sid_str;
int i;
size_t i;
if (!token) {
DEBUGC(dbg_class, dbg_lev, ("NT user token: (NULL)\n"));
@ -564,7 +564,7 @@ static NTSTATUS create_nt_user_token(const DOM_SID *user_sid, const DOM_SID *gro
sid_ndx = 5; /* next available spot */
for (i = 0; i < n_groupSIDs; i++) {
int check_sid_idx;
size_t check_sid_idx;
for (check_sid_idx = 1; check_sid_idx < ptoken->num_sids; check_sid_idx++) {
if (sid_equal(&ptoken->user_sids[check_sid_idx],
&groupSIDs[i])) {
@ -678,7 +678,7 @@ static NTSTATUS get_user_groups_from_local_sam(const DOM_SID *user_sid,
}
if (sys_getgrouplist(usr->pw_name, usr->pw_gid, *unix_groups, &n_unix_groups) == -1) {
*unix_groups = Realloc(unix_groups, sizeof(gid_t) * n_unix_groups);
*unix_groups = Realloc(*unix_groups, sizeof(gid_t) * n_unix_groups);
if (sys_getgrouplist(usr->pw_name, usr->pw_gid, *unix_groups, &n_unix_groups) == -1) {
DEBUG(0, ("get_user_groups_from_local_sam: failed to get the unix group list\n"));
SAFE_FREE(*unix_groups);
@ -867,7 +867,7 @@ NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx,
NT_USER_TOKEN *token;
DOM_SID *all_group_SIDs;
int i;
size_t i;
/*
Here is where we should check the list of

1
source/passdb/secrets.c
View File

@ -240,6 +240,7 @@ BOOL secrets_fetch_trust_account_password(const char *domain, uint8 ret_pwd[16],
DEBUG(4,("Using ADS machine password\n"));
E_md4hash(plaintext, ret_pwd);
SAFE_FREE(plaintext);
pass_last_set_time = 0;
return True;
}

2
source/smbd/notify_kernel.c
View File

@ -215,6 +215,8 @@ struct cnotify_fns *kernel_notify_init(void)
static struct cnotify_fns cnotify;
struct sigaction act;
ZERO_STRUCT(act);
act.sa_handler = NULL;
act.sa_sigaction = signal_handler;
act.sa_flags = SA_SIGINFO;

2
source/smbd/oplock_linux.c
View File

@ -279,6 +279,8 @@ struct kernel_oplocks *linux_init_kernel_oplocks(void)
return NULL;
}
ZERO_STRUCT(act);
act.sa_handler = NULL;
act.sa_sigaction = signal_handler;
act.sa_flags = SA_SIGINFO;