← Back to branch summary

~ubuntu-branches/ubuntu/trusty/vsftpd/trusty-proposed

« back to all changes in this revision

Viewing changes to .pc/09-s390.patch/sysdeputil.c

  • Committer: Package Import Robot
  • Author(s): Lorenzo De Liso
  • Date: 2012-12-18 19:59:37 UTC
  • mfrom: (2.3.22 sid)
  • Revision ID: package-import@ubuntu.com-20121218195937-xiwdrfndhhvv87s0
Tags: 3.0.2-1ubuntu1
https://launchpad.net/bugs/1092076
* Merge from debian unstable (LP: #1092076), remaining changes:
  - Use snakeoil SSL certificates and key.
  - debian/rules, debian/vsftpd.upstart: migrate vsftpd to upstart.
  - Add apport hook:
    + debian/vsftpd.apport: Added.
    + debian/control: Build-depends on dh-apport.
    + debian/rules: Add --with apport.
  - Add debian/watch file.
  - debian/patches/09-disable-anonymous.patch: Disable anonymous login by 
    default.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/09-s390.patch/sysdeputil.c
322
322
                      const struct mystr* p_pass_str,
323
323
                      const struct mystr* p_remote_host)
324
324
{
325
 
  int retval;
 
325
  int retval = -1;
326
326
  pam_item_t item;
327
327
  const char* pam_user_name = 0;
328
328
  struct pam_conv the_conv =
335
335
    bug("vsf_sysdep_check_auth");
336
336
  }
337
337
  str_copy(&s_pword_str, p_pass_str);
338
 
  retval = pam_start(tunable_pam_service_name,
339
 
                     str_getbuf(p_user_str), &the_conv, &s_pamh);
 
338
  if (tunable_pam_service_name)
 
339
  {
 
340
    retval = pam_start(tunable_pam_service_name,
 
341
                       str_getbuf(p_user_str), &the_conv, &s_pamh);
 
342
  }
340
343
  if (retval != PAM_SUCCESS)
341
344
  {
342
345
    s_pamh = 0;