summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid O'Neill <dmo@samba.org>2000-11-22 16:19:07 +0000
committerDavid O'Neill <dmo@samba.org>2000-11-22 16:19:07 +0000
commita69a1a87d8f6fece120c423e473b6f67b7a6bb8e (patch)
tree4af09b765973e604de5bb3ff9d7e3a46d3ed25fb
parent6003be4856d3cecc444e5b1d6daa25843b4ca2dc (diff)
downloadsamba-a69a1a87d8f6fece120c423e473b6f67b7a6bb8e.tar.gz
samba-a69a1a87d8f6fece120c423e473b6f67b7a6bb8e.tar.bz2
samba-a69a1a87d8f6fece120c423e473b6f67b7a6bb8e.zip
Changes from APPLIANCE_HEAD:
- Add code to test equivalence of private data in NT_DEVICEMODE (This used to be commit 684981851ffa3b51e78a6fd5960e219823eb90d5)
-rw-r--r--source3/rpc_server/srv_spoolss_nt.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 0fea4a8763..1ef6a8c11b 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -3549,10 +3549,10 @@ static BOOL nt_devicemode_equal(NT_DEVICEMODE *d1, NT_DEVICEMODE *d2)
return False;
}
- /* Not sure what to do about these fields */
-#if 0
- uint8 *private;
-#endif
+ /* compare the private data if it exists */
+ if (!d1->driverextra && !d2->driverextra) return True;
+ if ( d1->driverextra != d2->driverextra) return False;
+ if (memcmp(d1->private, d2->private, d1->driverextra)) return False;
return True;
}