~ubuntu-branches/ubuntu/feisty/samba/feisty-security

« back to all changes in this revision

Viewing changes to source/smbd/posix_acls.c

  • Committer: Bazaar Package Importer
  • Author(s): Adam Conrad
  • Date: 2006-03-24 02:59:17 UTC
  • mfrom: (0.5.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20060324025917-ztv23ezkut7lt4t1
Tags: 3.0.21c-1ubuntu1
* Merge with Debian for new upstream bugfixes, UVF exception by mdz.
* Remove dapper->dapper upgrade hack, which should be a non-issue now.

Show diffs side-by-side

added added

removed removed

Lines of Context:
4218
4218
SEC_DESC* get_nt_acl_no_snum( TALLOC_CTX *ctx, const char *fname)
4219
4219
{
4220
4220
        SEC_DESC *psd, *ret_sd;
4221
 
        size_t sd_size;
4222
4221
        connection_struct conn;
4223
4222
        files_struct finfo;
4224
4223
        struct fd_handle fh;
4229
4228
        conn.service = -1;
4230
4229
        
4231
4230
        if ( !(conn.mem_ctx = talloc_init( "novfs_get_nt_acl" )) ) {
4232
 
                DEBUG(0,("novfs_get_nt_acl: talloc() failed!\n"));
 
4231
                DEBUG(0,("get_nt_acl_no_snum: talloc() failed!\n"));
4233
4232
                return NULL;
4234
4233
        }
4235
4234
        
4237
4236
        string_set(&conn.connectpath, path);
4238
4237
        
4239
4238
        if (!smbd_vfs_init(&conn)) {
4240
 
                DEBUG(0,("novfs_get_nt_acl: Unable to create a fake connection struct!\n"));
 
4239
                DEBUG(0,("get_nt_acl_no_snum: Unable to create a fake connection struct!\n"));
 
4240
                conn_free_internal( &conn );
4241
4241
                return NULL;
4242
4242
        }
4243
4243
        
4251
4251
        pstrcpy( filename, fname );
4252
4252
        finfo.fsp_name = filename;
4253
4253
        
4254
 
        sd_size = get_nt_acl( &finfo, DACL_SECURITY_INFORMATION, &psd );
 
4254
        if (get_nt_acl( &finfo, DACL_SECURITY_INFORMATION, &psd ) == 0) {
 
4255
                DEBUG(0,("get_nt_acl_no_snum: get_nt_acl returned zero.\n"));
 
4256
                conn_free_internal( &conn );
 
4257
                return NULL;
 
4258
        }
4255
4259
        
4256
4260
        ret_sd = dup_sec_desc( ctx, psd );
4257
4261