Changeset 9353

Timestamp:

06/19/12 13:34:02 (12 months ago)

Author:

sampson

Message:

Merged Windows changes from stable

Location:

trunk

Files:

• install-windows/OrangeFS-Client/Script Files/Setup.Rul (modified) (3 diffs)
• src/client/windows/client-service/client-service.h (modified) (1 diff)
• src/client/windows/client-service/config.c (modified) (3 diffs)
• src/client/windows/client-service/dokan-interface.c (modified) (4 diffs)
• src/client/windows/client-service/fs.c (modified) (4 diffs)
• src/client/windows/client-service/fs.h (modified) (2 diffs)
• src/common/gen-locks/gen-locks.h (modified) (1 diff)
• src/common/misc/realpath.c (modified) (1 diff)

trunk/install-windows/OrangeFS-Client/Script Files/Setup.Rul

@@ -104 +104 @@
     nResult = SdWelcome(szTitle, szMsg);
     if (nResult = BACK) goto Dlg_SdWelcome;
-            
-Dlg_SdLicense:                             
-    szQuestion = "";
-    nResult = SdLicense(szTitle, szMsg, szQuestion, "license.txt");
-    if (nResult = BACK) goto Dlg_SdWelcome;
-       
+        
+        szTitle   = "";
+        svName    = "";
+    svCompany = "";
 /*
 Dlg_SdRegisterUser:
@@ -142 +140 @@
 Dlg_SdAskDestPath:      
     nResult = SdAskDestPath(szTitle, szMsg, INSTALLDIR, 0);
-    if (nResult = BACK) goto Dlg_SdLicense;
+    if (nResult = BACK) goto Dlg_SdWelcome;
 /*
 Dlg_SdFeatureTree: 
@@ -409 +407 @@
         SdFinishReboot ( szTitle , szMsg1 , SYS_BOOTMACHINE , szMsg2 , 0 );
     else
-        szMsg2 = "Documentation is available in " + (INSTALLDIR ^ "Doc") + ".";
         szOpt1 = "Start the OrangeFS services";
         bOpt1 = TRUE;

trunk/src/client/windows/client-service/client-service.h

@@ -40 +40 @@
     char ca_path[MAX_PATH];
     int threads;
+    unsigned int new_file_perms,
+                 new_dir_perms;
     int debug;
     int debug_stderr;

trunk/src/client/windows/client-service/config.c

@@ -382 +382 @@
     }
 
+    /* new file/dir permissions
+     *   0755 = rwxr-xr-x 
+     */
+    options->new_file_perms = options->new_dir_perms = 0755; 
+
     /* default LDAP options */
     options->ldap.search_scope = LDAP_SCOPE_ONELEVEL;
@@ -399 +404 @@
 {
     FILE *config_file;
-    char line[256], copy[256], *token, *p;
+    char line[256], copy[256], *token, *p, *endptr;
     int ret = 0, debug_file_flag = FALSE;
+    long mask;
 
     config_file = open_config_file(error_msg, error_msg_len);
@@ -540 +546 @@
                     ret = -1;
                     goto get_config_exit;
+                }
+            }
+            else if (!stricmp(token, "new-file-perms") ||
+                     !stricmp(token, "new-dir-perms"))
+            {
+                p = line + strlen(token);
+                EAT_WS(p);
+                /* get mask in octal format */
+                mask = strtol(p, &endptr, 8);
+                if (!mask || *endptr != '\0')
+                {
+                    _snprintf(error_msg, error_msg_len,
+                        "Configuration file (fatal): "
+                        "%s option: parse error - value must be "
+                        "nonzero octal integer\n", token);
+                    ret = -1;
+                    goto get_config_exit;
+                }
+                if (!stricmp(token, "new-file-perms"))
+                {
+                    options->new_file_perms = (unsigned int) mask;
+                }
+                else
+                {
+                    options->new_dir_perms = (unsigned int) mask;
                 }
             }

trunk/src/client/windows/client-service/dokan-interface.c

@@ -835 +835 @@
             fs_remove(fs_path, &credentials);
         }
-        ret = fs_create(fs_path, &credentials, &handle);
+        ret = fs_create(fs_path, &credentials, &handle, 
+            goptions->new_file_perms);
         break;
     case CREATE_NEW:
@@ -846 +847 @@
         {
             /* create file */
-            ret = fs_create(fs_path, &credentials, &handle);
+            ret = fs_create(fs_path, &credentials, &handle, 
+                goptions->new_file_perms);
         }
         break;
@@ -853 +855 @@
         {    
             /* create file */
-            ret = fs_create(fs_path, &credentials, &handle);
+            ret = fs_create(fs_path, &credentials, &handle,
+                goptions->new_file_perms);
         }
         break;
@@ -932 +935 @@
         return -1;
 
-    ret = fs_mkdir(fs_path, &credentials, &handle);
+    ret = fs_mkdir(fs_path, &credentials, &handle, goptions->new_dir_perms);
 
     DbgPrint("   fs_mkdir returns: %d\n", ret);

trunk/src/client/windows/client-service/fs.c

@@ -239 +239 @@
 int fs_create(char *fs_path,
               PVFS_credentials *credentials,
-              PVFS_handle *handle)
+              PVFS_handle *handle,
+              unsigned int perms)
 {    
     char *base_dir, *entry_name;
@@ -279 +280 @@
     attr.owner = credentials->uid;
     attr.group = credentials->gid;
-    /* default permissions: rwxr-xr-x */
-    attr.perms = 0755;
+    /* configurable in options */
+    attr.perms = perms;
     attr.atime = attr.mtime = attr.ctime = time(NULL);
 
@@ -498 +499 @@
 int fs_mkdir(char *fs_path,
              PVFS_credentials *credentials,
-             PVFS_handle *handle)
+             PVFS_handle *handle,
+             unsigned int perms)
 {
     char *base_dir, *entry_name;
@@ -535 +537 @@
     attr.owner = credentials->uid;
     attr.group = credentials->gid;
-    /* default permissions: rwxr-xr-x */
-    attr.perms = 0755;
+    /* configurable in options */
+    attr.perms = perms;
     attr.atime = attr.mtime = attr.ctime = time(NULL);
 

trunk/src/client/windows/client-service/fs.h

@@ -30 +30 @@
 int fs_create(char *fs_path,
               PVFS_credentials *credentials,
-              PVFS_handle *handle);
+              PVFS_handle *handle,
+              unsigned int perms);
 
 int fs_remove(char *fs_path,
@@ -53 +54 @@
 int fs_mkdir(char *fs_path,
              PVFS_credentials *credentials,
-             PVFS_handle *handle);
+             PVFS_handle *handle,
+             unsigned int perms);
 
 int fs_io(enum PVFS_io_type io_type,

trunk/src/common/gen-locks/gen-locks.h

@@ -22 +22 @@
 
 #include <stdlib.h>
+#ifndef WIN32
+#include <unistd.h>
+#endif
 
 /* we will make posix locks the default unless turned off for now. */

trunk/src/common/misc/realpath.c

@@ -33 +33 @@
 #ifndef WIN32
 #include <unistd.h>
-#endif
 #include <sys/syscall.h>
+#endif
 #include <string.h>
 #include <errno.h>