diff options
| author | Steve Langasek <vorlon@debian.org> | 2008-07-26 14:10:06 -0700 |
|---|---|---|
| committer | Steve Langasek <steve.langasek@ubuntu.com> | 2019-01-03 17:01:54 -0800 |
| commit | d7e2c1d781e27ebb2a4d31472cae3592f19dcd7e (patch) | |
| tree | bdc03fa16aecde410d76ab569efcd86b9b8891ae | |
| parent | dc6a73202169a34ee33598c2f06ce1050f52c310 (diff) | |
| download | pam-d7e2c1d781e27ebb2a4d31472cae3592f19dcd7e.tar.gz pam-d7e2c1d781e27ebb2a4d31472cae3592f19dcd7e.tar.bz2 pam-d7e2c1d781e27ebb2a4d31472cae3592f19dcd7e.zip | |
another fix-up for a hand-merged patch
| -rw-r--r-- | debian/patches-applied/007_modules_pam_unix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/patches-applied/007_modules_pam_unix b/debian/patches-applied/007_modules_pam_unix index 1d22779a..608eea06 100644 --- a/debian/patches-applied/007_modules_pam_unix +++ b/debian/patches-applied/007_modules_pam_unix @@ -130,7 +130,7 @@ Index: pam.deb/modules/pam_unix/support.c break; } } -@@ -100,15 +102,16 @@ +@@ -100,15 +102,17 @@ ctrl &= unix_args[j].mask; /* for turning things off */ ctrl |= unix_args[j].flag; /* for turning things on */ @@ -142,7 +142,6 @@ Index: pam.deb/modules/pam_unix/support.c - if (*remember > 400) - *remember = 400; - } -- } + /* special cases */ + if (remember != NULL && j == UNIX_REMEMBER_PASSWD) { + *remember = strtol(*argv + 9, NULL, 10); @@ -152,11 +151,12 @@ Index: pam.deb/modules/pam_unix/support.c + *remember = 400; + } else if (pass_min_len && j == UNIX_MIN_PASS_LEN) { + *pass_min_len = atoi(*argv + 4); -+ + } ++ if (rounds != NULL) { if (j == UNIX_ALGO_ROUNDS) { *rounds = strtol(*argv + 7, NULL, 10); -@@ -124,6 +127,11 @@ +@@ -124,6 +128,11 @@ ++argv; /* step to next argument */ } |