X-MimeOLE: Produced By Microsoft Exchange V6.5
Received: by onstor-exch02.onstor.net 
	id <01C75150.2FDE40F6@onstor-exch02.onstor.net>; Thu, 15 Feb 2007 15:25:24 -0700
MIME-Version: 1.0
Content-Type: multipart/alternative;
	boundary="----_=_NextPart_001_01C75150.2FDE40F6"
Content-class: urn:content-classes:message
Subject: using patch tool, with perforce ..  to move changes across different perforce code trees (for developers)
Date: Thu, 15 Feb 2007 15:25:24 -0700
Message-ID: <BB375AF679D4A34E9CA8DFA650E2B04E028FEF@onstor-exch02.onstor.net>
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
Thread-Topic: using patch tool, with perforce ..  to move changes across different perforce code trees (for developers)
Thread-Index: AcdRUC/GjlqmA3pHShS9ZkKwImbGOQ==
From: "Shamsudeen Jeseem" <jeseem@onstor.com>
To: "dl-Engineering" <dl-engineering@onstor.com>

This is a multi-part message in MIME format.

------_=_NextPart_001_01C75150.2FDE40F6
Content-Type: text/plain;
	charset="us-ascii"
Content-Transfer-Encoding: quoted-printable

Hi,
	Here's a simple way to move your changes from one p4 client to
another (or across branches), using patch utility

Steps=20

1.	Do a p4 diff on the first branch and redirect it into a file
(/tmp/xxx.diff) .
2.	modify the first line in the output file (/tmp/xxx.diff) to make
it compatible for use by patch utility
3.	checkout the file in new P4client
4.	apply the patch ( patch -p1 < /tmp/xxx.diff )

The patch utility is intelligent to minor changes in source files.=20
So it can workaround most of them.=20
If it cannot it will fail with .hunk files which show you what all
failed.=20

Example :

e.g. I am moving changes from my P4CLIENT=3Djes-r131 to =
P4CLIENT=3Djes-r133=20

Step 1 :
In P4CLIENT=3Djes-r131 ,=20

[jeseem@jeseem-linux nfx-tree]$ p4 diff -du code/sm-cifs/cifs-ntlmv2.c
> /tmp/cifs-ntlmv2.diff

If you cat the file /tmp/cifs-ntlmv2.diff

[jeseem@jeseem-linux nfx-tree]$ cat /tmp/cifs-ntlmv2.diff1
=3D=3D=3D=3D //depot/FB-DELOREAN/nfx-tree/code/sm-cifs/cifs-ntlmv2.c#1 -
/opt/code/FB-DELOREAN/nfx-tree/code/sm-cifs/cifs-ntlmv2.c =3D=3D=3D=3D
@@ -70,10 +70,10 @@
 *
 */

-NTSTATUS get_sec_blob(cifs_conn_t *conn,UCHAR *buffer, uint32 *len)
+NTSTATUS get_sec_blob(UCHAR *buffer, uint32 *len)
 {
-       memcpy((void
*)&(conn->cc_secblob),defSecBlob,sizeof(defSecBlob));
-        conn->cc_secBlobLen =3D sizeof(defSecBlob);
+/*     memcpy((void
*)&(conn->cc_secblob),defSecBlob,sizeof(defSecBlob));
+        conn->cc_secBlobLen =3D sizeof(defSecBlob); */
        memcpy((void *)(buffer),defSecBlob,sizeof(defSecBlob));

        *len =3D sizeof(defSecBlob);



Step 2 :

The only change you need to change is the first line using vi or any
editor, to make it a patch file (the changed portions are colored in
BLUE)

[jeseem@jeseem-linux nfx-tree]$ cat /tmp/cifs-ntlmv2.diff
--- nfx-tree/code/sm-cifs/cifs-ntlmv2.c#1
+++ nfx-tree/code/sm-cifs/cifs-ntlmv2.c =3D=3D=3D=3D
@@ -70,10 +70,10 @@
 *
 */

-NTSTATUS get_sec_blob(cifs_conn_t *conn,UCHAR *buffer, uint32 *len)
+NTSTATUS get_sec_blob(UCHAR *buffer, uint32 *len)
 {
-       memcpy((void
*)&(conn->cc_secblob),defSecBlob,sizeof(defSecBlob));
-        conn->cc_secBlobLen =3D sizeof(defSecBlob);
+/*     memcpy((void
*)&(conn->cc_secblob),defSecBlob,sizeof(defSecBlob));
+        conn->cc_secBlobLen =3D sizeof(defSecBlob); */
        memcpy((void *)(buffer),defSecBlob,sizeof(defSecBlob));

        *len =3D sizeof(defSecBlob);


Step 3 :

In the new P4CLIENT (P4CLIENT=3D jes-r133)
 Check out the source file=20

[jeseem@jeseem-linux nfx-tree]$p4 edit code/sm-cifs/cifs-ntlmv2.c

Step 4:

Apply the patch in the new P4CLIENT
[jeseem@jeseem-linux nfx-tree]$ patch -p1 < /tmp/cifs-ntlmv2.diff


------_=_NextPart_001_01C75150.2FDE40F6
Content-Type: text/html;
	charset="us-ascii"
Content-Transfer-Encoding: quoted-printable

<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<META HTTP-EQUIV=3D"Content-Type" CONTENT=3D"text/html; =
charset=3Dus-ascii">
<META NAME=3D"Generator" CONTENT=3D"MS Exchange Server version =
6.5.7652.24">
<TITLE>using patch tool, with perforce ..  to move changes across =
different perforce code trees (for developers)</TITLE>
</HEAD>
<BODY>
<!-- Converted from text/rtf format -->

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><FONT SIZE=3D2 =
FACE=3D"Arial">Hi,</FONT></SPAN></P>

<P ALIGN=3DLEFT><SPAN =
LANG=3D"en-us">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</SPAN><SPAN =
LANG=3D"en-us"></SPAN><SPAN LANG=3D"en-us"> <FONT SIZE=3D2 =
FACE=3D"Arial">Here</FONT></SPAN><SPAN LANG=3D"en-us"></SPAN><SPAN =
LANG=3D"en-us"><FONT SIZE=3D2 FACE=3D"Arial">&#8217;</FONT></SPAN><SPAN =
LANG=3D"en-us"></SPAN><SPAN LANG=3D"en-us"><FONT SIZE=3D2 =
FACE=3D"Arial">s a simple way to move your changes from one p4 client to =
another</FONT></SPAN><SPAN LANG=3D"en-us"></SPAN><SPAN =
LANG=3D"en-us"><FONT SIZE=3D2 FACE=3D"Arial"></FONT></SPAN><SPAN =
LANG=3D"en-us"></SPAN><SPAN LANG=3D"en-us"> <FONT SIZE=3D2 =
FACE=3D"Arial">(or</FONT></SPAN><SPAN LANG=3D"en-us"></SPAN><SPAN =
LANG=3D"en-us"><FONT SIZE=3D2 FACE=3D"Arial"> across =
branches)</FONT></SPAN><SPAN LANG=3D"en-us"></SPAN><SPAN =
LANG=3D"en-us"><FONT SIZE=3D2 FACE=3D"Arial">, using =
patch</FONT></SPAN><SPAN LANG=3D"en-us"></SPAN><SPAN LANG=3D"en-us"> =
<FONT SIZE=3D2 FACE=3D"Arial">utility</FONT></SPAN><SPAN =
LANG=3D"en-us"></SPAN><SPAN LANG=3D"en-us"></SPAN></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><B><U><FONT SIZE=3D2 =
FACE=3D"Arial">Steps </FONT></U></B></SPAN></P>

<P><SPAN LANG=3D"en-us"><FONT SIZE=3D2 =
FACE=3D"Arial">1.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</FONT></SPAN><SPAN =
LANG=3D"en-us"></SPAN><SPAN LANG=3D"en-us"></SPAN><SPAN LANG=3D"en-us"> =
<FONT SIZE=3D2 FACE=3D"Arial">Do a p4 diff on the first branch and =
redirect it into a file</FONT></SPAN><SPAN LANG=3D"en-us"></SPAN><SPAN =
LANG=3D"en-us"><FONT SIZE=3D2 FACE=3D"Arial"> =
(/tmp/xxx.diff)</FONT></SPAN><SPAN LANG=3D"en-us"></SPAN><SPAN =
LANG=3D"en-us"> <FONT SIZE=3D2 FACE=3D"Arial">.</FONT></SPAN>

<BR><SPAN LANG=3D"en-us"><FONT SIZE=3D2 =
FACE=3D"Arial">2.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</FONT> <FONT SIZE=3D2 =
FACE=3D"Arial">modify the first line in the output =
file</FONT></SPAN><SPAN LANG=3D"en-us"></SPAN><SPAN LANG=3D"en-us"><FONT =
SIZE=3D2 FACE=3D"Arial"> (/tmp/xxx.diff)</FONT></SPAN><SPAN =
LANG=3D"en-us"></SPAN><SPAN LANG=3D"en-us"><FONT SIZE=3D2 =
FACE=3D"Arial"> to make it compatible for</FONT></SPAN><SPAN =
LANG=3D"en-us"></SPAN><SPAN LANG=3D"en-us"> <FONT SIZE=3D2 =
FACE=3D"Arial">use by</FONT></SPAN><SPAN LANG=3D"en-us"></SPAN><SPAN =
LANG=3D"en-us"> <FONT SIZE=3D2 FACE=3D"Arial">patch</FONT></SPAN><SPAN =
LANG=3D"en-us"></SPAN><SPAN LANG=3D"en-us"> <FONT SIZE=3D2 =
FACE=3D"Arial">utility</FONT></SPAN>

<BR><SPAN LANG=3D"en-us"><FONT SIZE=3D2 =
FACE=3D"Arial">3.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</FONT> <FONT SIZE=3D2 =
FACE=3D"Arial">checkout the file in new P4client</FONT></SPAN>

<BR><SPAN LANG=3D"en-us"><FONT SIZE=3D2 =
FACE=3D"Arial">4.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</FONT> <FONT SIZE=3D2 =
FACE=3D"Arial">a</FONT></SPAN><SPAN LANG=3D"en-us"></SPAN><SPAN =
LANG=3D"en-us"><FONT SIZE=3D2 FACE=3D"Arial">pply the patch ( =
patch</FONT></SPAN><SPAN LANG=3D"en-us"></SPAN><SPAN LANG=3D"en-us"> =
<FONT SIZE=3D2 FACE=3D"Arial">&#8211;</FONT></SPAN><SPAN =
LANG=3D"en-us"></SPAN><SPAN LANG=3D"en-us"><FONT SIZE=3D2 =
FACE=3D"Arial">p1 &lt; /tmp/xxx.diff )</FONT></SPAN><SPAN =
LANG=3D"en-us"></SPAN><SPAN LANG=3D"en-us"></SPAN>
</P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><FONT SIZE=3D2 FACE=3D"Arial">The =
patch utility is intelligent to minor changes in source =
files.</FONT></SPAN><SPAN LANG=3D"en-us"></SPAN><SPAN LANG=3D"en-us"> =
</SPAN></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><FONT SIZE=3D2 FACE=3D"Arial">So =
it</FONT></SPAN><SPAN LANG=3D"en-us"></SPAN><SPAN LANG=3D"en-us"> <FONT =
SIZE=3D2 FACE=3D"Arial">can workaround most of them.</FONT></SPAN><SPAN =
LANG=3D"en-us"></SPAN><SPAN LANG=3D"en-us"> </SPAN></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><FONT SIZE=3D2 FACE=3D"Arial">If it =
cannot it will fail with .hunk files which show you what all =
failed.</FONT></SPAN><SPAN LANG=3D"en-us"></SPAN><SPAN =
LANG=3D"en-us"><FONT SIZE=3D2 FACE=3D"Arial"></FONT></SPAN><SPAN =
LANG=3D"en-us"></SPAN><SPAN LANG=3D"en-us"> </SPAN></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><B><FONT SIZE=3D2 =
FACE=3D"Arial">Example :</FONT></B></SPAN><SPAN =
LANG=3D"en-us"><B></B></SPAN><SPAN LANG=3D"en-us"><B></B></SPAN></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><FONT SIZE=3D2 FACE=3D"Arial">e.g. =
I am moving changes from my P4CLIENT=3Djes-r131 to P</FONT></SPAN><SPAN =
LANG=3D"en-us"></SPAN><SPAN LANG=3D"en-us"><FONT SIZE=3D2 =
FACE=3D"Arial">4CLIENT=3Djes-r133</FONT></SPAN><SPAN =
LANG=3D"en-us"></SPAN><SPAN LANG=3D"en-us"> </SPAN></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><B><U><FONT SIZE=3D2 =
FACE=3D"Arial">Step 1 :</FONT></U></B></SPAN><SPAN =
LANG=3D"en-us"><B></B></SPAN><SPAN =
LANG=3D"en-us"><B><U></U></B></SPAN></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><FONT SIZE=3D2 FACE=3D"Arial">In =
P4CLIENT=3Djes-r131 ,</FONT></SPAN><SPAN LANG=3D"en-us"></SPAN><SPAN =
LANG=3D"en-us"> </SPAN></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><B><I><FONT SIZE=3D2 =
FACE=3D"Arial">[jeseem@jeseem-linux =
nfx-tree]$</FONT></I></B></SPAN><SPAN =
LANG=3D"en-us"><B><I></I></B></SPAN><SPAN LANG=3D"en-us"><B><I> <FONT =
SIZE=3D2 FACE=3D"Arial">p4</FONT></I></B></SPAN><SPAN =
LANG=3D"en-us"><B><I></I></B></SPAN><SPAN LANG=3D"en-us"><B><I><FONT =
SIZE=3D2 FACE=3D"Arial"> diff</FONT></I></B></SPAN><SPAN =
LANG=3D"en-us"><B><I></I></B></SPAN><SPAN LANG=3D"en-us"><B><I> <FONT =
SIZE=3D2 FACE=3D"Arial">&#8211;</FONT></I></B></SPAN><SPAN =
LANG=3D"en-us"><B><I></I></B></SPAN><SPAN LANG=3D"en-us"><B><I><FONT =
SIZE=3D2 FACE=3D"Arial">du</FONT></I></B></SPAN><SPAN =
LANG=3D"en-us"><B><I></I></B></SPAN><SPAN LANG=3D"en-us"><B><I> <FONT =
SIZE=3D2 =
FACE=3D"Arial">code/sm-cifs/cifs-ntlmv2.c</FONT></I></B></SPAN><SPAN =
LANG=3D"en-us"><B><I></I></B></SPAN><SPAN LANG=3D"en-us"><B><I><FONT =
SIZE=3D2 FACE=3D"Arial">&nbsp; &gt; /tmp/</FONT></I></B></SPAN><SPAN =
LANG=3D"en-us"><B><I></I></B></SPAN><SPAN LANG=3D"en-us"><B><I><FONT =
SIZE=3D2 FACE=3D"Arial">cifs-ntlmv2.diff</FONT></I></B></SPAN></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><FONT SIZE=3D2 FACE=3D"Arial">If =
you cat the file</FONT></SPAN><SPAN LANG=3D"en-us"></SPAN><SPAN =
LANG=3D"en-us"> <FONT SIZE=3D2 =
FACE=3D"Arial">/tmp/cifs-ntlmv2.diff</FONT></SPAN></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><B><I><FONT SIZE=3D2 =
FACE=3D"Arial">[jeseem@jeseem-linux nfx-tree]$ cat =
/tmp/cifs-ntlmv2.diff1</FONT></I></B></SPAN></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><B><FONT COLOR=3D"#3366FF" SIZE=3D2 =
FACE=3D"Arial">=3D=3D=3D=3D =
//depot/FB-DELOREAN/nfx-tree/</FONT></B></SPAN><SPAN =
LANG=3D"en-us"></SPAN><SPAN LANG=3D"en-us"><FONT SIZE=3D2 =
FACE=3D"Arial">code/sm-cifs/cifs-ntlmv2.c#1</FONT></SPAN><SPAN =
LANG=3D"en-us"><B></B></SPAN><SPAN LANG=3D"en-us"><B><FONT SIZE=3D2 =
FACE=3D"Arial"></FONT></B></SPAN><SPAN =
LANG=3D"en-us"><B></B></SPAN><SPAN LANG=3D"en-us"><B> <FONT =
COLOR=3D"#3366FF" SIZE=3D2 FACE=3D"Arial">- =
/opt/code/FB-DELOREAN/</FONT></B></SPAN><SPAN =
LANG=3D"en-us"></SPAN><SPAN LANG=3D"en-us"><FONT SIZE=3D2 =
FACE=3D"Arial">nfx-tree/code/sm-cifs/cifs-ntlmv2.c =
=3D=3D=3D=3D</FONT></SPAN></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><FONT SIZE=3D2 FACE=3D"Arial">@@ =
-70,10 +70,10 @@</FONT></SPAN></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><FONT SIZE=3D2 =
FACE=3D"Arial">&nbsp;*</FONT></SPAN></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><FONT SIZE=3D2 =
FACE=3D"Arial">&nbsp;*/</FONT></SPAN></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><FONT SIZE=3D2 =
FACE=3D"Arial">-NTSTATUS get_sec_blob(cifs_conn_t *conn,UCHAR *buffer, =
uint32 *len)</FONT></SPAN></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><FONT SIZE=3D2 =
FACE=3D"Arial">+NTSTATUS get_sec_blob(UCHAR *buffer, uint32 =
*len)</FONT></SPAN></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><FONT SIZE=3D2 =
FACE=3D"Arial">&nbsp;{</FONT></SPAN></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><FONT SIZE=3D2 =
FACE=3D"Arial">-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; memcpy((void =
*)&amp;(conn-&gt;cc_secblob),defSecBlob,sizeof(defSecBlob));</FONT></SPAN=
></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><FONT SIZE=3D2 =
FACE=3D"Arial">-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; =
conn-&gt;cc_secBlobLen =3D sizeof(defSecBlob);</FONT></SPAN></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><FONT SIZE=3D2 =
FACE=3D"Arial">+/*&nbsp;&nbsp;&nbsp;&nbsp; memcpy((void =
*)&amp;(conn-&gt;cc_secblob),defSecBlob,sizeof(defSecBlob));</FONT></SPAN=
></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><FONT SIZE=3D2 =
FACE=3D"Arial">+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; =
conn-&gt;cc_secBlobLen =3D sizeof(defSecBlob); */</FONT></SPAN></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><FONT SIZE=3D2 =
FACE=3D"Arial">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; memcpy((void =
*)(buffer),defSecBlob,sizeof(defSecBlob));</FONT></SPAN></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><FONT SIZE=3D2 =
FACE=3D"Arial">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; *len =3D =
sizeof(defSecBlob);</FONT></SPAN><SPAN LANG=3D"en-us"></SPAN><SPAN =
LANG=3D"en-us"></SPAN></P>
<BR>
<BR>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><B><U><FONT SIZE=3D2 =
FACE=3D"Arial">Step 2 :</FONT></U></B></SPAN><SPAN =
LANG=3D"en-us"><B></B></SPAN><SPAN =
LANG=3D"en-us"><B><U></U></B></SPAN></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><FONT SIZE=3D2 FACE=3D"Arial">The =
only ch</FONT></SPAN><SPAN LANG=3D"en-us"></SPAN><SPAN =
LANG=3D"en-us"><FONT SIZE=3D2 FACE=3D"Arial">a</FONT></SPAN><SPAN =
LANG=3D"en-us"></SPAN><SPAN LANG=3D"en-us"><FONT SIZE=3D2 =
FACE=3D"Arial">nge you need to change is the first =
line</FONT></SPAN><SPAN LANG=3D"en-us"></SPAN><SPAN LANG=3D"en-us"> =
<FONT SIZE=3D2 FACE=3D"Arial">using vi or any editor,</FONT></SPAN><SPAN =
LANG=3D"en-us"></SPAN><SPAN LANG=3D"en-us"> <FONT SIZE=3D2 =
FACE=3D"Arial">to make it a patch file</FONT></SPAN><SPAN =
LANG=3D"en-us"></SPAN><SPAN LANG=3D"en-us"><FONT SIZE=3D2 =
FACE=3D"Arial"></FONT></SPAN><SPAN LANG=3D"en-us"></SPAN><SPAN =
LANG=3D"en-us"> <FONT SIZE=3D2 FACE=3D"Arial">(the</FONT></SPAN><SPAN =
LANG=3D"en-us"></SPAN><SPAN LANG=3D"en-us"><FONT SIZE=3D2 =
FACE=3D"Arial"> changed portions are colored in</FONT></SPAN><SPAN =
LANG=3D"en-us"><B></B></SPAN><SPAN LANG=3D"en-us"><B> <FONT =
COLOR=3D"#3366FF" SIZE=3D2 FACE=3D"Arial">BLUE</FONT></B></SPAN><SPAN =
LANG=3D"en-us"></SPAN><SPAN LANG=3D"en-us"><FONT SIZE=3D2 =
FACE=3D"Arial">)</FONT></SPAN><SPAN LANG=3D"en-us"></SPAN><SPAN =
LANG=3D"en-us"></SPAN></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><B><I><FONT SIZE=3D2 =
FACE=3D"Arial">[jeseem@jeseem-linux nfx-tree]$ cat =
/tmp/cifs-ntlmv2.diff</FONT></I></B></SPAN></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><B><FONT COLOR=3D"#3366FF" SIZE=3D2 =
FACE=3D"Arial">---</FONT></B></SPAN><SPAN LANG=3D"en-us"></SPAN><SPAN =
LANG=3D"en-us"> <FONT SIZE=3D2 =
FACE=3D"Arial">nfx-tree/code/sm-cifs/cifs-ntlmv2.c#1</FONT></SPAN></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><B><FONT COLOR=3D"#3366FF" SIZE=3D2 =
FACE=3D"Arial">+++</FONT></B></SPAN><SPAN LANG=3D"en-us"></SPAN><SPAN =
LANG=3D"en-us"> <FONT SIZE=3D2 =
FACE=3D"Arial">nfx-tree/code/sm-cifs/cifs-ntlmv2.c =
=3D=3D=3D=3D</FONT></SPAN></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><FONT SIZE=3D2 FACE=3D"Arial">@@ =
-70,10 +70,10 @@</FONT></SPAN></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><FONT SIZE=3D2 =
FACE=3D"Arial">&nbsp;*</FONT></SPAN></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><FONT SIZE=3D2 =
FACE=3D"Arial">&nbsp;*/</FONT></SPAN></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><FONT SIZE=3D2 =
FACE=3D"Arial">-NTSTATUS get_sec_blob(cifs_conn_t *conn,UCHAR *buffer, =
uint32 *len)</FONT></SPAN></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><FONT SIZE=3D2 =
FACE=3D"Arial">+NTSTATUS get_sec_blob(UCHAR *buffer, uint32 =
*len)</FONT></SPAN></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><FONT SIZE=3D2 =
FACE=3D"Arial">&nbsp;{</FONT></SPAN></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><FONT SIZE=3D2 =
FACE=3D"Arial">-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; memcpy((void =
*)&amp;(conn-&gt;cc_secblob),defSecBlob,sizeof(defSecBlob));</FONT></SPAN=
></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><FONT SIZE=3D2 =
FACE=3D"Arial">-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; =
conn-&gt;cc_secBlobLen =3D sizeof(defSecBlob);</FONT></SPAN></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><FONT SIZE=3D2 =
FACE=3D"Arial">+/*&nbsp;&nbsp;&nbsp;&nbsp; memcpy((void =
*)&amp;(conn-&gt;cc_secblob),defSecBlob,sizeof(defSecBlob));</FONT></SPAN=
></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><FONT SIZE=3D2 =
FACE=3D"Arial">+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; =
conn-&gt;cc_secBlobLen =3D sizeof(defSecBlob); */</FONT></SPAN></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><FONT SIZE=3D2 =
FACE=3D"Arial">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; memcpy((void =
*)(buffer),defSecBlob,sizeof(defSecBlob));</FONT></SPAN></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><FONT SIZE=3D2 =
FACE=3D"Arial">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; *len =3D =
sizeof(defSecBlob);</FONT></SPAN><SPAN LANG=3D"en-us"></SPAN><SPAN =
LANG=3D"en-us"></SPAN></P>
<BR>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><B><U><FONT SIZE=3D2 =
FACE=3D"Arial">Step 3 :</FONT></U></B></SPAN><SPAN =
LANG=3D"en-us"><B></B></SPAN><SPAN =
LANG=3D"en-us"><B><U></U></B></SPAN></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><FONT SIZE=3D2 =
FACE=3D"Arial">In</FONT></SPAN><SPAN LANG=3D"en-us"></SPAN><SPAN =
LANG=3D"en-us"> <FONT SIZE=3D2 FACE=3D"Arial">the new P4CLIENT =
(</FONT></SPAN><SPAN LANG=3D"en-us"></SPAN><SPAN LANG=3D"en-us"><FONT =
SIZE=3D2 FACE=3D"Arial">P4CLIENT=3D jes-r133</FONT></SPAN><SPAN =
LANG=3D"en-us"></SPAN><SPAN LANG=3D"en-us"><FONT SIZE=3D2 =
FACE=3D"Arial">)</FONT></SPAN><SPAN LANG=3D"en-us"></SPAN><SPAN =
LANG=3D"en-us"></SPAN></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><FONT SIZE=3D2 =
FACE=3D"Arial">&nbsp;Check out the</FONT></SPAN><SPAN =
LANG=3D"en-us"></SPAN><SPAN LANG=3D"en-us"> <FONT SIZE=3D2 =
FACE=3D"Arial">source file </FONT></SPAN></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><B><I><FONT SIZE=3D2 =
FACE=3D"Arial">[jeseem@jeseem-linux =
nfx-tree]$</FONT></I></B></SPAN><SPAN =
LANG=3D"en-us"><B><I></I></B></SPAN><SPAN LANG=3D"en-us"><B><I><FONT =
SIZE=3D2 FACE=3D"Arial">p4 edit code/sm-cifs/</FONT></I></B></SPAN><SPAN =
LANG=3D"en-us"><B><I></I></B></SPAN><SPAN LANG=3D"en-us"><B><I><FONT =
SIZE=3D2 FACE=3D"Arial">cifs-ntlmv2.c</FONT></I></B></SPAN><SPAN =
LANG=3D"en-us"><B><I></I></B></SPAN><SPAN =
LANG=3D"en-us"><B><I></I></B></SPAN></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><B><U><FONT SIZE=3D2 =
FACE=3D"Arial">Step 4:</FONT></U></B></SPAN><SPAN =
LANG=3D"en-us"><B></B></SPAN><SPAN =
LANG=3D"en-us"><B><U></U></B></SPAN></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><FONT SIZE=3D2 FACE=3D"Arial">Apply =
the patch</FONT></SPAN><SPAN LANG=3D"en-us"></SPAN><SPAN LANG=3D"en-us"> =
<FONT SIZE=3D2 FACE=3D"Arial">in the new P4CLIENT</FONT></SPAN><SPAN =
LANG=3D"en-us"></SPAN><SPAN LANG=3D"en-us"></SPAN></P>

<P ALIGN=3DLEFT><SPAN LANG=3D"en-us"><B><I><FONT SIZE=3D2 =
FACE=3D"Arial">[jeseem@jeseem-linux =
nfx-tree]$</FONT></I></B></SPAN><SPAN =
LANG=3D"en-us"><B><I></I></B></SPAN><SPAN LANG=3D"en-us"><B><I><FONT =
SIZE=3D2 FACE=3D"Arial"> patch</FONT></I></B></SPAN><SPAN =
LANG=3D"en-us"><B><I></I></B></SPAN><SPAN LANG=3D"en-us"><B><I> <FONT =
SIZE=3D2 FACE=3D"Arial">&#8211;</FONT></I></B></SPAN><SPAN =
LANG=3D"en-us"><B><I></I></B></SPAN><SPAN LANG=3D"en-us"><B><I><FONT =
SIZE=3D2 FACE=3D"Arial">p1 &lt;</FONT></I></B></SPAN><SPAN =
LANG=3D"en-us"><B><I></I></B></SPAN><SPAN LANG=3D"en-us"><B><I> <FONT =
SIZE=3D2 FACE=3D"Arial">/tmp/cifs-ntlmv2.diff</FONT></I></B></SPAN></P>

</BODY>
</HTML>
------_=_NextPart_001_01C75150.2FDE40F6--
