diff options
| author | Gerald Carter <jerry@samba.org> | 2006-06-14 12:00:53 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:17:26 -0500 |
| commit | b32d2ecf9ce39140c726d4fe96f658e50d0665c9 (patch) | |
| tree | ce9fc6dc29904be92c6357bdf3a083e903ed7b80 /source3 | |
| parent | 2e8b3ca0cb6956e5ce28fcafe85f6951a8955cd5 (diff) | |
| download | samba-b32d2ecf9ce39140c726d4fe96f658e50d0665c9.tar.gz samba-b32d2ecf9ce39140c726d4fe96f658e50d0665c9.tar.bz2 samba-b32d2ecf9ce39140c726d4fe96f658e50d0665c9.zip | |
r16219: BUG 3836, 3837, 3004: compile warning fixes from Jason Mader.
(This used to be commit 6c1f1c091f5e87bf9464fe8ad7eb2cb683819a62)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/smbd/open.c | 2 | ||||
| -rw-r--r-- | source3/smbd/trans2.c | 4 | ||||
| -rw-r--r-- | source3/utils/ntlm_auth_diagnostics.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c index 821feffd65..2e4091d937 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -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); diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 71ff79081d..86743f626e 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -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); diff --git a/source3/utils/ntlm_auth_diagnostics.c b/source3/utils/ntlm_auth_diagnostics.c index 95f1355c2e..00149db9e2 100644 --- a/source3/utils/ntlm_auth_diagnostics.c +++ b/source3/utils/ntlm_auth_diagnostics.c @@ -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); } |