Changeset 773 for branches/samba-3.5.x/source3/rpc_server

Timestamp:

Jul 2, 2013, 7:27:06 PM (12 years ago)

Author:

Herwig Bauernfeind

Message:

Samba Server 3.5: Update branch to 3.5.20

File:

• branches/samba-3.5.x/source3/rpc_server/srv_srvsvc_nt.c (modified) (15 diffs)

branches/samba-3.5.x/source3/rpc_server/srv_srvsvc_nt.c

@@ -1419 +1419 @@
         DEBUG(5,("_srvsvc_NetShareGetInfo: %d\n", __LINE__));
 
-        fstrcpy(share_name, r->in.share_name);
-
-        snum = find_service(share_name);
+        if (!r->in.share_name) {
+                return WERR_INVALID_NAME;
+        }
+
+        snum = find_service(r->in.share_name, share_name);
         if (snum < 0) {
                 return WERR_INVALID_NAME;
@@ -1535 +1537 @@
 {
         char *command = NULL;
-        char *share_name = NULL;
+        fstring share_name;
         char *comment = NULL;
         const char *pathname = NULL;
@@ -1551 +1553 @@
         DEBUG(5,("_srvsvc_NetShareSetInfo: %d\n", __LINE__));
 
-        share_name = talloc_strdup(p->mem_ctx, r->in.share_name);
-        if (!share_name) {
-                return WERR_NOMEM;
+        if (!r->in.share_name) {
+                return WERR_INVALID_NAME;
         }
 
@@ -1560 +1561 @@
         }
 
-        if ( strequal(share_name,"IPC$")
-                || ( lp_enable_asu_support() && strequal(share_name,"ADMIN$") )
-                || strequal(share_name,"global") )
+        if ( strequal(r->in.share_name,"IPC$")
+                || ( lp_enable_asu_support() && strequal(r->in.share_name,"ADMIN$") )
+                || strequal(r->in.share_name,"global") )
         {
                 DEBUG(5,("_srvsvc_NetShareSetInfo: share %s cannot be "
                         "modified by a remote user.\n",
-                        share_name ));
+                        r->in.share_name ));
                 return WERR_ACCESS_DENIED;
         }
 
-        snum = find_service(share_name);
+        snum = find_service(r->in.share_name, share_name);
 
         /* Does this share exist ? */
@@ -1765 +1766 @@
 {
         char *command = NULL;
-        char *share_name = NULL;
+        char *share_name_in = NULL;
+        fstring share_name;
         char *comment = NULL;
         char *pathname = NULL;
@@ -1802 +1804 @@
                 return WERR_ACCESS_DENIED;
         case 2:
-                share_name = talloc_strdup(ctx, r->in.info->info2->name);
+                share_name_in = 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);
@@ -1813 +1815 @@
                 return WERR_ACCESS_DENIED;
         case 502:
-                share_name = talloc_strdup(ctx, r->in.info->info502->name);
+                share_name_in = 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);
@@ -1841 +1843 @@
         /* check for invalid share names */
 
-        if (!share_name || !validate_net_name(share_name,
+        if (!share_name_in || !validate_net_name(share_name_in,
                                 INVALID_SHARENAME_CHARS,
-                                strlen(share_name))) {
+                                strlen(share_name_in))) {
                 DEBUG(5,("_srvsvc_NetShareAdd: Bad sharename \"%s\"\n",
-                                        share_name ? share_name : ""));
+                                        share_name_in ? share_name_in : ""));
                 return WERR_INVALID_NAME;
         }
 
-        if (strequal(share_name,"IPC$") || strequal(share_name,"global")
+        if (strequal(share_name_in,"IPC$") || strequal(share_name_in,"global")
                         || (lp_enable_asu_support() &&
-                                        strequal(share_name,"ADMIN$"))) {
+                                        strequal(share_name_in,"ADMIN$"))) {
                 return WERR_ACCESS_DENIED;
         }
 
-        snum = find_service(share_name);
+        snum = find_service(share_name_in, share_name);
 
         /* Share already exists. */
@@ -1873 +1875 @@
 
         /* Ensure share name, pathname and comment don't contain '"' characters. */
-        string_replace(share_name, '"', ' ');
+        string_replace(share_name_in, '"', ' ');
         string_replace(path, '"', ' ');
         if (comment) {
@@ -1883 +1885 @@
                         lp_add_share_cmd(),
                         get_dyn_CONFIGFILE(),
-                        share_name,
+                        share_name_in,
                         path,
                         comment ? comment : "",
@@ -1920 +1922 @@
 
         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",
@@ -1947 +1951 @@
 {
         char *command = NULL;
-        char *share_name = NULL;
+        fstring share_name;
         int ret;
         int snum;
@@ -1957 +1961 @@
         DEBUG(5,("_srvsvc_NetShareDel: %d\n", __LINE__));
 
-        share_name = talloc_strdup(p->mem_ctx, r->in.share_name);
-        if (!share_name) {
+        if (!r->in.share_name) {
                 return WERR_NET_NAME_NOT_FOUND;
         }
-        if ( strequal(share_name,"IPC$")
-                || ( lp_enable_asu_support() && strequal(share_name,"ADMIN$") )
-                || strequal(share_name,"global") )
+        if ( strequal(r->in.share_name,"IPC$")
+                || ( lp_enable_asu_support() && strequal(r->in.share_name,"ADMIN$") )
+                || strequal(r->in.share_name,"global") )
         {
                 return WERR_ACCESS_DENIED;
         }
 
-        if (!(params = get_share_params(p->mem_ctx, share_name))) {
+        if (!(params = get_share_params(p->mem_ctx, r->in.share_name))) {
                 return WERR_NO_SUCH_SHARE;
         }
 
-        snum = find_service(share_name);
+        snum = find_service(r->in.share_name, share_name);
 
         /* No change to printer shares. */
@@ -2115 +2118 @@
         ZERO_STRUCT(st);
 
-        fstrcpy(servicename, r->in.share);
-
-        snum = find_service(servicename);
+        if (!r->in.share) {
+                return WERR_INVALID_NAME;
+        }
+
+        snum = find_service(r->in.share, servicename);
         if (snum == -1) {
                 DEBUG(10, ("Could not find service %s\n", servicename));
@@ -2245 +2250 @@
         ZERO_STRUCT(st);
 
-        fstrcpy(servicename, r->in.share);
-
-        snum = find_service(servicename);
+        if (!r->in.share) {
+                return WERR_INVALID_NAME;
+        }
+
+        snum = find_service(r->in.share, servicename);
         if (snum == -1) {
                 DEBUG(10, ("Could not find service %s\n", servicename));