← Back to branch summary

~ssalley/ubuntu/maverick/likewise-open/likewise-open.fix627272

« back to all changes in this revision

Viewing changes to lwio/server/srv/protocols/smb1/ntrename.c

  • Committer: Bazaar Package Importer
  • Author(s): Gerald Carter, Michael Casadevall, Gerald Carter
  • Date: 2010-03-13 07:42:44 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20100313074244-j1gy0zo19cc32xhl
Tags: 5.4.0.42111-1
https://launchpad.net/bugs/517300
https://launchpad.net/bugs/538616
[ Michael Casadevall ]
* LP: #517300
  - added debian/patches/disable_parallel_builds.diff to allow successful builds
    on non-x86 architectures caused by improperly parsing /proc/cpuinfo to
    determine the number of CPUs and set make -jX.
  - added debian/patches/correct_lwio_configure_detection.diff to correct configure
    tests for properly checking proc filesystems on non-x86 linux platforms
  - added ${misc:Depends} to Depends lines to satisfy lintian
  - Added debian/README.source to satisfy lintian 
  - Bumped standards version to 3.8.3

[ Gerald Carter ]
* New upstream release. (LP: #538616)
* likewise-open.install: Include uninstalled binaries and ncalrpc
    servers required for domainjoin-cli {join,leave}
* patches/version-in-share.diff:
  - Corrected location of VERSION file in lsassd

Show diffs side-by-side

added added

removed removed

Lines of Context:
lwio/server/srv/protocols/smb1/ntrename.c
326
326
    {
327
327
        SrvPrepareNtRenameStateAsync(pRenameState, pExecContext);
328
328
 
329
 
        ntStatus = IoCreateFile(
 
329
        ntStatus = SrvIoCreateFile(
 
330
                        pCtxSmb1->pTree->pShareInfo,
330
331
                        &pRenameState->hDir,
331
332
                        pRenameState->pAcb,
332
333
                        &pRenameState->ioStatusBlock,
342
343
                        FILE_DIRECTORY_FILE,
343
344
                        NULL, /* EA Buffer */
344
345
                        0,    /* EA Length */
345
 
                        NULL  /* ECP List  */
 
346
                        &pRenameState->pDirEcpList
346
347
                        );
347
348
        BAIL_ON_NT_STATUS(ntStatus);
348
349
 
353
354
    {
354
355
        SrvPrepareNtRenameStateAsync(pRenameState, pExecContext);
355
356
 
356
 
        ntStatus = IoCreateFile(
 
357
        ntStatus = SrvIoCreateFile(
 
358
                        pCtxSmb1->pTree->pShareInfo,
357
359
                        &pRenameState->hFile,
358
360
                        pRenameState->pAcb,
359
361
                        &pRenameState->ioStatusBlock,
369
371
                        0,
370
372
                        NULL, /* EA Buffer */
371
373
                        0,    /* EA Length */
372
 
                        NULL  /* ECP List  */
 
374
                        &pRenameState->pFileEcpList
373
375
                        );
374
376
        BAIL_ON_NT_STATUS(ntStatus);
375
377
 
634
636
                    &pRenameState->pAcb->AsyncCancelContext);
635
637
    }
636
638
 
 
639
    if (pRenameState->pDirEcpList)
 
640
    {
 
641
        IoRtlEcpListFree(&pRenameState->pDirEcpList);
 
642
    }
 
643
 
 
644
    if (pRenameState->pFileEcpList)
 
645
    {
 
646
        IoRtlEcpListFree(&pRenameState->pFileEcpList);
 
647
    }
 
648
 
637
649
    // TODO: Free the following if set
638
650
    // pSecurityDescriptor;
639
651
    // pSecurityQOS;