Author: vlendec Date: 2007-07-30 11:35:39 +0000 (Mon, 30 Jul 2007) New Revision: 24084
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24084 Log: Convert reply_mkdir to the new API Modified: branches/SAMBA_3_2/source/smbd/process.c branches/SAMBA_3_2/source/smbd/reply.c Changeset: Modified: branches/SAMBA_3_2/source/smbd/process.c =================================================================== --- branches/SAMBA_3_2/source/smbd/process.c 2007-07-30 10:43:50 UTC (rev 24083) +++ branches/SAMBA_3_2/source/smbd/process.c 2007-07-30 11:35:39 UTC (rev 24084) @@ -634,7 +634,7 @@ int flags; } smb_messages[256] = { -/* 0x00 */ { "SMBmkdir",reply_mkdir,NULL,AS_USER | NEED_WRITE}, +/* 0x00 */ { "SMBmkdir",NULL,reply_mkdir,AS_USER | NEED_WRITE}, /* 0x01 */ { "SMBrmdir",reply_rmdir,NULL,AS_USER | NEED_WRITE}, /* 0x02 */ { "SMBopen",reply_open,NULL,AS_USER }, /* 0x03 */ { "SMBcreate",reply_mknew,NULL,AS_USER}, Modified: branches/SAMBA_3_2/source/smbd/reply.c =================================================================== --- branches/SAMBA_3_2/source/smbd/reply.c 2007-07-30 10:43:50 UTC (rev 24083) +++ branches/SAMBA_3_2/source/smbd/reply.c 2007-07-30 11:35:39 UTC (rev 24084) @@ -3952,42 +3952,50 @@ Reply to a mkdir. ****************************************************************************/ -int reply_mkdir(connection_struct *conn, char *inbuf,char *outbuf, int dum_size, int dum_buffsize) +void reply_mkdir(connection_struct *conn, struct smb_request *req) { pstring directory; - int outsize; NTSTATUS status; SMB_STRUCT_STAT sbuf; START_PROFILE(SMBmkdir); - srvstr_get_path(inbuf, SVAL(inbuf,smb_flg2), directory, - smb_buf(inbuf) + 1, sizeof(directory), 0, + srvstr_get_path((char *)req->inbuf, req->flags2, directory, + smb_buf(req->inbuf) + 1, sizeof(directory), 0, STR_TERMINATE, &status); if (!NT_STATUS_IS_OK(status)) { + reply_nterror(req, status); END_PROFILE(SMBmkdir); - return ERROR_NT(status); + return; } - status = resolve_dfspath(conn, SVAL(inbuf,smb_flg2) & FLAGS2_DFS_PATHNAMES, directory); + status = resolve_dfspath(conn, + req->flags2 & FLAGS2_DFS_PATHNAMES, + directory); if (!NT_STATUS_IS_OK(status)) { - END_PROFILE(SMBmkdir); if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) { - return ERROR_BOTH(NT_STATUS_PATH_NOT_COVERED, ERRSRV, ERRbadpath); + reply_botherror(req, NT_STATUS_PATH_NOT_COVERED, + ERRSRV, ERRbadpath); + END_PROFILE(SMBmkdir); + return; } - return ERROR_NT(status); + reply_nterror(req, status); + END_PROFILE(SMBmkdir); + return; } status = unix_convert(conn, directory, False, NULL, &sbuf); if (!NT_STATUS_IS_OK(status)) { + reply_nterror(req, status); END_PROFILE(SMBmkdir); - return ERROR_NT(status); + return; } status = check_name(conn, directory); if (!NT_STATUS_IS_OK(status)) { + reply_nterror(req, status); END_PROFILE(SMBmkdir); - return ERROR_NT(status); + return; } status = create_directory(conn, directory); @@ -4007,16 +4015,17 @@ status = NT_STATUS_DOS(ERRDOS, ERRnoaccess); } + reply_nterror(req, status); END_PROFILE(SMBmkdir); - return ERROR_NT(status); + return; } - outsize = set_message(inbuf,outbuf,0,0,False); + reply_outbuf(req, 0, 0); - DEBUG( 3, ( "mkdir %s ret=%d\n", directory, outsize ) ); + DEBUG( 3, ( "mkdir %s\n", directory ) ); END_PROFILE(SMBmkdir); - return(outsize); + return; } /****************************************************************************
