mirror of
https://github.com/samba-team/samba.git
synced 2025-01-12 09:18:10 +03:00
r16219: BUG 3836, 3837, 3004: compile warning fixes from Jason Mader.
This commit is contained in:
parent
e6aacb1426
commit
6c1f1c091f
@ -1107,7 +1107,6 @@ files_struct *open_file_ntcreate(connection_struct *conn,
|
||||
uint32 existing_dos_attributes = 0;
|
||||
struct pending_message_list *pml = NULL;
|
||||
uint16 mid = get_current_mid();
|
||||
BOOL delayed_for_oplocks = False;
|
||||
struct timeval request_time = timeval_zero();
|
||||
struct share_mode_lock *lck = NULL;
|
||||
NTSTATUS status;
|
||||
@ -1148,7 +1147,6 @@ files_struct *open_file_ntcreate(connection_struct *conn,
|
||||
see if this has timed out. */
|
||||
|
||||
request_time = pml->request_time;
|
||||
delayed_for_oplocks = state->delayed_for_oplocks;
|
||||
|
||||
/* Remove the deferred open entry under lock. */
|
||||
lck = get_share_mode_lock(NULL, state->dev, state->inode, NULL, NULL);
|
||||
|
@ -2813,7 +2813,6 @@ static int call_trans2qfilepathinfo(connection_struct *conn, char *inbuf, char *
|
||||
char *fullpathname;
|
||||
char *base_name;
|
||||
char *p;
|
||||
char *lock_data = NULL;
|
||||
SMB_OFF_T pos = 0;
|
||||
BOOL bad_path = False;
|
||||
BOOL delete_pending = False;
|
||||
@ -2823,6 +2822,9 @@ static int call_trans2qfilepathinfo(connection_struct *conn, char *inbuf, char *
|
||||
TALLOC_CTX *data_ctx = NULL;
|
||||
struct ea_list *ea_list = NULL;
|
||||
uint32 access_mask = 0x12019F; /* Default - GENERIC_EXECUTE mapping from Windows */
|
||||
#if defined(DEVELOPER)
|
||||
char *lock_data = NULL;
|
||||
#endif
|
||||
|
||||
if (!params)
|
||||
return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
|
||||
|
@ -470,7 +470,7 @@ static BOOL test_plaintext(enum ntlm_break break_which)
|
||||
CH_DOS, password,
|
||||
strlen(password)+1,
|
||||
(void**)&lm_response.data,True)) == -1) {
|
||||
DEBUG(0, ("push_ascii_allocate failed!\n"));
|
||||
DEBUG(0, ("convert_string_allocate failed!\n"));
|
||||
exit(1);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user