summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2006-09-12 02:26:32 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:51:22 -0500
commit62c78742c48c90d3a0256305a9e8c1c92b94c648 (patch)
treee5550e3b6577d77d25a751725f085af506a3525d /source3
parent3a55aa918c09b45ceeb3b9236ccf1f6bc94da886 (diff)
downloadsamba-62c78742c48c90d3a0256305a9e8c1c92b94c648.tar.gz
samba-62c78742c48c90d3a0256305a9e8c1c92b94c648.tar.bz2
samba-62c78742c48c90d3a0256305a9e8c1c92b94c648.zip
r18413: Based on the new torture test I added in samba4 it turns out
the flags determines what kind of share is this. I suppose 0x80000000 means something like (legacy) as it will fail for any share name longer then 13 chars (same size accepted for old RAP calls that come from pre NT OSs. Jerry, let me know if you want me to commit this to 3_0_23 Simo. (This used to be commit f09f8b2d820b10679f3e9cf80749da0a35f5ce6a)
Diffstat (limited to 'source3')
-rw-r--r--source3/rpc_server/srv_srvsvc_nt.c19
1 files changed, 18 insertions, 1 deletions
diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c
index 3e79b420a9..c65401f1c4 100644
--- a/source3/rpc_server/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srv_srvsvc_nt.c
@@ -2221,11 +2221,28 @@ WERROR _srv_net_disk_enum(pipes_struct *p, SRV_Q_NET_DISK_ENUM *q_u, SRV_R_NET_D
WERROR _srv_net_name_validate(pipes_struct *p, SRV_Q_NET_NAME_VALIDATE *q_u, SRV_R_NET_NAME_VALIDATE *r_u)
{
fstring sharename;
+ int len;
+
+ if ((q_u->flags != 0x0) && (q_u->flags != 0x80000000)) {
+ return WERR_INVALID_PARAM;
+ }
switch ( q_u->type ) {
case 0x9:
rpcstr_pull(sharename, q_u->sharename.buffer, sizeof(sharename), q_u->sharename.uni_str_len*2, 0);
- if ( !validate_net_name( sharename, INVALID_SHARENAME_CHARS, sizeof(sharename) ) ) {
+
+ len = strlen_m(sharename);
+
+ if ((q_u->flags == 0x0) && (len > 81)) {
+ DEBUG(5,("_srv_net_name_validate: share name too long (%s > 81 chars)\n", sharename));
+ return WERR_INVALID_NAME;
+ }
+ if ((q_u->flags == 0x80000000) && (len > 13)) {
+ DEBUG(5,("_srv_net_name_validate: share name too long (%s > 13 chars)\n", sharename));
+ return WERR_INVALID_NAME;
+ }
+
+ if ( ! validate_net_name( sharename, INVALID_SHARENAME_CHARS, sizeof(sharename) ) ) {
DEBUG(5,("_srv_net_name_validate: Bad sharename \"%s\"\n", sharename));
return WERR_INVALID_NAME;
}