summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Sharpe <sharpe@samba.org>2004-10-27 17:03:09 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:53:04 -0500
commite53aa4700fdcc966d9b2de0f0d82495b7b69cbfc (patch)
tree84d63b21a197b063efb3fd3b8e71e1044ef50979
parent6f12b26cb7d0137c087bf6bdc5919c3a98bdb67f (diff)
downloadsamba-e53aa4700fdcc966d9b2de0f0d82495b7b69cbfc.tar.gz
samba-e53aa4700fdcc966d9b2de0f0d82495b7b69cbfc.tar.bz2
samba-e53aa4700fdcc966d9b2de0f0d82495b7b69cbfc.zip
r3292: A fix from Narayana Pattipati <narayana[dot]pattipati[at]wipro\dotty/com> for
Solaris to ensure we distinguish properly between 5.1 and 5.10. (This used to be commit 96baa5bb6c908fa5e870d86d3f380fd368ada658)
-rw-r--r--source3/client/client.c4
-rw-r--r--source3/configure.in2
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/client/client.c b/source3/client/client.c
index c2fec17d7e..311eaef8f2 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -701,7 +701,7 @@ static int do_get(char *rname, char *lname, BOOL reget)
return 1;
}
- DEBUG(2,("getting file %s of size %.0f as %s ",
+ DEBUG(1,("getting file %s of size %.0f as %s ",
rname, (double)size, lname));
if(!(data = (char *)malloc(read_size))) {
@@ -758,7 +758,7 @@ static int do_get(char *rname, char *lname, BOOL reget)
get_total_time_ms += this_time;
get_total_size += nread;
- DEBUG(2,("(%3.1f kb/s) (average %3.1f kb/s)\n",
+ DEBUG(1,("(%3.1f kb/s) (average %3.1f kb/s)\n",
nread / (1.024*this_time + 1.0e-4),
get_total_size / (1.024*get_total_time_ms)));
}
diff --git a/source3/configure.in b/source3/configure.in
index df78765559..83d12d5c90 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -460,7 +460,7 @@ case "$host_os" in
*solaris*)
AC_DEFINE(SYSV, 1, [Whether to enable System V compatibility])
case `uname -r` in
- 5.0*|5.1*|5.2*|5.3*|5.5*)
+ 5.0|5.0.*|5.1|5.1.*|5.2|5.2.*|5.3|5.3.*|5.5|5.5.*)
AC_MSG_RESULT([no large file support])
;;
5.*)