← Back to branch summary

~ubuntu-branches/ubuntu/precise/virtualbox/precise-updates

« back to all changes in this revision

Viewing changes to src/VBox/Runtime/r3/posix/process-creation-posix.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-07-04 13:02:31 UTC
  • mfrom: (3.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20110704130231-l843es6wqhx614n7
Tags: 4.0.10-dfsg-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - Add Apport hook.
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Drop *-source packages.
* Add the Modaliases control field manually for maximum backportability.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Runtime/r3/posix/process-creation-posix.cpp
105
105
    /* be reentrant */
106
106
    struct crypt_data *data = (struct crypt_data*)RTMemTmpAllocZ(sizeof(*data));
107
107
    char *pszEncPasswd = crypt_r(pszPasswd, pw->pw_passwd, data);
108
 
    if (strcmp(pszEncPasswd, pw->pw_passwd))
109
 
        return VERR_PERMISSION_DENIED;
 
108
    int fCorrect = !strcmp(pszEncPasswd, pw->pw_passwd);
110
109
    RTMemTmpFree(data);
 
110
    if (!fCorrect)
 
111
        return VERR_PERMISSION_DENIED;
111
112
 
112
113
    *gid = pw->pw_gid;
113
114
    *uid = pw->pw_uid;
264
265
     */
265
266
    AssertPtrReturn(pszExec, VERR_INVALID_POINTER);
266
267
    AssertReturn(*pszExec, VERR_INVALID_PARAMETER);
267
 
    AssertReturn(!(fFlags & ~(RTPROC_FLAGS_DETACHED | RTPROC_FLAGS_HIDDEN | RTPROC_FLAGS_SERVICE)), VERR_INVALID_PARAMETER);
 
268
    AssertReturn(!(fFlags & ~(RTPROC_FLAGS_DETACHED | RTPROC_FLAGS_HIDDEN | RTPROC_FLAGS_SERVICE | RTPROC_FLAGS_SAME_CONTRACT | RTPROC_FLAGS_NO_PROFILE)), VERR_INVALID_PARAMETER);
268
269
    AssertReturn(!(fFlags & RTPROC_FLAGS_DETACHED) || !phProcess, VERR_INVALID_PARAMETER);
269
270
    AssertReturn(hEnv != NIL_RTENV, VERR_INVALID_PARAMETER);
270
271
    const char * const *papszEnv = RTEnvGetExecEnvP(hEnv);