CVS update: samba/source/libsmb
Date: Thu Jul 24 06:19:37 2003 Author: jra Update of /data/cvs/samba/source/libsmb In directory dp.samba.org:/tmp/cvs-serv16932/libsmb Modified Files: Tag: SAMBA_3_0 smb_signing.c Log Message: SMB signing is now working with change notify. Need to fix the disconnect when bad signature received, plus check the oplock breaks Jermey. Revisions: smb_signing.c 1.4.2.21 = 1.4.2.22 http://www.samba.org/cgi-bin/cvsweb/samba/source/libsmb/smb_signing.c.diff?r1=1.4.2.21r2=1.4.2.22
CVS update: samba/source/smbd
Date: Thu Jul 24 06:19:37 2003 Author: jra Update of /data/cvs/samba/source/smbd In directory dp.samba.org:/tmp/cvs-serv16932/smbd Modified Files: Tag: SAMBA_3_0 notify.c nttrans.c Log Message: SMB signing is now working with change notify. Need to fix the disconnect when bad signature received, plus check the oplock breaks Jermey. Revisions: notify.c1.14.2.1 = 1.14.2.2 http://www.samba.org/cgi-bin/cvsweb/samba/source/smbd/notify.c.diff?r1=1.14.2.1r2=1.14.2.2 nttrans.c 1.154.2.24 = 1.154.2.25 http://www.samba.org/cgi-bin/cvsweb/samba/source/smbd/nttrans.c.diff?r1=1.154.2.24r2=1.154.2.25
CVS update: samba/source/smbd
Date: Thu Jul 24 06:56:56 2003 Author: jra Update of /data/cvs/samba/source/smbd In directory dp.samba.org:/tmp/cvs-serv20176/smbd Modified Files: Tag: SAMBA_3_0 blocking.c notify.c nttrans.c process.c Log Message: Ensure everywhere we defer an incoming SMB request (blocking lock queue, in oplock break state, change notify queue) we also push the MID onto the deferred signing queue. Tomorrow I will test this with valgrind and oplock tests. Jeremy. Revisions: blocking.c 1.28.2.5 = 1.28.2.6 http://www.samba.org/cgi-bin/cvsweb/samba/source/smbd/blocking.c.diff?r1=1.28.2.5r2=1.28.2.6 notify.c1.14.2.2 = 1.14.2.3 http://www.samba.org/cgi-bin/cvsweb/samba/source/smbd/notify.c.diff?r1=1.14.2.2r2=1.14.2.3 nttrans.c 1.154.2.25 = 1.154.2.26 http://www.samba.org/cgi-bin/cvsweb/samba/source/smbd/nttrans.c.diff?r1=1.154.2.25r2=1.154.2.26 process.c 1.92.2.19 = 1.92.2.20 http://www.samba.org/cgi-bin/cvsweb/samba/source/smbd/process.c.diff?r1=1.92.2.19r2=1.92.2.20
CVS update: samba/source/printing
Date: Thu Jul 24 07:02:55 2003 Author: jra Update of /data/cvs/samba/source/printing In directory dp.samba.org:/tmp/cvs-serv20871/printing Modified Files: Tag: SAMBA_3_0 pcap.c Log Message: Some fclose - x_fclose found by Tony Jago. Jeremy. Revisions: pcap.c 1.21.2.4 = 1.21.2.5 http://www.samba.org/cgi-bin/cvsweb/samba/source/printing/pcap.c.diff?r1=1.21.2.4r2=1.21.2.5
CVS update: samba/source/smbd
Date: Thu Jul 24 11:37:11 2003 Author: ab Update of /home/cvs/samba/source/smbd In directory dp.samba.org:/tmp/cvs-serv14338 Modified Files: Tag: SAMBA_3_0 ntquotas.c Log Message: Rise debug level to 5 for not-found-nt-quota message (quota setting for user wasn't found) Revisions: ntquotas.c 1.1.2.8 = 1.1.2.9 http://www.samba.org/cgi-bin/cvsweb/samba/source/smbd/ntquotas.c.diff?r1=1.1.2.8r2=1.1.2.9
CVS update: samba/source/include
Date: Thu Jul 24 14:23:54 2003 Author: ab Update of /home/cvs/samba/source/include In directory dp.samba.org:/tmp/cvs-serv31049 Modified Files: Tag: SAMBA_3_0 vfs.h Log Message: Add a macro to check whether module-specific data set already or not. Returns True or False. Should support further encapsulation of VFS-specific structs Revisions: vfs.h 1.25.2.8 = 1.25.2.9 http://www.samba.org/cgi-bin/cvsweb/samba/source/include/vfs.h.diff?r1=1.25.2.8r2=1.25.2.9
CVS update: samba/source/include
Date: Thu Jul 24 19:05:32 2003 Author: jra Update of /data/cvs/samba/source/include In directory dp.samba.org:/tmp/cvs-serv3332/include Modified Files: Tag: SAMBA_3_0 smb.h Log Message: Fix packet signing with asynchronous oplock breaks. Removed bad error message due to w2k bug. I think this code is now working Need more testing of course but works on all the obvious cases I can think of. Jeremy. Revisions: smb.h 1.424.2.47 = 1.424.2.48 http://www.samba.org/cgi-bin/cvsweb/samba/source/include/smb.h.diff?r1=1.424.2.47r2=1.424.2.48
CVS update: samba/source/libsmb
Date: Thu Jul 24 19:05:32 2003 Author: jra Update of /data/cvs/samba/source/libsmb In directory dp.samba.org:/tmp/cvs-serv3332/libsmb Modified Files: Tag: SAMBA_3_0 smb_signing.c Log Message: Fix packet signing with asynchronous oplock breaks. Removed bad error message due to w2k bug. I think this code is now working Need more testing of course but works on all the obvious cases I can think of. Jeremy. Revisions: smb_signing.c 1.4.2.22 = 1.4.2.23 http://www.samba.org/cgi-bin/cvsweb/samba/source/libsmb/smb_signing.c.diff?r1=1.4.2.22r2=1.4.2.23
CVS update: samba/source/smbd
Date: Thu Jul 24 19:05:32 2003 Author: jra Update of /data/cvs/samba/source/smbd In directory dp.samba.org:/tmp/cvs-serv3332/smbd Modified Files: Tag: SAMBA_3_0 process.c Log Message: Fix packet signing with asynchronous oplock breaks. Removed bad error message due to w2k bug. I think this code is now working Need more testing of course but works on all the obvious cases I can think of. Jeremy. Revisions: process.c 1.92.2.20 = 1.92.2.21 http://www.samba.org/cgi-bin/cvsweb/samba/source/smbd/process.c.diff?r1=1.92.2.20r2=1.92.2.21
CVS update: samba/source/smbd
Date: Thu Jul 24 19:10:52 2003 Author: jra Update of /data/cvs/samba/source/smbd In directory dp.samba.org:/tmp/cvs-serv4021/smbd Modified Files: Tag: SAMBA_3_0 open.c Log Message: Fix from [EMAIL PROTECTED] to stop files being created on read-only shares in some circumstances. Jeremy. Revisions: open.c 1.115.2.23 = 1.115.2.24 http://www.samba.org/cgi-bin/cvsweb/samba/source/smbd/open.c.diff?r1=1.115.2.23r2=1.115.2.24
CVS update: samba/source/smbd
Date: Thu Jul 24 23:46:25 2003 Author: tpot Update of /data/cvs/samba/source/smbd In directory dp.samba.org:/tmp/cvs-serv4084/smbd Modified Files: Tag: SAMBA_3_0 utmp.c sesssetup.c close.c Log Message: More printf fixes - size_t is long on some architectures. Revisions: utmp.c 1.6.2.4 = 1.6.2.5 http://www.samba.org/cgi-bin/cvsweb/samba/source/smbd/utmp.c.diff?r1=1.6.2.4r2=1.6.2.5 sesssetup.c 1.50.2.26 = 1.50.2.27 http://www.samba.org/cgi-bin/cvsweb/samba/source/smbd/sesssetup.c.diff?r1=1.50.2.26r2=1.50.2.27 close.c 1.42.2.6 = 1.42.2.7 http://www.samba.org/cgi-bin/cvsweb/samba/source/smbd/close.c.diff?r1=1.42.2.6r2=1.42.2.7
CVS update: samba/source/rpc_server
Date: Thu Jul 24 23:46:26 2003 Author: tpot Update of /data/cvs/samba/source/rpc_server In directory dp.samba.org:/tmp/cvs-serv4084/rpc_server Modified Files: Tag: SAMBA_3_0 srv_spoolss_nt.c srv_samr_nt.c Log Message: More printf fixes - size_t is long on some architectures. Revisions: srv_spoolss_nt.c1.277.2.67 = 1.277.2.68 http://www.samba.org/cgi-bin/cvsweb/samba/source/rpc_server/srv_spoolss_nt.c.diff?r1=1.277.2.67r2=1.277.2.68 srv_samr_nt.c 1.86.2.35 = 1.86.2.36 http://www.samba.org/cgi-bin/cvsweb/samba/source/rpc_server/srv_samr_nt.c.diff?r1=1.86.2.35r2=1.86.2.36
CVS update: samba/source/printing
Date: Thu Jul 24 23:46:26 2003 Author: tpot Update of /data/cvs/samba/source/printing In directory dp.samba.org:/tmp/cvs-serv4084/printing Modified Files: Tag: SAMBA_3_0 notify.c Log Message: More printf fixes - size_t is long on some architectures. Revisions: notify.c1.3.2.15 = 1.3.2.16 http://www.samba.org/cgi-bin/cvsweb/samba/source/printing/notify.c.diff?r1=1.3.2.15r2=1.3.2.16
CVS update: samba/source/passdb
Date: Thu Jul 24 23:46:26 2003 Author: tpot Update of /data/cvs/samba/source/passdb In directory dp.samba.org:/tmp/cvs-serv4084/passdb Modified Files: Tag: SAMBA_3_0 passdb.c Log Message: More printf fixes - size_t is long on some architectures. Revisions: passdb.c1.151.2.41 = 1.151.2.42 http://www.samba.org/cgi-bin/cvsweb/samba/source/passdb/passdb.c.diff?r1=1.151.2.41r2=1.151.2.42
CVS update: samba/source/libsmb
Date: Thu Jul 24 23:46:26 2003 Author: tpot Update of /data/cvs/samba/source/libsmb In directory dp.samba.org:/tmp/cvs-serv4084/libsmb Modified Files: Tag: SAMBA_3_0 ntlmssp.c cliconnect.c Log Message: More printf fixes - size_t is long on some architectures. Revisions: ntlmssp.c 1.4.2.12 = 1.4.2.13 http://www.samba.org/cgi-bin/cvsweb/samba/source/libsmb/ntlmssp.c.diff?r1=1.4.2.12r2=1.4.2.13 cliconnect.c1.71.2.32 = 1.71.2.33 http://www.samba.org/cgi-bin/cvsweb/samba/source/libsmb/cliconnect.c.diff?r1=1.71.2.32r2=1.71.2.33
CVS update: samba/source/lib
Date: Thu Jul 24 23:46:27 2003 Author: tpot Update of /data/cvs/samba/source/lib In directory dp.samba.org:/tmp/cvs-serv4084/lib Modified Files: Tag: SAMBA_3_0 util_str.c util_file.c charcnv.c Log Message: More printf fixes - size_t is long on some architectures. Revisions: util_str.c 1.47.2.29 = 1.47.2.30 http://www.samba.org/cgi-bin/cvsweb/samba/source/lib/util_str.c.diff?r1=1.47.2.29r2=1.47.2.30 util_file.c 1.32.2.2 = 1.32.2.3 http://www.samba.org/cgi-bin/cvsweb/samba/source/lib/util_file.c.diff?r1=1.32.2.2r2=1.32.2.3 charcnv.c 1.55.2.28 = 1.55.2.29 http://www.samba.org/cgi-bin/cvsweb/samba/source/lib/charcnv.c.diff?r1=1.55.2.28r2=1.55.2.29
CVS update: samba/source/auth
Date: Thu Jul 24 23:46:27 2003 Author: tpot Update of /data/cvs/samba/source/auth In directory dp.samba.org:/tmp/cvs-serv4084/auth Modified Files: Tag: SAMBA_3_0 auth_util.c auth_sam.c Log Message: More printf fixes - size_t is long on some architectures. Revisions: auth_util.c 1.39.2.38 = 1.39.2.39 http://www.samba.org/cgi-bin/cvsweb/samba/source/auth/auth_util.c.diff?r1=1.39.2.38r2=1.39.2.39 auth_sam.c 1.36.2.20 = 1.36.2.21 http://www.samba.org/cgi-bin/cvsweb/samba/source/auth/auth_sam.c.diff?r1=1.36.2.20r2=1.36.2.21
CVS update: samba/source/include
Date: Fri Jul 25 00:39:08 2003 Author: tpot Update of /data/cvs/samba/source/include In directory dp.samba.org:/tmp/cvs-serv8785/include Modified Files: Tag: SAMBA_3_0 rpc_secdes.h Log Message: Jean-Baptiste Marchand on the ethereal list used some auditing tricks to discover names for the SAMR specific permissions that were previously unknown. The existing constant names differ from what win2k calls them but since they aren't heavily used in Samba at the moment I'll leave them as they are. Jean-Baptiste's data is at: http://ethereal.ntop.org/lists/ethereal-dev/200307/msg00314.html Revisions: rpc_secdes.h1.21.2.4 = 1.21.2.5 http://www.samba.org/cgi-bin/cvsweb/samba/source/include/rpc_secdes.h.diff?r1=1.21.2.4r2=1.21.2.5
CVS update: samba/source/nsswitch
Date: Fri Jul 25 01:18:10 2003 Author: tpot Update of /data/cvs/samba/source/nsswitch In directory dp.samba.org:/tmp/cvs-serv11923 Modified Files: Tag: SAMBA_3_0 wbinfo.c Log Message: Make wbinfo -p work again. Fixes bug 251. Revisions: wbinfo.c1.38.2.19 = 1.38.2.20 http://www.samba.org/cgi-bin/cvsweb/samba/source/nsswitch/wbinfo.c.diff?r1=1.38.2.19r2=1.38.2.20
CVS update: samba/source/rpc_client
Date: Fri Jul 25 01:26:19 2003 Author: abartlet Update of /home/cvs/samba/source/rpc_client In directory dp.samba.org:/tmp/cvs-serv12421/rpc_client Modified Files: Tag: SAMBA_3_0 cli_pipe.c Log Message: Schannel, once setup, may be used on *ANY* TCP/IP connection until the connection that set it up has been shut down. (Also, pipes still connected, and reconnections to the same pipe (eg SAMR) may continue to use that session key until their TCP/IP connection is shut down) Allow further testing by printing out the session key, and allowing it's input into rpcclient. Next step is automatic storage in a TDB. Andrew Bartlett Revisions: cli_pipe.c 1.79.2.30 = 1.79.2.31 http://www.samba.org/cgi-bin/cvsweb/samba/source/rpc_client/cli_pipe.c.diff?r1=1.79.2.30r2=1.79.2.31
CVS update: samba/packaging/RedHat
Date: Fri Jul 25 02:24:47 2003 Author: jerry Update of /data/cvs/samba/packaging/RedHat In directory dp.samba.org:/tmp/cvs-serv17580 Modified Files: Tag: SAMBA_3_0 winbind.init Log Message: fix bug config file path in winbind init script (bug #237) Revisions: winbind.init1.1.8.2 = 1.1.8.3 http://www.samba.org/cgi-bin/cvsweb/samba/packaging/RedHat/winbind.init.diff?r1=1.1.8.2r2=1.1.8.3
CVS update: samba/packaging/RedHat
Date: Fri Jul 25 02:38:23 2003 Author: jerry Update of /data/cvs/samba/packaging/RedHat In directory dp.samba.org:/tmp/cvs-serv21092 Modified Files: Tag: SAMBA_3_0 samba.spec.tmpl Log Message: fix libsmbclientr symlink (patch by Alex Duggan for bug #247) Revisions: samba.spec.tmpl 1.1.2.2 = 1.1.2.3 http://www.samba.org/cgi-bin/cvsweb/samba/packaging/RedHat/samba.spec.tmpl.diff?r1=1.1.2.2r2=1.1.2.3
CVS update: samba/packaging/RedHat
Date: Fri Jul 25 03:26:03 2003 Author: jerry Update of /data/cvs/samba/packaging/RedHat In directory dp.samba.org:/tmp/cvs-serv26510 Modified Files: Tag: SAMBA_3_0 samba.spec.tmpl Log Message: call chkconfig --del winbind on removal (bug #238) Revisions: samba.spec.tmpl 1.1.2.3 = 1.1.2.4 http://www.samba.org/cgi-bin/cvsweb/samba/packaging/RedHat/samba.spec.tmpl.diff?r1=1.1.2.3r2=1.1.2.4
CVS update: samba/swat/images
Date: Fri Jul 25 03:48:56 2003 Author: jerry Update of /data/cvs/samba/swat/images In directory dp.samba.org:/tmp/cvs-serv28529 Modified Files: Tag: SAMBA_3_0 globals.gif home.gif passwd.gif printers.gif shares.gif status.gif viewconfig.gif wizard.gif Log Message: new swat icons from Marc Jacobsen @ HP Revisions: globals.gif 1.6 = 1.6.16.1 http://www.samba.org/cgi-bin/cvsweb/samba/swat/images/globals.gif.diff?r1=1.6r2=1.6.16.1 home.gif1.6 = 1.6.16.1 http://www.samba.org/cgi-bin/cvsweb/samba/swat/images/home.gif.diff?r1=1.6r2=1.6.16.1 passwd.gif 1.4 = 1.4.16.1 http://www.samba.org/cgi-bin/cvsweb/samba/swat/images/passwd.gif.diff?r1=1.4r2=1.4.16.1 printers.gif1.6 = 1.6.16.1 http://www.samba.org/cgi-bin/cvsweb/samba/swat/images/printers.gif.diff?r1=1.6r2=1.6.16.1 shares.gif 1.6 = 1.6.16.1 http://www.samba.org/cgi-bin/cvsweb/samba/swat/images/shares.gif.diff?r1=1.6r2=1.6.16.1 status.gif 1.6 = 1.6.16.1 http://www.samba.org/cgi-bin/cvsweb/samba/swat/images/status.gif.diff?r1=1.6r2=1.6.16.1 viewconfig.gif 1.6 = 1.6.16.1 http://www.samba.org/cgi-bin/cvsweb/samba/swat/images/viewconfig.gif.diff?r1=1.6r2=1.6.16.1 wizard.gif 1.1.6.1 = 1.1.6.2 http://www.samba.org/cgi-bin/cvsweb/samba/swat/images/wizard.gif.diff?r1=1.1.6.1r2=1.1.6.2
CVS update: samba/source/smbd
Date: Fri Jul 25 04:24:38 2003 Author: tpot Update of /data/cvs/samba/source/smbd In directory dp.samba.org:/tmp/cvs-serv1694/smbd Modified Files: Tag: SAMBA_3_0 utmp.c sesssetup.c close.c Log Message: More printf portability fixes. Got caught out by some gcc'isms last time. )-: Revisions: utmp.c 1.6.2.5 = 1.6.2.6 http://www.samba.org/cgi-bin/cvsweb/samba/source/smbd/utmp.c.diff?r1=1.6.2.5r2=1.6.2.6 sesssetup.c 1.50.2.27 = 1.50.2.28 http://www.samba.org/cgi-bin/cvsweb/samba/source/smbd/sesssetup.c.diff?r1=1.50.2.27r2=1.50.2.28 close.c 1.42.2.7 = 1.42.2.8 http://www.samba.org/cgi-bin/cvsweb/samba/source/smbd/close.c.diff?r1=1.42.2.7r2=1.42.2.8
CVS update: samba/source/rpc_server
Date: Fri Jul 25 04:24:39 2003 Author: tpot Update of /data/cvs/samba/source/rpc_server In directory dp.samba.org:/tmp/cvs-serv1694/rpc_server Modified Files: Tag: SAMBA_3_0 srv_spoolss_nt.c srv_samr_nt.c Log Message: More printf portability fixes. Got caught out by some gcc'isms last time. )-: Revisions: srv_spoolss_nt.c1.277.2.68 = 1.277.2.69 http://www.samba.org/cgi-bin/cvsweb/samba/source/rpc_server/srv_spoolss_nt.c.diff?r1=1.277.2.68r2=1.277.2.69 srv_samr_nt.c 1.86.2.36 = 1.86.2.37 http://www.samba.org/cgi-bin/cvsweb/samba/source/rpc_server/srv_samr_nt.c.diff?r1=1.86.2.36r2=1.86.2.37
CVS update: samba/source/printing
Date: Fri Jul 25 04:24:40 2003 Author: tpot Update of /data/cvs/samba/source/printing In directory dp.samba.org:/tmp/cvs-serv1694/printing Modified Files: Tag: SAMBA_3_0 notify.c Log Message: More printf portability fixes. Got caught out by some gcc'isms last time. )-: Revisions: notify.c1.3.2.16 = 1.3.2.17 http://www.samba.org/cgi-bin/cvsweb/samba/source/printing/notify.c.diff?r1=1.3.2.16r2=1.3.2.17
CVS update: samba/source/rpc_parse
Date: Fri Jul 25 04:24:40 2003 Author: tpot Update of /data/cvs/samba/source/rpc_parse In directory dp.samba.org:/tmp/cvs-serv1694/rpc_parse Modified Files: Tag: SAMBA_3_0 parse_prs.c Log Message: More printf portability fixes. Got caught out by some gcc'isms last time. )-: Revisions: parse_prs.c 1.75.2.14 = 1.75.2.15 http://www.samba.org/cgi-bin/cvsweb/samba/source/rpc_parse/parse_prs.c.diff?r1=1.75.2.14r2=1.75.2.15
CVS update: samba/source/passdb
Date: Fri Jul 25 04:24:40 2003 Author: tpot Update of /data/cvs/samba/source/passdb In directory dp.samba.org:/tmp/cvs-serv1694/passdb Modified Files: Tag: SAMBA_3_0 passdb.c Log Message: More printf portability fixes. Got caught out by some gcc'isms last time. )-: Revisions: passdb.c1.151.2.42 = 1.151.2.43 http://www.samba.org/cgi-bin/cvsweb/samba/source/passdb/passdb.c.diff?r1=1.151.2.42r2=1.151.2.43
CVS update: samba/source/libsmb
Date: Fri Jul 25 04:24:40 2003 Author: tpot Update of /data/cvs/samba/source/libsmb In directory dp.samba.org:/tmp/cvs-serv1694/libsmb Modified Files: Tag: SAMBA_3_0 ntlmssp.c cliconnect.c Log Message: More printf portability fixes. Got caught out by some gcc'isms last time. )-: Revisions: ntlmssp.c 1.4.2.13 = 1.4.2.14 http://www.samba.org/cgi-bin/cvsweb/samba/source/libsmb/ntlmssp.c.diff?r1=1.4.2.13r2=1.4.2.14 cliconnect.c1.71.2.33 = 1.71.2.34 http://www.samba.org/cgi-bin/cvsweb/samba/source/libsmb/cliconnect.c.diff?r1=1.71.2.33r2=1.71.2.34
CVS update: samba/source/lib
Date: Fri Jul 25 04:24:40 2003 Author: tpot Update of /data/cvs/samba/source/lib In directory dp.samba.org:/tmp/cvs-serv1694/lib Modified Files: Tag: SAMBA_3_0 util_str.c util_file.c charcnv.c Log Message: More printf portability fixes. Got caught out by some gcc'isms last time. )-: Revisions: util_str.c 1.47.2.30 = 1.47.2.31 http://www.samba.org/cgi-bin/cvsweb/samba/source/lib/util_str.c.diff?r1=1.47.2.30r2=1.47.2.31 util_file.c 1.32.2.3 = 1.32.2.4 http://www.samba.org/cgi-bin/cvsweb/samba/source/lib/util_file.c.diff?r1=1.32.2.3r2=1.32.2.4 charcnv.c 1.55.2.29 = 1.55.2.30 http://www.samba.org/cgi-bin/cvsweb/samba/source/lib/charcnv.c.diff?r1=1.55.2.29r2=1.55.2.30
CVS update: samba/source/auth
Date: Fri Jul 25 04:24:40 2003 Author: tpot Update of /data/cvs/samba/source/auth In directory dp.samba.org:/tmp/cvs-serv1694/auth Modified Files: Tag: SAMBA_3_0 auth_util.c auth_sam.c Log Message: More printf portability fixes. Got caught out by some gcc'isms last time. )-: Revisions: auth_util.c 1.39.2.39 = 1.39.2.40 http://www.samba.org/cgi-bin/cvsweb/samba/source/auth/auth_util.c.diff?r1=1.39.2.39r2=1.39.2.40 auth_sam.c 1.36.2.21 = 1.36.2.22 http://www.samba.org/cgi-bin/cvsweb/samba/source/auth/auth_sam.c.diff?r1=1.36.2.21r2=1.36.2.22
