r16219: BUG 3836, 3837, 3004: compile warning fixes from Jason Mader.

diff --git a/source/smbd/open.c b/source/smbd/open.c
index 821feffd65c826dfb2dd09faa22b801e486d202a..2e4091d937e620baed6062397ae0454161a291f8 100644 (file)
--- a/source/smbd/open.c
+++ b/source/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/source/smbd/trans2.c b/source/smbd/trans2.c
index 71ff79081decff3acbde866662949becd0d30a03..86743f626e6cc9cbd0565ba133efc55bfba36577 100644 (file)
--- a/source/smbd/trans2.c
+++ b/source/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/source/utils/ntlm_auth_diagnostics.c b/source/utils/ntlm_auth_diagnostics.c
index 95f1355c2eb62567663b6af2d1d68eca99d5e0fb..00149db9e24f8ea1abd909898dcea06de50eb12b 100644 (file)
--- a/source/utils/ntlm_auth_diagnostics.c
+++ b/source/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);
        }