← Back to branch summary

~ubuntu-branches/ubuntu/utopic/389-ds-base/utopic-proposed

« back to all changes in this revision

Viewing changes to ldap/servers/plugins/pam_passthru/pam_ptpreop.c

  • Committer: Package Import Robot
  • Author(s): Timo Aaltonen
  • Date: 2014-02-03 11:08:50 UTC
  • mfrom: (0.2.1)
  • Revision ID: package-import@ubuntu.com-20140203110850-tjzx85elnke9fiu3
Tags: 1.3.2.9-1
http://bugs.debian.org/704077
http://bugs.debian.org/704421
http://bugs.debian.org/718325
http://bugs.debian.org/721222
http://bugs.debian.org/730115
* New upstream release.
  - fixes CVE-2013-0336 (Closes: #704077)
  - fixes CVE-2013-1897 (Closes: #704421)
  - fixes CVE-2013-2219 (Closes: #718325)
  - fixes CVE-2013-4283 (Closes: #721222)
  - fixes CVE-2013-4485 (Closes: #730115)
* Drop fix-CVE-2013-0312.diff, upstream.
* rules: Add new scripts to rename.
* fix-sasl-path.diff: Use a triplet path to find libsasl2. (LP:
  #1088822)
* admin_scripts.diff: Add patch from upstream #47511 to fix bashisms.
* control: Add ldap-utils to -base depends.
* rules, rename-online-scripts.diff: Some scripts with .pl suffix are
  meant for an online server, so instead of overwriting the offline
  scripts use -online suffix.
* rules: Enable parallel build, but limit the jobs to 1 for
  dh_auto_install.
* control: Bump policy to 3.9.5, no changes.
* rules: Add get-orig-source target.
* lintian-overrides: Drop obsolete entries, add comments for the rest.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ldap/servers/plugins/pam_passthru/pam_ptpreop.c
229
229
    slapi_log_error( SLAPI_LOG_TRACE, PAM_PASSTHRU_PLUGIN_SUBSYSTEM,
230
230
                     "<= pam_passthruauth_init\n" );
231
231
 
232
 
  bail:
 
232
bail:
233
233
    return status;
234
234
}
235
235
 
574
574
    Slapi_Entry *e = NULL;
575
575
    LDAPMod **mods;
576
576
    char returntext[SLAPI_DSE_RETURNTEXT_SIZE];
577
 
    int ret = 0;
 
577
    int ret = SLAPI_PLUGIN_SUCCESS;
578
578
 
579
579
    slapi_log_error(SLAPI_LOG_TRACE, PAM_PASSTHRU_PLUGIN_SUBSYSTEM,
580
580
                    "=> pam_passthru_preop\n");
640
640
 
641
641
    }
642
642
 
643
 
  bail:
 
643
bail:
644
644
    /* If we are refusing the operation, return the result to the client. */
645
645
    if (ret) {
646
646
        slapi_send_ldap_result(pb, ret, NULL, returntext, 0, NULL);
647
 
        ret = -1;
 
647
        ret = SLAPI_PLUGIN_FAILURE;
648
648
    }
649
649
 
650
650
    slapi_log_error(SLAPI_LOG_TRACE, PAM_PASSTHRU_PLUGIN_SUBSYSTEM,
683
683
static int
684
684
pam_passthru_postop(Slapi_PBlock *pb)
685
685
{
686
 
    int ret = 0;
 
686
    int ret = SLAPI_PLUGIN_SUCCESS;
687
687
    Slapi_DN *sdn = NULL;
688
688
    Slapi_DN *new_sdn = NULL;
689
689
    Slapi_Entry *e = NULL;
737
737
    slapi_log_error(SLAPI_LOG_TRACE, PAM_PASSTHRU_PLUGIN_SUBSYSTEM,
738
738
                    "<= pam_passthru_postop\n");
739
739
 
740
 
  bail:
 
740
bail:
741
741
    return ret;
742
742
}
743
743