Changeset 745 for trunk/server/source3/utils/net_usershare.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/utils/net_usershare.c (modified) (17 diffs)

trunk/server/source3/utils/net_usershare.c

@@ -20 +20 @@
 
 #include "includes.h"
+#include "system/passwd.h"
+#include "system/filesys.h"
 #include "utils/net.h"
+#include "../libcli/security/security.h"
 
 struct {
@@ -38 +41 @@
         {N_("Path is not a directory"), USERSHARE_PATH_NOT_DIRECTORY},
         {N_("System error"), USERSHARE_POSIX_ERR},
+        {N_("Malformed sharename definition"), USERSHARE_MALFORMED_SHARENAME_DEF},
+        {N_("Bad sharename (doesn't match filename)"), USERSHARE_BAD_SHARENAME},
         {NULL,(enum usershare_err)-1}
 };
@@ -329 +334 @@
         int fd = -1;
         int numlines = 0;
-        SEC_DESC *psd = NULL;
+        struct security_descriptor *psd = NULL;
         char *basepath;
         char *sharepath = NULL;
         char *comment = NULL;
+        char *cp_sharename = NULL;
         char *acl_str;
         int num_aces;
@@ -393 +399 @@
                                 &sharepath,
                                 &comment,
+                                &cp_sharename,
                                 &psd,
                                 &guest_ok);
@@ -474 +481 @@
         /* NOTE: This is smb.conf-like output. Do not translate. */
         if (pi->op == US_INFO_OP) {
-                d_printf("[%s]\n", fl->pathname );
+                d_printf("[%s]\n", cp_sharename );
                 d_printf("path=%s\n", sharepath );
                 d_printf("comment=%s\n", comment);
@@ -480 +487 @@
                 d_printf("guest_ok=%c\n\n", guest_ok ? 'y' : 'n');
         } else if (pi->op == US_LIST_OP) {
-                d_printf("%s\n", fl->pathname);
+                d_printf("%s\n", cp_sharename);
         }
 
@@ -618 +625 @@
         SMB_STRUCT_STAT lsbuf;
         char *sharename;
+        const char *cp_sharename;
         char *full_path;
         char *full_path_tmp;
@@ -646 +654 @@
                         return net_usershare_add_usage(c, argc, argv);
                 case 2:
+                        cp_sharename = argv[0];
                         sharename = strlower_talloc(ctx, argv[0]);
                         us_path = argv[1];
                         break;
                 case 3:
+                        cp_sharename = argv[0];
                         sharename = strlower_talloc(ctx, argv[0]);
                         us_path = argv[1];
@@ -655 +665 @@
                         break;
                 case 4:
+                        cp_sharename = argv[0];
                         sharename = strlower_talloc(ctx, argv[0]);
                         us_path = argv[1];
@@ -661 +672 @@
                         break;
                 case 5:
+                        cp_sharename = argv[0];
                         sharename = strlower_talloc(ctx, argv[0]);
                         us_path = argv[1];
@@ -798 +810 @@
 
         for (i = 0; i < num_aces; i++) {
-                DOM_SID sid;
+                struct dom_sid sid;
                 const char *pcolon = strchr_m(pacl, ':');
                 const char *name;
@@ -898 +910 @@
                           full_path_tmp );
                 TALLOC_FREE(ctx);
+                close(tmpfd);
                 return -1;
         }
@@ -907 +920 @@
                           full_path_tmp );
                 TALLOC_FREE(ctx);
+                close(tmpfd);
                 return -1;
         }
@@ -916 +930 @@
                           full_path_tmp );
                 TALLOC_FREE(ctx);
+                close(tmpfd);
                 return -1;
         }
@@ -925 +940 @@
                           full_path_tmp );
                 TALLOC_FREE(ctx);
+                close(tmpfd);
                 return -1;
         }
@@ -930 +946 @@
         /* Create the in-memory image of the file. */
         file_img = talloc_strdup(ctx, "#VERSION 2\npath=");
-        file_img = talloc_asprintf_append(file_img, "%s\ncomment=%s\nusershare_acl=%s\nguest_ok=%c\n",
-                        us_path, us_comment, us_acl, guest_ok ? 'y' : 'n');
+        file_img = talloc_asprintf_append(file_img,
+                        "%s\ncomment=%s\nusershare_acl=%s\n"
+                        "guest_ok=%c\nsharename=%s\n",
+                        us_path,
+                        us_comment,
+                        us_acl,
+                        guest_ok ? 'y' : 'n',
+                        cp_sharename);
 
         to_write = strlen(file_img);
@@ -942 +964 @@
                 unlink(full_path_tmp);
                 TALLOC_FREE(ctx);
-                return -1;
-        }
-
-        /* Attempt to replace any existing share by this name. */
+                close(tmpfd);
+                return -1;
+        }
+
 #ifdef __OS2__
         close(tmpfd);
 #endif
+        /* Attempt to replace any existing share by this name. */
         if (rename(full_path_tmp, full_path) != 0) {
                 unlink(full_path_tmp);