summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2002-08-08 22:17:42 +0000
committerGerald Carter <jerry@samba.org>2002-08-08 22:17:42 +0000
commitb6b64d06a630f741c7ffbec99b71d34496159fa7 (patch)
tree839a725afe93bdc7e86e6a8744a318a7f8f541d3 /source
parent9c6b930068d1e762fad78c9e36792764c280b85c (diff)
downloadsamba-b6b64d06a630f741c7ffbec99b71d34496159fa7.tar.gz
samba-b6b64d06a630f741c7ffbec99b71d34496159fa7.tar.xz
samba-b6b64d06a630f741c7ffbec99b71d34496159fa7.zip
one line merge from APP_HEAD
Diffstat (limited to 'source')
-rw-r--r--source/printing/nt_printing.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/printing/nt_printing.c b/source/printing/nt_printing.c
index f208cabb606..e9ebb89d605 100644
--- a/source/printing/nt_printing.c
+++ b/source/printing/nt_printing.c
@@ -1012,7 +1012,7 @@ static int file_version_is_newer(connection_struct *conn, fstring new_file,
}
close_file(fsp, True);
- if (use_version) {
+ if (use_version && (new_major != old_major || new_minor != old_minor)) {
/* Compare versions and choose the larger version number */
if (new_major > old_major ||
(new_major == old_major && new_minor > old_minor)) {