diff options
| author | root <root@rshg054.dnsready.net> | 2012-02-17 19:20:30 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-02-17 19:20:30 +0000 |
| commit | 4fc59478d1180fd7984003f5b1645fe40954299f (patch) | |
| tree | 35f3d7dada2cfcb8194cdaed447c431664746934 /core/shadow/shadow-strncpy-usage.patch | |
| parent | 76774d40da5ce246c9f2178fdf937706d99af4b2 (diff) | |
Fri Feb 17 19:20:30 UTC 2012
Diffstat (limited to 'core/shadow/shadow-strncpy-usage.patch')
| -rw-r--r-- | core/shadow/shadow-strncpy-usage.patch | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/core/shadow/shadow-strncpy-usage.patch b/core/shadow/shadow-strncpy-usage.patch index 46df74ace..5aba8fa01 100644 --- a/core/shadow/shadow-strncpy-usage.patch +++ b/core/shadow/shadow-strncpy-usage.patch @@ -1,27 +1,25 @@ -diff -ur shadow-4.1.4.3.orig/src/login.c shadow-4.1.4.3/src/login.c ---- shadow-4.1.4.3.orig/src/login.c 2011-03-05 22:17:10.032524948 -0800 -+++ shadow-4.1.4.3/src/login.c 2011-03-05 22:17:59.154342059 -0800 -@@ -748,8 +748,9 @@ - sizeof (loginprompt), +diff -u shadow-4.1.5/src/usermod.c.orig shadow-4.1.5/src/usermod.c +--- shadow-4.1.5/src/usermod.c.orig 2012-02-13 08:19:43.792146449 -0500 ++++ shadow-4.1.5/src/usermod.c 2012-02-13 08:21:19.375114500 -0500 +@@ -182,7 +182,7 @@ + struct tm *tp; + + if (date < 0) { +- strncpy (buf, "never", maxsize); ++ strncpy (buf, "never", maxsize - 1); + } else { + time_t t = (time_t) date; + tp = gmtime (&t); +diff -u shadow-4.1.5/src/login.c.orig shadow-4.1.5/src/login.c +--- shadow-4.1.5/src/login.c.orig 2012-02-13 08:19:50.951994454 -0500 ++++ shadow-4.1.5/src/login.c 2012-02-13 08:21:04.490430937 -0500 +@@ -752,7 +752,8 @@ _("%s login: "), hostn); } else { -+ loginprompt[sizeof (loginprompt) - 1] = '\0'; strncpy (loginprompt, _("login: "), - sizeof (loginprompt)); + sizeof (loginprompt) - 1); ++ loginprompt[sizeof (loginprompt) - 1] = '\0'; } retcode = pam_set_item (pamh, PAM_USER_PROMPT, loginprompt); -diff -ur shadow-4.1.4.3.orig/src/usermod.c shadow-4.1.4.3/src/usermod.c ---- shadow-4.1.4.3.orig/src/usermod.c 2011-03-05 22:17:10.029191265 -0800 -+++ shadow-4.1.4.3/src/usermod.c 2011-03-05 22:18:42.665576968 -0800 -@@ -182,7 +182,8 @@ - struct tm *tp; - - if ((negativ != NULL) && (date < 0)) { -- strncpy (buf, negativ, maxsize); -+ buf[maxsize - 1] = '\0'; -+ strncpy (buf, negativ, maxsize - 1); - } else { - time_t t = (time_t) date; - tp = gmtime (&t); |