Show
Ignore:
Timestamp:
06/18/10 20:02:50 (3 years ago)
Author:
nlmills
Message:

initial merge with Orange-Branch. much will be broken

Location:
branches/cu-security-branch
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • branches/cu-security-branch

    • Property svn:ignore

      •  

        old new  
        33aclocal.m4 
        44autom4te.cache 
        5 config.status 
        6 Makefile 
        7 pvfs2-config.h 
        8 module.mk 

  • branches/cu-security-branch/test/client/sysint/create.c

    r7290 r8397  
    2626    PVFS_object_ref parent_refn; 
    2727    PVFS_sys_attr attr; 
    28     PVFS_credential *cred; 
     28    PVFS_credentials credentials; 
    2929 
    3030    if (argc != 2) 
    … …  
    6060 
    6161    memset(&resp_create, 0, sizeof(PVFS_sysresp_create)); 
    62     cred = PVFS_util_gen_fake_credential(); 
    63     assert(cred); 
     62    PVFS_util_gen_credentials(&credentials); 
    6463 
    6564    entry_name = str_buf; 
    6665    attr.mask = PVFS_ATTR_SYS_ALL_SETABLE; 
    67     attr.owner = cred->userid; 
    68     attr.group = cred->group_array[0]; 
     66    attr.owner = credentials.uid; 
     67    attr.group = credentials.gid; 
    6968    attr.perms = 1877; 
    7069    attr.atime = attr.ctime = attr.mtime =  
    7170        time(NULL); 
    7271 
    73     ret = PINT_lookup_parent(filename, cur_fs, cred,  
     72    ret = PINT_lookup_parent(filename, cur_fs, &credentials,  
    7473                             &parent_refn.handle); 
    7574    if(ret < 0) 
    … …  
    8483 
    8584    ret = PVFS_sys_create(entry_name, parent_refn, attr, 
    86                           cred, NULL, NULL, &resp_create); 
     85                          &credentials, NULL, &resp_create, NULL, NULL); 
    8786    if (ret < 0) 
    8887    {