diff options
| -rw-r--r-- | source4/smb_server/smb/negprot.c | 2 | ||||
| -rw-r--r-- | source4/smb_server/smb/nttrans.c | 4 | ||||
| -rw-r--r-- | source4/smb_server/smb/receive.c | 152 | ||||
| -rw-r--r-- | source4/smb_server/smb/reply.c | 114 | ||||
| -rw-r--r-- | source4/smb_server/smb/search.c | 4 | ||||
| -rw-r--r-- | source4/smb_server/smb/trans2.c | 9 |
6 files changed, 142 insertions, 143 deletions
diff --git a/source4/smb_server/smb/negprot.c b/source4/smb_server/smb/negprot.c index 61be84ca18..c8cd826c75 100644 --- a/source4/smb_server/smb/negprot.c +++ b/source4/smb_server/smb/negprot.c @@ -471,7 +471,7 @@ static const struct { Reply to a negprot. ****************************************************************************/ -void reply_negprot(struct smbsrv_request *req) +void smbsrv_reply_negprot(struct smbsrv_request *req) { int protocol; uint8_t *p; diff --git a/source4/smb_server/smb/nttrans.c b/source4/smb_server/smb/nttrans.c index 51369b0636..d1476e3601 100644 --- a/source4/smb_server/smb/nttrans.c +++ b/source4/smb_server/smb/nttrans.c @@ -349,7 +349,7 @@ static NTSTATUS nttrans_backend(struct smbsrv_request *req, /**************************************************************************** Reply to an SMBnttrans request ****************************************************************************/ -void reply_nttrans(struct smbsrv_request *req) +void smbsrv_reply_nttrans(struct smbsrv_request *req) { struct smb_nttrans trans; int i; @@ -513,7 +513,7 @@ void reply_nttrans(struct smbsrv_request *req) /**************************************************************************** Reply to an SMBnttranss request ****************************************************************************/ -void reply_nttranss(struct smbsrv_request *req) +void smbsrv_reply_nttranss(struct smbsrv_request *req) { req_reply_error(req, NT_STATUS_FOOBAR); } diff --git a/source4/smb_server/smb/receive.c b/source4/smb_server/smb/receive.c index 294d291300..1dc65fd5b5 100644 --- a/source4/smb_server/smb/receive.c +++ b/source4/smb_server/smb/receive.c @@ -82,7 +82,7 @@ NTSTATUS smbsrv_recv_smb_request(void *private, DATA_BLOB blob) req->in.size = blob.length; req->request_time = timeval_current(); - reply_special(req); + smbsrv_reply_special(req); return NT_STATUS_OK; } @@ -173,60 +173,60 @@ static const struct smb_message_struct int flags; } smb_messages[256] = { -/* 0x00 */ { "SMBmkdir",reply_mkdir,AS_USER}, -/* 0x01 */ { "SMBrmdir",reply_rmdir,AS_USER}, -/* 0x02 */ { "SMBopen",reply_open,AS_USER}, -/* 0x03 */ { "SMBcreate",reply_mknew,AS_USER}, -/* 0x04 */ { "SMBclose",reply_close,AS_USER}, -/* 0x05 */ { "SMBflush",reply_flush,AS_USER}, -/* 0x06 */ { "SMBunlink",reply_unlink,AS_USER}, -/* 0x07 */ { "SMBmv",reply_mv,AS_USER}, -/* 0x08 */ { "SMBgetatr",reply_getatr,AS_USER}, -/* 0x09 */ { "SMBsetatr",reply_setatr,AS_USER}, -/* 0x0a */ { "SMBread",reply_read,AS_USER}, -/* 0x0b */ { "SMBwrite",reply_write,AS_USER}, -/* 0x0c */ { "SMBlock",reply_lock,AS_USER}, -/* 0x0d */ { "SMBunlock",reply_unlock,AS_USER}, -/* 0x0e */ { "SMBctemp",reply_ctemp,AS_USER }, -/* 0x0f */ { "SMBmknew",reply_mknew,AS_USER}, -/* 0x10 */ { "SMBchkpth",reply_chkpth,AS_USER}, -/* 0x11 */ { "SMBexit",reply_exit,0}, -/* 0x12 */ { "SMBlseek",reply_lseek,AS_USER}, -/* 0x13 */ { "SMBlockread",reply_lockread,AS_USER}, -/* 0x14 */ { "SMBwriteunlock",reply_writeunlock,AS_USER}, +/* 0x00 */ { "SMBmkdir", smbsrv_reply_mkdir, AS_USER }, +/* 0x01 */ { "SMBrmdir", smbsrv_reply_rmdir, AS_USER }, +/* 0x02 */ { "SMBopen", smbsrv_reply_open, AS_USER }, +/* 0x03 */ { "SMBcreate", smbsrv_reply_mknew, AS_USER }, +/* 0x04 */ { "SMBclose", smbsrv_reply_close, AS_USER }, +/* 0x05 */ { "SMBflush", smbsrv_reply_flush, AS_USER }, +/* 0x06 */ { "SMBunlink", smbsrv_reply_unlink, AS_USER }, +/* 0x07 */ { "SMBmv", smbsrv_reply_mv, AS_USER }, +/* 0x08 */ { "SMBgetatr", smbsrv_reply_getatr, AS_USER }, +/* 0x09 */ { "SMBsetatr", smbsrv_reply_setatr, AS_USER }, +/* 0x0a */ { "SMBread", smbsrv_reply_read, AS_USER }, +/* 0x0b */ { "SMBwrite", smbsrv_reply_write, AS_USER }, +/* 0x0c */ { "SMBlock", smbsrv_reply_lock, AS_USER }, +/* 0x0d */ { "SMBunlock", smbsrv_reply_unlock, AS_USER }, +/* 0x0e */ { "SMBctemp", smbsrv_reply_ctemp, AS_USER }, +/* 0x0f */ { "SMBmknew", smbsrv_reply_mknew, AS_USER }, +/* 0x10 */ { "SMBchkpth", smbsrv_reply_chkpth, AS_USER }, +/* 0x11 */ { "SMBexit", smbsrv_reply_exit, 0 }, +/* 0x12 */ { "SMBlseek", smbsrv_reply_lseek, AS_USER }, +/* 0x13 */ { "SMBlockread", smbsrv_reply_lockread, AS_USER }, +/* 0x14 */ { "SMBwriteunlock", smbsrv_reply_writeunlock,AS_USER }, /* 0x15 */ { NULL, NULL, 0 }, /* 0x16 */ { NULL, NULL, 0 }, /* 0x17 */ { NULL, NULL, 0 }, /* 0x18 */ { NULL, NULL, 0 }, /* 0x19 */ { NULL, NULL, 0 }, -/* 0x1a */ { "SMBreadbraw",reply_readbraw,AS_USER}, -/* 0x1b */ { "SMBreadBmpx",reply_readbmpx,AS_USER}, -/* 0x1c */ { "SMBreadBs",NULL,0 }, -/* 0x1d */ { "SMBwritebraw",reply_writebraw,AS_USER}, -/* 0x1e */ { "SMBwriteBmpx",reply_writebmpx,AS_USER}, -/* 0x1f */ { "SMBwriteBs",reply_writebs,AS_USER}, -/* 0x20 */ { "SMBwritec",NULL,0}, +/* 0x1a */ { "SMBreadbraw", smbsrv_reply_readbraw, AS_USER }, +/* 0x1b */ { "SMBreadBmpx", smbsrv_reply_readbmpx, AS_USER }, +/* 0x1c */ { "SMBreadBs", NULL, 0 }, +/* 0x1d */ { "SMBwritebraw", smbsrv_reply_writebraw, AS_USER }, +/* 0x1e */ { "SMBwriteBmpx", smbsrv_reply_writebmpx, AS_USER }, +/* 0x1f */ { "SMBwriteBs", smbsrv_reply_writebs, AS_USER }, +/* 0x20 */ { "SMBwritec", NULL, 0 }, /* 0x21 */ { NULL, NULL, 0 }, -/* 0x22 */ { "SMBsetattrE",reply_setattrE,AS_USER}, -/* 0x23 */ { "SMBgetattrE",reply_getattrE,AS_USER}, -/* 0x24 */ { "SMBlockingX",reply_lockingX,AS_USER}, -/* 0x25 */ { "SMBtrans",reply_trans,AS_USER}, -/* 0x26 */ { "SMBtranss",reply_transs,AS_USER}, -/* 0x27 */ { "SMBioctl",reply_ioctl,AS_USER}, -/* 0x28 */ { "SMBioctls",NULL,AS_USER}, -/* 0x29 */ { "SMBcopy",reply_copy,AS_USER}, -/* 0x2a */ { "SMBmove",NULL,AS_USER}, -/* 0x2b */ { "SMBecho",reply_echo,0}, -/* 0x2c */ { "SMBwriteclose",reply_writeclose,AS_USER}, -/* 0x2d */ { "SMBopenX",reply_open_and_X,AS_USER}, -/* 0x2e */ { "SMBreadX",reply_read_and_X,AS_USER}, -/* 0x2f */ { "SMBwriteX",reply_write_and_X,AS_USER}, +/* 0x22 */ { "SMBsetattrE", smbsrv_reply_setattrE, AS_USER }, +/* 0x23 */ { "SMBgetattrE", smbsrv_reply_getattrE, AS_USER }, +/* 0x24 */ { "SMBlockingX", smbsrv_reply_lockingX, AS_USER }, +/* 0x25 */ { "SMBtrans", smbsrv_reply_trans, AS_USER }, +/* 0x26 */ { "SMBtranss", smbsrv_reply_transs, AS_USER }, +/* 0x27 */ { "SMBioctl", smbsrv_reply_ioctl, AS_USER }, +/* 0x28 */ { "SMBioctls", NULL, AS_USER }, +/* 0x29 */ { "SMBcopy", smbsrv_reply_copy, AS_USER }, +/* 0x2a */ { "SMBmove", NULL, AS_USER }, +/* 0x2b */ { "SMBecho", smbsrv_reply_echo, 0 }, +/* 0x2c */ { "SMBwriteclose", smbsrv_reply_writeclose,AS_USER }, +/* 0x2d */ { "SMBopenX", smbsrv_reply_open_and_X,AS_USER }, +/* 0x2e */ { "SMBreadX", smbsrv_reply_read_and_X,AS_USER }, +/* 0x2f */ { "SMBwriteX", smbsrv_reply_write_and_X,AS_USER}, /* 0x30 */ { NULL, NULL, 0 }, /* 0x31 */ { NULL, NULL, 0 }, -/* 0x32 */ { "SMBtrans2", reply_trans2, AS_USER}, -/* 0x33 */ { "SMBtranss2", reply_transs2, AS_USER}, -/* 0x34 */ { "SMBfindclose", reply_findclose,AS_USER}, -/* 0x35 */ { "SMBfindnclose", reply_findnclose, AS_USER}, +/* 0x32 */ { "SMBtrans2", smbsrv_reply_trans2, AS_USER }, +/* 0x33 */ { "SMBtranss2", smbsrv_reply_transs2, AS_USER }, +/* 0x34 */ { "SMBfindclose", smbsrv_reply_findclose, AS_USER }, +/* 0x35 */ { "SMBfindnclose", smbsrv_reply_findnclose,AS_USER }, /* 0x36 */ { NULL, NULL, 0 }, /* 0x37 */ { NULL, NULL, 0 }, /* 0x38 */ { NULL, NULL, 0 }, @@ -285,12 +285,12 @@ static const struct smb_message_struct /* 0x6d */ { NULL, NULL, 0 }, /* 0x6e */ { NULL, NULL, 0 }, /* 0x6f */ { NULL, NULL, 0 }, -/* 0x70 */ { "SMBtcon",reply_tcon,0}, -/* 0x71 */ { "SMBtdis",reply_tdis,0}, -/* 0x72 */ { "SMBnegprot",reply_negprot,0}, -/* 0x73 */ { "SMBsesssetupX",reply_sesssetup,0}, -/* 0x74 */ { "SMBulogoffX", reply_ulogoffX, 0}, /* ulogoff doesn't give a valid TID */ -/* 0x75 */ { "SMBtconX",reply_tcon_and_X,0}, +/* 0x70 */ { "SMBtcon", smbsrv_reply_tcon, 0 }, +/* 0x71 */ { "SMBtdis", smbsrv_reply_tdis, 0 }, +/* 0x72 */ { "SMBnegprot", smbsrv_reply_negprot, 0 }, +/* 0x73 */ { "SMBsesssetupX", smbsrv_reply_sesssetup, 0 }, +/* 0x74 */ { "SMBulogoffX", smbsrv_reply_ulogoffX, 0 }, /* ulogoff doesn't give a valid TID */ +/* 0x75 */ { "SMBtconX", smbsrv_reply_tcon_and_X,0 }, /* 0x76 */ { NULL, NULL, 0 }, /* 0x77 */ { NULL, NULL, 0 }, /* 0x78 */ { NULL, NULL, 0 }, @@ -301,11 +301,11 @@ static const struct smb_message_struct /* 0x7d */ { NULL, NULL, 0 }, /* 0x7e */ { NULL, NULL, 0 }, /* 0x7f */ { NULL, NULL, 0 }, -/* 0x80 */ { "SMBdskattr",reply_dskattr,AS_USER}, -/* 0x81 */ { "SMBsearch",reply_search,AS_USER}, -/* 0x82 */ { "SMBffirst",reply_search,AS_USER}, -/* 0x83 */ { "SMBfunique",reply_search,AS_USER}, -/* 0x84 */ { "SMBfclose",reply_fclose,AS_USER}, +/* 0x80 */ { "SMBdskattr", smbsrv_reply_dskattr, AS_USER }, +/* 0x81 */ { "SMBsearch", smbsrv_reply_search, AS_USER }, +/* 0x82 */ { "SMBffirst", smbsrv_reply_search, AS_USER }, +/* 0x83 */ { "SMBfunique", smbsrv_reply_search, AS_USER }, +/* 0x84 */ { "SMBfclose", smbsrv_reply_fclose, AS_USER }, /* 0x85 */ { NULL, NULL, 0 }, /* 0x86 */ { NULL, NULL, 0 }, /* 0x87 */ { NULL, NULL, 0 }, @@ -333,12 +333,12 @@ static const struct smb_message_struct /* 0x9d */ { NULL, NULL, 0 }, /* 0x9e */ { NULL, NULL, 0 }, /* 0x9f */ { NULL, NULL, 0 }, -/* 0xa0 */ { "SMBnttrans", reply_nttrans, AS_USER}, -/* 0xa1 */ { "SMBnttranss", reply_nttranss, AS_USER}, -/* 0xa2 */ { "SMBntcreateX", reply_ntcreate_and_X, AS_USER}, +/* 0xa0 */ { "SMBnttrans", smbsrv_reply_nttrans, AS_USER }, +/* 0xa1 */ { "SMBnttranss", smbsrv_reply_nttranss, AS_USER}, +/* 0xa2 */ { "SMBntcreateX", smbsrv_reply_ntcreate_and_X, AS_USER }, /* 0xa3 */ { NULL, NULL, 0 }, -/* 0xa4 */ { "SMBntcancel", reply_ntcancel, AS_USER|SIGNING_NO_REPLY}, -/* 0xa5 */ { "SMBntrename", reply_ntrename, AS_USER}, +/* 0xa4 */ { "SMBntcancel", smbsrv_reply_ntcancel, AS_USER | SIGNING_NO_REPLY }, +/* 0xa5 */ { "SMBntrename", smbsrv_reply_ntrename, AS_USER }, /* 0xa6 */ { NULL, NULL, 0 }, /* 0xa7 */ { NULL, NULL, 0 }, /* 0xa8 */ { NULL, NULL, 0 }, @@ -365,10 +365,10 @@ static const struct smb_message_struct /* 0xbd */ { NULL, NULL, 0 }, /* 0xbe */ { NULL, NULL, 0 }, /* 0xbf */ { NULL, NULL, 0 }, -/* 0xc0 */ { "SMBsplopen",reply_printopen,AS_USER }, -/* 0xc1 */ { "SMBsplwr",reply_printwrite,AS_USER}, -/* 0xc2 */ { "SMBsplclose",reply_printclose,AS_USER}, -/* 0xc3 */ { "SMBsplretq",reply_printqueue,AS_USER}, +/* 0xc0 */ { "SMBsplopen", smbsrv_reply_printopen, AS_USER }, +/* 0xc1 */ { "SMBsplwr", smbsrv_reply_printwrite, AS_USER }, +/* 0xc2 */ { "SMBsplclose", smbsrv_reply_printclose, AS_USER }, +/* 0xc3 */ { "SMBsplretq", smbsrv_reply_printqueue, AS_USER }, /* 0xc4 */ { NULL, NULL, 0 }, /* 0xc5 */ { NULL, NULL, 0 }, /* 0xc6 */ { NULL, NULL, 0 }, @@ -381,14 +381,14 @@ static const struct smb_message_struct /* 0xcd */ { NULL, NULL, 0 }, /* 0xce */ { NULL, NULL, 0 }, /* 0xcf */ { NULL, NULL, 0 }, -/* 0xd0 */ { "SMBsends",reply_sends,0}, -/* 0xd1 */ { "SMBsendb",NULL,0}, -/* 0xd2 */ { "SMBfwdname",NULL,0}, -/* 0xd3 */ { "SMBcancelf",NULL,0}, -/* 0xd4 */ { "SMBgetmac",NULL,0}, -/* 0xd5 */ { "SMBsendstrt",reply_sendstrt,0}, -/* 0xd6 */ { "SMBsendend",reply_sendend,0}, -/* 0xd7 */ { "SMBsendtxt",reply_sendtxt,0}, +/* 0xd0 */ { "SMBsends", smbsrv_reply_sends, 0 }, +/* 0xd1 */ { "SMBsendb", NULL, 0 }, +/* 0xd2 */ { "SMBfwdname", NULL, 0 }, +/* 0xd3 */ { "SMBcancelf", NULL, 0 }, +/* 0xd4 */ { "SMBgetmac", NULL, 0 }, +/* 0xd5 */ { "SMBsendstrt", smbsrv_reply_sendstrt, 0 }, +/* 0xd6 */ { "SMBsendend", smbsrv_reply_sendend, 0 }, +/* 0xd7 */ { "SMBsendtxt", smbsrv_reply_sendtxt, 0 }, /* 0xd8 */ { NULL, NULL, 0 }, /* 0xd9 */ { NULL, NULL, 0 }, /* 0xda */ { NULL, NULL, 0 }, @@ -464,7 +464,7 @@ static void switch_message(int type, struct smbsrv_request *req) if (smb_messages[type].fn == NULL) { DEBUG(0,("Unknown message type %d!\n",type)); - reply_unknown(req); + smbsrv_reply_unknown(req); return; } diff --git a/source4/smb_server/smb/reply.c b/source4/smb_server/smb/reply.c index 5e1f707aad..cbfd3fac98 100644 --- a/source4/smb_server/smb/reply.c +++ b/source4/smb_server/smb/reply.c @@ -80,7 +80,7 @@ static void reply_simple_send(struct smbsrv_request *req) /**************************************************************************** Reply to a tcon. ****************************************************************************/ -void reply_tcon(struct smbsrv_request *req) +void smbsrv_reply_tcon(struct smbsrv_request *req) { union smb_tcon con; NTSTATUS status; @@ -123,7 +123,7 @@ void reply_tcon(struct smbsrv_request *req) /**************************************************************************** Reply to a tcon and X. ****************************************************************************/ -void reply_tcon_and_X(struct smbsrv_request *req) +void smbsrv_reply_tcon_and_X(struct smbsrv_request *req) { NTSTATUS status; union smb_tcon con; @@ -192,7 +192,7 @@ void reply_tcon_and_X(struct smbsrv_request *req) /**************************************************************************** Reply to an unknown request ****************************************************************************/ -void reply_unknown(struct smbsrv_request *req) +void smbsrv_reply_unknown(struct smbsrv_request *req) { int type; @@ -227,7 +227,7 @@ static void reply_ioctl_send(struct smbsrv_request *req) /**************************************************************************** Reply to an ioctl. ****************************************************************************/ -void reply_ioctl(struct smbsrv_request *req) +void smbsrv_reply_ioctl(struct smbsrv_request *req) { union smb_ioctl *io; @@ -253,7 +253,7 @@ void reply_ioctl(struct smbsrv_request *req) /**************************************************************************** Reply to a chkpth. ****************************************************************************/ -void reply_chkpth(struct smbsrv_request *req) +void smbsrv_reply_chkpth(struct smbsrv_request *req) { struct smb_chkpath *io; @@ -294,7 +294,7 @@ static void reply_getatr_send(struct smbsrv_request *req) /**************************************************************************** Reply to a getatr. ****************************************************************************/ -void reply_getatr(struct smbsrv_request *req) +void smbsrv_reply_getatr(struct smbsrv_request *req) { union smb_fileinfo *st; @@ -323,7 +323,7 @@ void reply_getatr(struct smbsrv_request *req) /**************************************************************************** Reply to a setatr. ****************************************************************************/ -void reply_setatr(struct smbsrv_request *req) +void smbsrv_reply_setatr(struct smbsrv_request *req) { union smb_setfileinfo *st; @@ -378,7 +378,7 @@ static void reply_dskattr_send(struct smbsrv_request *req) /**************************************************************************** Reply to a dskattr. ****************************************************************************/ -void reply_dskattr(struct smbsrv_request *req) +void smbsrv_reply_dskattr(struct smbsrv_request *req) { union smb_fsinfo *fs; @@ -422,7 +422,7 @@ static void reply_open_send(struct smbsrv_request *req) /**************************************************************************** Reply to an open. ****************************************************************************/ -void reply_open(struct smbsrv_request *req) +void smbsrv_reply_open(struct smbsrv_request *req) { union smb_open *oi; @@ -494,7 +494,7 @@ static void reply_open_and_X_send(struct smbsrv_request *req) /**************************************************************************** Reply to an open and X. ****************************************************************************/ -void reply_open_and_X(struct smbsrv_request *req) +void smbsrv_reply_open_and_X(struct smbsrv_request *req) { union smb_open *oi; @@ -551,7 +551,7 @@ static void reply_mknew_send(struct smbsrv_request *req) /**************************************************************************** Reply to a mknew or a create. ****************************************************************************/ -void reply_mknew(struct smbsrv_request *req) +void smbsrv_reply_mknew(struct smbsrv_request *req) { union smb_open *oi; @@ -607,7 +607,7 @@ static void reply_ctemp_send(struct smbsrv_request *req) /**************************************************************************** Reply to a create temporary file. ****************************************************************************/ -void reply_ctemp(struct smbsrv_request *req) +void smbsrv_reply_ctemp(struct smbsrv_request *req) { union smb_open *oi; @@ -642,7 +642,7 @@ void reply_ctemp(struct smbsrv_request *req) /**************************************************************************** Reply to a unlink ****************************************************************************/ -void reply_unlink(struct smbsrv_request *req) +void smbsrv_reply_unlink(struct smbsrv_request *req) { struct smb_unlink *unl; @@ -670,7 +670,7 @@ void reply_unlink(struct smbsrv_request *req) only the 4 byte NBT header This command must be replied to synchronously ****************************************************************************/ -void reply_readbraw(struct smbsrv_request *req) +void smbsrv_reply_readbraw(struct smbsrv_request *req) { NTSTATUS status; union smb_read io; @@ -757,7 +757,7 @@ static void reply_lockread_send(struct smbsrv_request *req) Reply to a lockread (core+ protocol). note that the lock is a write lock, not a read lock! ****************************************************************************/ -void reply_lockread(struct smbsrv_request *req) +void smbsrv_reply_lockread(struct smbsrv_request *req) { union smb_read *io; @@ -816,7 +816,7 @@ static void reply_read_send(struct smbsrv_request *req) /**************************************************************************** Reply to a read. ****************************************************************************/ -void reply_read(struct smbsrv_request *req) +void smbsrv_reply_read(struct smbsrv_request *req) { union smb_read *io; @@ -883,7 +883,7 @@ static void reply_read_and_X_send(struct smbsrv_request *req) /**************************************************************************** Reply to a read and X. ****************************************************************************/ -void reply_read_and_X(struct smbsrv_request *req) +void smbsrv_reply_read_and_X(struct smbsrv_request *req) { union smb_read *io; @@ -939,7 +939,7 @@ void reply_read_and_X(struct smbsrv_request *req) /**************************************************************************** Reply to a writebraw (core+ or LANMAN1.0 protocol). ****************************************************************************/ -void reply_writebraw(struct smbsrv_request *req) +void smbsrv_reply_writebraw(struct smbsrv_request *req) { req_reply_dos_error(req, ERRSRV, ERRuseSTD); } @@ -965,7 +965,7 @@ static void reply_writeunlock_send(struct smbsrv_request *req) /**************************************************************************** Reply to a writeunlock (core+). ****************************************************************************/ -void reply_writeunlock(struct smbsrv_request *req) +void smbsrv_reply_writeunlock(struct smbsrv_request *req) { union smb_write *io; @@ -1023,7 +1023,7 @@ static void reply_write_send(struct smbsrv_request *req) /**************************************************************************** Reply to a write ****************************************************************************/ -void reply_write(struct smbsrv_request *req) +void smbsrv_reply_write(struct smbsrv_request *req) { union smb_write *io; @@ -1085,7 +1085,7 @@ static void reply_write_and_X_send(struct smbsrv_request *req) /**************************************************************************** Reply to a write and X. ****************************************************************************/ -void reply_write_and_X(struct smbsrv_request *req) +void smbsrv_reply_write_and_X(struct smbsrv_request *req) { union smb_write *io; @@ -1147,7 +1147,7 @@ static void reply_lseek_send(struct smbsrv_request *req) /**************************************************************************** Reply to a lseek. ****************************************************************************/ -void reply_lseek(struct smbsrv_request *req) +void smbsrv_reply_lseek(struct smbsrv_request *req) { struct smb_seek *io; @@ -1171,7 +1171,7 @@ void reply_lseek(struct smbsrv_request *req) /**************************************************************************** Reply to a flush. ****************************************************************************/ -void reply_flush(struct smbsrv_request *req) +void smbsrv_reply_flush(struct smbsrv_request *req) { struct smb_flush *io; @@ -1194,7 +1194,7 @@ void reply_flush(struct smbsrv_request *req) /**************************************************************************** Reply to a exit. This closes all files open by a smbpid ****************************************************************************/ -void reply_exit(struct smbsrv_request *req) +void smbsrv_reply_exit(struct smbsrv_request *req) { NTSTATUS status; struct smbsrv_tcon *tcon; @@ -1220,7 +1220,7 @@ void reply_exit(struct smbsrv_request *req) Note that this has to deal with closing a directory opened by NT SMB's. ****************************************************************************/ -void reply_close(struct smbsrv_request *req) +void smbsrv_reply_close(struct smbsrv_request *req) { union smb_close *io; @@ -1263,7 +1263,7 @@ static void reply_writeclose_send(struct smbsrv_request *req) /**************************************************************************** Reply to a writeclose (Core+ protocol). ****************************************************************************/ -void reply_writeclose(struct smbsrv_request *req) +void smbsrv_reply_writeclose(struct smbsrv_request *req) { union smb_write *io; @@ -1300,7 +1300,7 @@ void reply_writeclose(struct smbsrv_request *req) /**************************************************************************** Reply to a lock. ****************************************************************************/ -void reply_lock(struct smbsrv_request *req) +void smbsrv_reply_lock(struct smbsrv_request *req) { union smb_lock *lck; @@ -1326,7 +1326,7 @@ void reply_lock(struct smbsrv_request *req) /**************************************************************************** Reply to a unlock. ****************************************************************************/ -void reply_unlock(struct smbsrv_request *req) +void smbsrv_reply_unlock(struct smbsrv_request *req) { union smb_lock *lck; @@ -1352,7 +1352,7 @@ void reply_unlock(struct smbsrv_request *req) /**************************************************************************** Reply to a tdis. ****************************************************************************/ -void reply_tdis(struct smbsrv_request *req) +void smbsrv_reply_tdis(struct smbsrv_request *req) { REQ_CHECK_WCT(req, 0); @@ -1374,7 +1374,7 @@ void reply_tdis(struct smbsrv_request *req) Reply to a echo. This is one of the few calls that is handled directly (the backends don't see it at all) ****************************************************************************/ -void reply_echo(struct smbsrv_request *req) +void smbsrv_reply_echo(struct smbsrv_request *req) { uint16_t count; int i; @@ -1423,7 +1423,7 @@ static void reply_printopen_send(struct smbsrv_request *req) /**************************************************************************** Reply to a printopen. ****************************************************************************/ -void reply_printopen(struct smbsrv_request *req) +void smbsrv_reply_printopen(struct smbsrv_request *req) { union smb_open *oi; @@ -1450,7 +1450,7 @@ void reply_printopen(struct smbsrv_request *req) /**************************************************************************** Reply to a printclose. ****************************************************************************/ -void reply_printclose(struct smbsrv_request *req) +void smbsrv_reply_printclose(struct smbsrv_request *req) { union smb_close *io; @@ -1473,7 +1473,7 @@ void reply_printclose(struct smbsrv_request *req) /**************************************************************************** Reply to a printqueue. ****************************************************************************/ -void reply_printqueue_send(struct smbsrv_request *req) +static void reply_printqueue_send(struct smbsrv_request *req) { union smb_lpq *lpq = req->async_states->private_data; int i, maxcount; @@ -1518,7 +1518,7 @@ void reply_printqueue_send(struct smbsrv_request *req) /**************************************************************************** Reply to a printqueue. ****************************************************************************/ -void reply_printqueue(struct smbsrv_request *req) +void smbsrv_reply_printqueue(struct smbsrv_request *req) { union smb_lpq *lpq; @@ -1544,7 +1544,7 @@ void reply_printqueue(struct smbsrv_request *req) /**************************************************************************** Reply to a printwrite. ****************************************************************************/ -void reply_printwrite(struct smbsrv_request *req) +void smbsrv_reply_printwrite(struct smbsrv_request *req) { union smb_write *io; @@ -1582,7 +1582,7 @@ void reply_printwrite(struct smbsrv_request *req) /**************************************************************************** Reply to a mkdir. ****************************************************************************/ -void reply_mkdir(struct smbsrv_request *req) +void smbsrv_reply_mkdir(struct smbsrv_request *req) { union smb_mkdir *io; @@ -1606,7 +1606,7 @@ void reply_mkdir(struct smbsrv_request *req) /**************************************************************************** Reply to a rmdir. ****************************************************************************/ -void reply_rmdir(struct smbsrv_request *req) +void smbsrv_reply_rmdir(struct smbsrv_request *req) { struct smb_rmdir *io; @@ -1629,7 +1629,7 @@ void reply_rmdir(struct smbsrv_request *req) /**************************************************************************** Reply to a mv. ****************************************************************************/ -void reply_mv(struct smbsrv_request *req) +void smbsrv_reply_mv(struct smbsrv_request *req) { union smb_rename *io; uint8_t *p; @@ -1663,7 +1663,7 @@ void reply_mv(struct smbsrv_request *req) /**************************************************************************** Reply to an NT rename. ****************************************************************************/ -void reply_ntrename(struct smbsrv_request *req) +void smbsrv_reply_ntrename(struct smbsrv_request *req) { union smb_rename *io; uint8_t *p; @@ -1715,7 +1715,7 @@ static void reply_copy_send(struct smbsrv_request *req) /**************************************************************************** Reply to a file copy. ****************************************************************************/ -void reply_copy(struct smbsrv_request *req) +void smbsrv_reply_copy(struct smbsrv_request *req) { struct smb_copy *cp; uint8_t *p; @@ -1776,7 +1776,7 @@ static void reply_lockingX_send(struct smbsrv_request *req) /**************************************************************************** Reply to a lockingX request. ****************************************************************************/ -void reply_lockingX(struct smbsrv_request *req) +void smbsrv_reply_lockingX(struct smbsrv_request *req) { union smb_lock *lck; uint_t total_locks, i; @@ -1851,7 +1851,7 @@ void reply_lockingX(struct smbsrv_request *req) /**************************************************************************** Reply to a SMBreadbmpx (read block multiplex) request. ****************************************************************************/ -void reply_readbmpx(struct smbsrv_request *req) +void smbsrv_reply_readbmpx(struct smbsrv_request *req) { /* tell the client to not use a multiplexed read - its too broken to use */ req_reply_dos_error(req, ERRSRV, ERRuseSTD); @@ -1861,7 +1861,7 @@ void reply_readbmpx(struct smbsrv_request *req) /**************************************************************************** Reply to a SMBsetattrE. ****************************************************************************/ -void reply_setattrE(struct smbsrv_request *req) +void smbsrv_reply_setattrE(struct smbsrv_request *req) { union smb_setfileinfo *info; @@ -1888,7 +1888,7 @@ void reply_setattrE(struct smbsrv_request *req) /**************************************************************************** Reply to a SMBwritebmpx (write block multiplex primary) request. ****************************************************************************/ -void reply_writebmpx(struct smbsrv_request *req) +void smbsrv_reply_writebmpx(struct smbsrv_request *req) { req_reply_dos_error(req, ERRSRV, ERRuseSTD); } @@ -1897,7 +1897,7 @@ void reply_writebmpx(struct smbsrv_request *req) /**************************************************************************** Reply to a SMBwritebs (write block multiplex secondary) request. ****************************************************************************/ -void reply_writebs(struct smbsrv_request *req) +void smbsrv_reply_writebs(struct smbsrv_request *req) { req_reply_dos_error(req, ERRSRV, ERRuseSTD); } @@ -1929,7 +1929,7 @@ static void reply_getattrE_send(struct smbsrv_request *req) /**************************************************************************** Reply to a SMBgetattrE. ****************************************************************************/ -void reply_getattrE(struct smbsrv_request *req) +void smbsrv_reply_getattrE(struct smbsrv_request *req) { union smb_fileinfo *info; @@ -2145,7 +2145,7 @@ static void reply_sesssetup_spnego(struct smbsrv_request *req) /**************************************************************************** reply to a session setup command ****************************************************************************/ -void reply_sesssetup(struct smbsrv_request *req) +void smbsrv_reply_sesssetup(struct smbsrv_request *req) { switch (req->in.wct) { case 10: @@ -2169,7 +2169,7 @@ void reply_sesssetup(struct smbsrv_request *req) /**************************************************************************** Reply to a SMBulogoffX. ****************************************************************************/ -void reply_ulogoffX(struct smbsrv_request *req) +void smbsrv_reply_ulogoffX(struct smbsrv_request *req) { struct smbsrv_tcon *tcon; NTSTATUS status; @@ -2207,7 +2207,7 @@ void reply_ulogoffX(struct smbsrv_request *req) /**************************************************************************** Reply to an SMBfindclose request ****************************************************************************/ -void reply_findclose(struct smbsrv_request *req) +void smbsrv_reply_findclose(struct smbsrv_request *req) { NTSTATUS status; union smb_search_close io; @@ -2236,7 +2236,7 @@ void reply_findclose(struct smbsrv_request *req) /**************************************************************************** Reply to an SMBfindnclose request ****************************************************************************/ -void reply_findnclose(struct smbsrv_request *req) +void smbsrv_reply_findnclose(struct smbsrv_request *req) { req_reply_error(req, NT_STATUS_FOOBAR); } @@ -2280,7 +2280,7 @@ static void reply_ntcreate_and_X_send(struct smbsrv_request *req) /**************************************************************************** Reply to an SMBntcreateX request ****************************************************************************/ -void reply_ntcreate_and_X(struct smbsrv_request *req) +void smbsrv_reply_ntcreate_and_X(struct smbsrv_request *req) { union smb_open *io; uint16_t fname_len; @@ -2332,7 +2332,7 @@ void reply_ntcreate_and_X(struct smbsrv_request *req) /**************************************************************************** Reply to an SMBntcancel request ****************************************************************************/ -void reply_ntcancel(struct smbsrv_request *req) +void smbsrv_reply_ntcancel(struct smbsrv_request *req) { /* NOTE: this request does not generate a reply */ ntvfs_cancel(req); @@ -2342,7 +2342,7 @@ void reply_ntcancel(struct smbsrv_request *req) /**************************************************************************** Reply to an SMBsends request ****************************************************************************/ -void reply_sends(struct smbsrv_request *req) +void smbsrv_reply_sends(struct smbsrv_request *req) { req_reply_error(req, NT_STATUS_FOOBAR); } @@ -2350,7 +2350,7 @@ void reply_sends(struct smbsrv_request *req) /**************************************************************************** Reply to an SMBsendstrt request ****************************************************************************/ -void reply_sendstrt(struct smbsrv_request *req) +void smbsrv_reply_sendstrt(struct smbsrv_request *req) { req_reply_error(req, NT_STATUS_FOOBAR); } @@ -2358,7 +2358,7 @@ void reply_sendstrt(struct smbsrv_request *req) /**************************************************************************** Reply to an SMBsendend request ****************************************************************************/ -void reply_sendend(struct smbsrv_request *req) +void smbsrv_reply_sendend(struct smbsrv_request *req) { req_reply_error(req, NT_STATUS_FOOBAR); } @@ -2366,7 +2366,7 @@ void reply_sendend(struct smbsrv_request *req) /**************************************************************************** Reply to an SMBsendtxt request ****************************************************************************/ -void reply_sendtxt(struct smbsrv_request *req) +void smbsrv_reply_sendtxt(struct smbsrv_request *req) { req_reply_error(req, NT_STATUS_FOOBAR); } @@ -2413,7 +2413,7 @@ static NTSTATUS parse_session_request(struct smbsrv_request *req) /**************************************************************************** Reply to a special message - a SMB packet with non zero NBT message type ****************************************************************************/ -void reply_special(struct smbsrv_request *req) +void smbsrv_reply_special(struct smbsrv_request *req) { uint8_t msg_type; uint8_t *buf = talloc_zero_array(req, uint8_t, 4); diff --git a/source4/smb_server/smb/search.c b/source4/smb_server/smb/search.c index e214d23e18..10d9a17808 100644 --- a/source4/smb_server/smb/search.c +++ b/source4/smb_server/smb/search.c @@ -106,7 +106,7 @@ static BOOL find_callback(void *private, union smb_search_data *file) /**************************************************************************** Reply to a search. ****************************************************************************/ -void reply_search(struct smbsrv_request *req) +void smbsrv_reply_search(struct smbsrv_request *req) { union smb_search_first *sf; union smb_search_next *sn; @@ -222,7 +222,7 @@ static void reply_fclose_send(struct smbsrv_request *req) /**************************************************************************** Reply to fclose (stop directory search). ****************************************************************************/ -void reply_fclose(struct smbsrv_request *req) +void smbsrv_reply_fclose(struct smbsrv_request *req) { union smb_search_close *sc; uint16_t resume_key_length; diff --git a/source4/smb_server/smb/trans2.c b/source4/smb_server/smb/trans2.c index 9d537b5bbe..992581b8d3 100644 --- a/source4/smb_server/smb/trans2.c +++ b/source4/smb_server/smb/trans2.c @@ -1753,7 +1753,7 @@ failed: /* Reply to an SMBtrans2 */ -void reply_trans2(struct smbsrv_request *req) +void smbsrv_reply_trans2(struct smbsrv_request *req) { reply_trans_generic(req, SMBtrans2); } @@ -1761,7 +1761,7 @@ void reply_trans2(struct smbsrv_request *req) /* Reply to an SMBtrans */ -void reply_trans(struct smbsrv_request *req) +void smbsrv_reply_trans(struct smbsrv_request *req) { reply_trans_generic(req, SMBtrans); } @@ -1769,7 +1769,7 @@ void reply_trans(struct smbsrv_request *req) /* Reply to an SMBtranss request */ -void reply_transs(struct smbsrv_request *req) +void smbsrv_reply_transs(struct smbsrv_request *req) { reply_transs_generic(req, SMBtrans); } @@ -1777,8 +1777,7 @@ void reply_transs(struct smbsrv_request *req) /* Reply to an SMBtranss2 request */ -void reply_transs2(struct smbsrv_request *req) +void smbsrv_reply_transs2(struct smbsrv_request *req) { reply_transs_generic(req, SMBtrans2); } - |