← Back to branch summary

~ubuntu-branches/ubuntu/quantal/openvpn/quantal-proposed

« back to all changes in this revision

Viewing changes to .pc/auth-pam_libpam_so_filename.patch/plugin/auth-pam/auth-pam.c

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2011-12-31 04:55:56 UTC
  • mfrom: (1.1.18) (10.2.16 sid)
  • Revision ID: package-import@ubuntu.com-20111231045556-3fwmrbggevr9iqxd
Tags: 2.2.1-3ubuntu1
https://launchpad.net/bugs/794916
* Merge from Debian testing.  Remaining changes:
 + debian/openvpn.init.d:
    - Do not use start-stop-daemon and </dev/null to avoid blocking boot.
    - Show per-VPN result messages.
    - Add "--script-security 2" by default for backwards compatabliity.
  + debian/control: Add lsb-base >= 3.2-14 to allow status_of_proc()
  + debian/update-resolv-conf: Support multiple domains.
  + fix bug where '--script-security 2' would be passed for all
    daemons after the first. (LP: #794916)

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/auth-pam_libpam_so_filename.patch/plugin/auth-pam/auth-pam.c
119
119
static char *
120
120
searchandreplace(const char *tosearch, const char *searchfor, const char *replacewith)
121
121
{
122
 
  if (!tosearch || !searchfor || !replacewith) return 0;
123
 
  if (!strlen(tosearch) || !strlen(searchfor) || !strlen(replacewith)) return 0;
124
 
 
125
122
  const char *searching=tosearch;
126
123
  char *scratch;
127
124
  char temp[strlen(tosearch)*10];
128
125
  temp[0]=0;
129
126
 
 
127
  if (!tosearch || !searchfor || !replacewith) return 0;
 
128
  if (!strlen(tosearch) || !strlen(searchfor) || !strlen(replacewith)) return 0;
 
129
 
130
130
  scratch = strstr(searching,searchfor);
131
131
  if (!scratch) return strdup(tosearch);
132
132