Revert "Fix bug #7781 (Samba transforms "ShareName" to lowercase when adding new...

[samba.git] / source3 / rpc_server / srv_srvsvc_nt.c

diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c
index b51c7e2f2f9be771ba11448195c21760f065213e..a2d1d0716d2fc6804ec7743dcb193381b1eb9eb3 100644 (file)
--- a/source3/rpc_server/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srv_srvsvc_nt.c
@@ -1397,11 +1397,9 @@ WERROR _srvsvc_NetShareGetInfo(pipes_struct *p,
 
        DEBUG(5,("_srvsvc_NetShareGetInfo: %d\n", __LINE__));
 
-       if (!r->in.share_name) {
-               return WERR_INVALID_NAME;
-       }
+       fstrcpy(share_name, r->in.share_name);
 
-       snum = find_service(r->in.share_name, share_name);
+       snum = find_service(share_name);
        if (snum < 0) {
                return WERR_INVALID_NAME;
        }
@@ -1509,7 +1507,7 @@ WERROR _srvsvc_NetShareSetInfo(pipes_struct *p,
                               struct srvsvc_NetShareSetInfo *r)
 {
        char *command = NULL;
-       fstring share_name;
+       char *share_name = NULL;
        char *comment = NULL;
        const char *pathname = NULL;
        int type;
@@ -1525,25 +1523,26 @@ WERROR _srvsvc_NetShareSetInfo(pipes_struct *p,
 
        DEBUG(5,("_srvsvc_NetShareSetInfo: %d\n", __LINE__));
 
-       if (!r->in.share_name) {
-               return WERR_INVALID_NAME;
+       share_name = talloc_strdup(p->mem_ctx, r->in.share_name);
+       if (!share_name) {
+               return WERR_NOMEM;
        }
 
        if (r->out.parm_error) {
                *r->out.parm_error = 0;
        }
 
-       if ( strequal(r->in.share_name,"IPC$")
-               || ( lp_enable_asu_support() && strequal(r->in.share_name,"ADMIN$") )
-               || strequal(r->in.share_name,"global") )
+       if ( strequal(share_name,"IPC$")
+               || ( lp_enable_asu_support() && strequal(share_name,"ADMIN$") )
+               || strequal(share_name,"global") )
        {
                DEBUG(5,("_srvsvc_NetShareSetInfo: share %s cannot be "
                        "modified by a remote user.\n",
-                       r->in.share_name ));
+                       share_name ));
                return WERR_ACCESS_DENIED;
        }
 
-       snum = find_service(r->in.share_name, share_name);
+       snum = find_service(share_name);
 
        /* Does this share exist ? */
        if (snum < 0)
@@ -1738,8 +1737,7 @@ WERROR _srvsvc_NetShareAdd(pipes_struct *p,
                           struct srvsvc_NetShareAdd *r)
 {
        char *command = NULL;
-       char *share_name_in = NULL;
-       fstring share_name;
+       char *share_name = NULL;
        char *comment = NULL;
        char *pathname = NULL;
        int type;
@@ -1776,7 +1774,7 @@ WERROR _srvsvc_NetShareAdd(pipes_struct *p,
                /* Not enough info in a level 1 to do anything. */
                return WERR_ACCESS_DENIED;
        case 2:
-               share_name_in = talloc_strdup(ctx, r->in.info->info2->name);
+               share_name = talloc_strdup(ctx, r->in.info->info2->name);
                comment = talloc_strdup(ctx, r->in.info->info2->comment);
                pathname = talloc_strdup(ctx, r->in.info->info2->path);
                max_connections = (r->in.info->info2->max_users == (uint32_t)-1) ?
@@ -1787,7 +1785,7 @@ WERROR _srvsvc_NetShareAdd(pipes_struct *p,
                /* No path. Not enough info in a level 501 to do anything. */
                return WERR_ACCESS_DENIED;
        case 502:
-               share_name_in = talloc_strdup(ctx, r->in.info->info502->name);
+               share_name = talloc_strdup(ctx, r->in.info->info502->name);
                comment = talloc_strdup(ctx, r->in.info->info502->comment);
                pathname = talloc_strdup(ctx, r->in.info->info502->path);
                max_connections = (r->in.info->info502->max_users == (uint32_t)-1) ?
@@ -1815,21 +1813,21 @@ WERROR _srvsvc_NetShareAdd(pipes_struct *p,
 
        /* check for invalid share names */
 
-       if (!share_name_in || !validate_net_name(share_name_in,
+       if (!share_name || !validate_net_name(share_name,
                                INVALID_SHARENAME_CHARS,
-                               strlen(share_name_in))) {
+                               strlen(share_name))) {
                DEBUG(5,("_srvsvc_NetShareAdd: Bad sharename \"%s\"\n",
-                                       share_name_in ? share_name_in : ""));
+                                       share_name ? share_name : ""));
                return WERR_INVALID_NAME;
        }
 
-       if (strequal(share_name_in,"IPC$") || strequal(share_name_in,"global")
+       if (strequal(share_name,"IPC$") || strequal(share_name,"global")
                        || (lp_enable_asu_support() &&
-                                       strequal(share_name_in,"ADMIN$"))) {
+                                       strequal(share_name,"ADMIN$"))) {
                return WERR_ACCESS_DENIED;
        }
 
-       snum = find_service(share_name_in, share_name);
+       snum = find_service(share_name);
 
        /* Share already exists. */
        if (snum >= 0) {
@@ -1847,7 +1845,7 @@ WERROR _srvsvc_NetShareAdd(pipes_struct *p,
        }
 
        /* Ensure share name, pathname and comment don't contain '"' characters. */
-       string_replace(share_name_in, '"', ' ');
+       string_replace(share_name, '"', ' ');
        string_replace(path, '"', ' ');
        if (comment) {
                string_replace(comment, '"', ' ');
@@ -1857,7 +1855,7 @@ WERROR _srvsvc_NetShareAdd(pipes_struct *p,
                        "%s \"%s\" \"%s\" \"%s\" \"%s\" %d",
                        lp_add_share_cmd(),
                        get_dyn_CONFIGFILE(),
-                       share_name_in,
+                       share_name,
                        path,
                        comment ? comment : "",
                        max_connections);
@@ -1894,8 +1892,6 @@ WERROR _srvsvc_NetShareAdd(pipes_struct *p,
                return WERR_ACCESS_DENIED;
 
        if (psd) {
-               /* Note we use share_name here, not share_name_in as
-                  we need a canonicalized name for setting security. */
                if (!set_share_security(share_name, psd)) {
                        DEBUG(0,("_srvsvc_NetShareAdd: Failed to add security info to share %s.\n",
                                share_name ));
@@ -1923,7 +1919,7 @@ WERROR _srvsvc_NetShareDel(pipes_struct *p,
                           struct srvsvc_NetShareDel *r)
 {
        char *command = NULL;
-       fstring share_name;
+       char *share_name = NULL;
        int ret;
        int snum;
        SE_PRIV se_diskop = SE_DISK_OPERATOR;
@@ -1933,21 +1929,22 @@ WERROR _srvsvc_NetShareDel(pipes_struct *p,
 
        DEBUG(5,("_srvsvc_NetShareDel: %d\n", __LINE__));
 
-       if (!r->in.share_name) {
+       share_name = talloc_strdup(p->mem_ctx, r->in.share_name);
+       if (!share_name) {
                return WERR_NET_NAME_NOT_FOUND;
        }
-       if ( strequal(r->in.share_name,"IPC$")
-               || ( lp_enable_asu_support() && strequal(r->in.share_name,"ADMIN$") )
-               || strequal(r->in.share_name,"global") )
+       if ( strequal(share_name,"IPC$")
+               || ( lp_enable_asu_support() && strequal(share_name,"ADMIN$") )
+               || strequal(share_name,"global") )
        {
                return WERR_ACCESS_DENIED;
        }
 
-       if (!(params = get_share_params(p->mem_ctx, r->in.share_name))) {
+       if (!(params = get_share_params(p->mem_ctx, share_name))) {
                return WERR_NO_SUCH_SHARE;
        }
 
-       snum = find_service(r->in.share_name, share_name);
+       snum = find_service(share_name);
 
        /* No change to printer shares. */
        if (lp_print_ok(snum))
@@ -2090,11 +2087,9 @@ WERROR _srvsvc_NetGetFileSecurity(pipes_struct *p,
 
        ZERO_STRUCT(st);
 
-       if (!r->in.share) {
-               return WERR_INVALID_NAME;
-       }
+       fstrcpy(servicename, r->in.share);
 
-       snum = find_service(r->in.share, servicename);
+       snum = find_service(servicename);
        if (snum == -1) {
                DEBUG(10, ("Could not find service %s\n", servicename));
                werr = WERR_NET_NAME_NOT_FOUND;
@@ -2222,11 +2217,9 @@ WERROR _srvsvc_NetSetFileSecurity(pipes_struct *p,
 
        ZERO_STRUCT(st);
 
-       if (!r->in.share) {
-               return WERR_INVALID_NAME;
-       }
+       fstrcpy(servicename, r->in.share);
 
-       snum = find_service(r->in.share, servicename);
+       snum = find_service(servicename);
        if (snum == -1) {
                DEBUG(10, ("Could not find service %s\n", servicename));
                werr = WERR_NET_NAME_NOT_FOUND;