summaryrefslogtreecommitdiff
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
commit6633633f7dc41a2b0abae2ce913f5c9c69d15d15 (patch)
tree98f78cc6002989c483db23902164fe0028e756de
parent1492a040ee5444f3a021de367f3dde112eb227b7 (diff)
downloadsamba-6633633f7dc41a2b0abae2ce913f5c9c69d15d15.tar.gz
samba-6633633f7dc41a2b0abae2ce913f5c9c69d15d15.tar.bz2
samba-6633633f7dc41a2b0abae2ce913f5c9c69d15d15.zip
one line merge from APP_HEAD
(This used to be commit b6b64d06a630f741c7ffbec99b71d34496159fa7)
-rw-r--r--source3/printing/nt_printing.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index f208cabb60..e9ebb89d60 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/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)) {