r24086: Convert reply_ulogoffX to the new API

diff --git a/source/smbd/process.c b/source/smbd/process.c
index dafea5ed2f5a941ca526531cf64082d41ee94a1a..70276293f8e61c9873eedc776b20f59871b9ca13 100644 (file)
--- a/source/smbd/process.c
+++ b/source/smbd/process.c
@@ -750,7 +750,7 @@ static const struct smb_message_struct {
 /* 0x71 */ { "SMBtdis",NULL,reply_tdis,DO_CHDIR},
 /* 0x72 */ { "SMBnegprot",NULL,reply_negprot,0},
 /* 0x73 */ { "SMBsesssetupX",NULL,reply_sesssetup_and_X,0},
-/* 0x74 */ { "SMBulogoffX", reply_ulogoffX,NULL, 0}, /* ulogoff doesn't give a valid TID */
+/* 0x74 */ { "SMBulogoffX", NULL,reply_ulogoffX, 0}, /* ulogoff doesn't give a valid TID */
 /* 0x75 */ { "SMBtconX",NULL,reply_tcon_and_X,0},
 /* 0x76 */ { NULL, NULL, NULL, 0 },
 /* 0x77 */ { NULL, NULL, NULL, 0 },

diff --git a/source/smbd/reply.c b/source/smbd/reply.c
index 64e63abdf185df247d729c6f84318e86141b428e..90f713a9484ebf06b09131144be1fc707a21d1e8 100644 (file)
--- a/source/smbd/reply.c
+++ b/source/smbd/reply.c
@@ -1669,28 +1669,33 @@ void reply_open_and_X(connection_struct *conn, struct smb_request *req)
  conn POINTER CAN BE NULL HERE !
 ****************************************************************************/
 
-int reply_ulogoffX(connection_struct *conn, char *inbuf,char *outbuf,int length,int bufsize)
+void reply_ulogoffX(connection_struct *conn, struct smb_request *req)
 {
-       uint16 vuid = SVAL(inbuf,smb_uid);
-       user_struct *vuser = get_valid_user_struct(vuid);
+       user_struct *vuser;
+
        START_PROFILE(SMBulogoffX);
 
-       if(vuser == 0)
-               DEBUG(3,("ulogoff, vuser id %d does not map to user.\n", vuid));
+       vuser = get_valid_user_struct(req->vuid);
+
+       if(vuser == NULL) {
+               DEBUG(3,("ulogoff, vuser id %d does not map to user.\n",
+                        req->vuid));
+       }
 
        /* in user level security we are supposed to close any files
                open by this user */
-       if ((vuser != 0) && (lp_security() != SEC_SHARE))
-               file_close_user(vuid);
+       if ((vuser != NULL) && (lp_security() != SEC_SHARE)) {
+               file_close_user(req->vuid);
+       }
 
-       invalidate_vuid(vuid);
+       invalidate_vuid(req->vuid);
 
-       set_message(inbuf,outbuf,2,0,True);
+       reply_outbuf(req, 2, 0);
 
-       DEBUG( 3, ( "ulogoffX vuid=%d\n", vuid ) );
+       DEBUG( 3, ( "ulogoffX vuid=%d\n", req->vuid ) );
 
        END_PROFILE(SMBulogoffX);
-       return chain_reply(inbuf,&outbuf,length,bufsize);
+       chain_reply_new(req);
 }
 
 /****************************************************************************