[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-1225-g15f108f

[Jeremy Allison]

The branch, master has been updated
       via  15f108f0917eedab89199e9fbf93ed802eed7f89 (commit)
      from  d7c7b31bbaf110446ea835b66845ab6f0ee09231 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 15f108f0917eedab89199e9fbf93ed802eed7f89
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Feb 25 09:59:53 2009 -0800

    Fix some NetBSD warnings.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source3/printing/nt_printing.c |    6 ++++--
 source3/smbd/reply.c           |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index bbe8ebc..b254ce0 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -1381,7 +1381,8 @@ static int file_version_is_newer(connection_struct *conn, fstring new_file, fstr
 				 goto error_exit;
 			}
 			old_create_time = st.st_mtime;
-			DEBUGADD(6,("file_version_is_newer: mod time = %ld sec\n", old_create_time));
+			DEBUGADD(6,("file_version_is_newer: mod time = %ld sec\n",
+				(long)old_create_time));
 		}
 	}
 	close_file(NULL, fsp, NORMAL_CLOSE);
@@ -1432,7 +1433,8 @@ static int file_version_is_newer(connection_struct *conn, fstring new_file, fstr
 				goto error_exit;
 			}
 			new_create_time = st.st_mtime;
-			DEBUGADD(6,("file_version_is_newer: mod time = %ld sec\n", new_create_time));
+			DEBUGADD(6,("file_version_is_newer: mod time = %ld sec\n",
+				(long)new_create_time));
 		}
 	}
 	close_file(NULL, fsp, NORMAL_CLOSE);
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index b30ef23..80ed019 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -2808,9 +2808,9 @@ static void send_file_readbraw(connection_struct *conn,
 		}
 		return;
 	}
-#endif
 
 normal_readbraw:
+#endif
 
 	outbuf = TALLOC_ARRAY(NULL, char, nread+4);
 	if (!outbuf) {


-- 
Samba Shared Repository