Module Name: src
Committed By: christos
Date: Sun Dec 29 22:55:32 UTC 2013
Modified Files:
src/external/bsd/openpam/dist/lib: openpam_set_option.c
openpam_straddch.c openpam_subst.c openpam_ttyconv.c
pam_getenvlist.c pam_putenv.c pam_start.c
Log Message:
- add casts for sign-changing conversions
- fix types
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/openpam/dist/lib/openpam_set_option.c \
src/external/bsd/openpam/dist/lib/openpam_subst.c \
src/external/bsd/openpam/dist/lib/pam_getenvlist.c \
src/external/bsd/openpam/dist/lib/pam_putenv.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/bsd/openpam/dist/lib/openpam_straddch.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/openpam/dist/lib/openpam_ttyconv.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/openpam/dist/lib/pam_start.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/openpam/dist/lib/openpam_set_option.c
diff -u src/external/bsd/openpam/dist/lib/openpam_set_option.c:1.4 src/external/bsd/openpam/dist/lib/openpam_set_option.c:1.5
--- src/external/bsd/openpam/dist/lib/openpam_set_option.c:1.4 Fri Dec 27 15:10:21 2013
+++ src/external/bsd/openpam/dist/lib/openpam_set_option.c Sun Dec 29 17:55:32 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: openpam_set_option.c,v 1.4 2013/12/27 20:10:21 christos Exp $ */
+/* $NetBSD: openpam_set_option.c,v 1.5 2013/12/29 22:55:32 christos Exp $ */
/*-
* Copyright (c) 2002-2003 Networks Associates Technology, Inc.
@@ -93,7 +93,8 @@ openpam_set_option(pam_handle_t *pamh,
RETURNC(PAM_BUF_ERR);
if (i == cur->optc) {
/* add */
- optv = realloc(cur->optv, sizeof(char *) * (cur->optc + 2));
+ optv = realloc(cur->optv,
+ sizeof(*optv) * ((size_t)cur->optc + 2));
if (optv == NULL) {
FREE(opt);
RETURNC(PAM_BUF_ERR);
Index: src/external/bsd/openpam/dist/lib/openpam_subst.c
diff -u src/external/bsd/openpam/dist/lib/openpam_subst.c:1.4 src/external/bsd/openpam/dist/lib/openpam_subst.c:1.5
--- src/external/bsd/openpam/dist/lib/openpam_subst.c:1.4 Fri Dec 27 15:10:21 2013
+++ src/external/bsd/openpam/dist/lib/openpam_subst.c Sun Dec 29 17:55:32 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: openpam_subst.c,v 1.4 2013/12/27 20:10:21 christos Exp $ */
+/* $NetBSD: openpam_subst.c,v 1.5 2013/12/29 22:55:32 christos Exp $ */
/*-
* Copyright (c) 2011 Dag-Erling Smørgrav
@@ -40,7 +40,7 @@
#include "openpam_impl.h"
#define subst_char(ch) do { \
- int ch_ = (ch); \
+ char ch_ = (ch); \
if (buf && len < *bufsize) \
*buf++ = ch_; \
++len; \
Index: src/external/bsd/openpam/dist/lib/pam_getenvlist.c
diff -u src/external/bsd/openpam/dist/lib/pam_getenvlist.c:1.4 src/external/bsd/openpam/dist/lib/pam_getenvlist.c:1.5
--- src/external/bsd/openpam/dist/lib/pam_getenvlist.c:1.4 Fri Dec 27 15:10:21 2013
+++ src/external/bsd/openpam/dist/lib/pam_getenvlist.c Sun Dec 29 17:55:32 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pam_getenvlist.c,v 1.4 2013/12/27 20:10:21 christos Exp $ */
+/* $NetBSD: pam_getenvlist.c,v 1.5 2013/12/29 22:55:32 christos Exp $ */
/*-
* Copyright (c) 2002-2003 Networks Associates Technology, Inc.
@@ -64,7 +64,7 @@ pam_getenvlist(pam_handle_t *pamh)
ENTER();
if (pamh == NULL)
RETURNP(NULL);
- envlist = malloc(sizeof(char *) * (pamh->env_count + 1));
+ envlist = malloc(sizeof(*envlist) * ((size_t)pamh->env_count + 1));
if (envlist == NULL) {
openpam_log(PAM_LOG_ERROR, "%s",
pam_strerror(pamh, PAM_BUF_ERR));
Index: src/external/bsd/openpam/dist/lib/pam_putenv.c
diff -u src/external/bsd/openpam/dist/lib/pam_putenv.c:1.4 src/external/bsd/openpam/dist/lib/pam_putenv.c:1.5
--- src/external/bsd/openpam/dist/lib/pam_putenv.c:1.4 Fri Dec 27 15:10:21 2013
+++ src/external/bsd/openpam/dist/lib/pam_putenv.c Sun Dec 29 17:55:32 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pam_putenv.c,v 1.4 2013/12/27 20:10:21 christos Exp $ */
+/* $NetBSD: pam_putenv.c,v 1.5 2013/12/29 22:55:32 christos Exp $ */
/*-
* Copyright (c) 2002-2003 Networks Associates Technology, Inc.
@@ -83,7 +83,7 @@ pam_putenv(pam_handle_t *pamh,
/* grow the environment list if necessary */
if (pamh->env_count == pamh->env_size) {
env = realloc(pamh->env,
- sizeof(char *) * (pamh->env_size * 2 + 1));
+ sizeof(*env) * ((size_t)pamh->env_size * 2 + 1));
if (env == NULL)
RETURNC(PAM_BUF_ERR);
pamh->env = env;
Index: src/external/bsd/openpam/dist/lib/openpam_straddch.c
diff -u src/external/bsd/openpam/dist/lib/openpam_straddch.c:1.1.1.2 src/external/bsd/openpam/dist/lib/openpam_straddch.c:1.2
--- src/external/bsd/openpam/dist/lib/openpam_straddch.c:1.1.1.2 Fri Dec 27 14:27:42 2013
+++ src/external/bsd/openpam/dist/lib/openpam_straddch.c Sun Dec 29 17:55:32 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: openpam_straddch.c,v 1.1.1.2 2013/12/27 19:27:42 christos Exp $ */
+/* $NetBSD: openpam_straddch.c,v 1.2 2013/12/29 22:55:32 christos Exp $ */
/*-
* Copyright (c) 2012 Dag-Erling Smørgrav
@@ -79,7 +79,7 @@ openpam_straddch(char **str, size_t *siz
*str = tmpstr;
}
if (ch != 0) {
- (*str)[*len] = ch;
+ (*str)[*len] = (char)ch;
++*len;
}
(*str)[*len] = '\0';
Index: src/external/bsd/openpam/dist/lib/openpam_ttyconv.c
diff -u src/external/bsd/openpam/dist/lib/openpam_ttyconv.c:1.8 src/external/bsd/openpam/dist/lib/openpam_ttyconv.c:1.9
--- src/external/bsd/openpam/dist/lib/openpam_ttyconv.c:1.8 Fri Dec 27 15:10:21 2013
+++ src/external/bsd/openpam/dist/lib/openpam_ttyconv.c Sun Dec 29 17:55:32 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: openpam_ttyconv.c,v 1.8 2013/12/27 20:10:21 christos Exp $ */
+/* $NetBSD: openpam_ttyconv.c,v 1.9 2013/12/29 22:55:32 christos Exp $ */
/*-
* Copyright (c) 2002-2003 Networks Associates Technology, Inc.
@@ -409,7 +409,7 @@ fail:
}
if (infp != stdin)
(void)fclose(infp);
- memset(aresp, 0, n * sizeof *aresp);
+ memset(aresp, 0, (size_t)n * sizeof *aresp);
FREE(aresp);
*resp = NULL;
memset(respbuf, 0, sizeof respbuf);
Index: src/external/bsd/openpam/dist/lib/pam_start.c
diff -u src/external/bsd/openpam/dist/lib/pam_start.c:1.5 src/external/bsd/openpam/dist/lib/pam_start.c:1.6
--- src/external/bsd/openpam/dist/lib/pam_start.c:1.5 Fri Dec 27 15:10:21 2013
+++ src/external/bsd/openpam/dist/lib/pam_start.c Sun Dec 29 17:55:32 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pam_start.c,v 1.5 2013/12/27 20:10:21 christos Exp $ */
+/* $NetBSD: pam_start.c,v 1.6 2013/12/29 22:55:32 christos Exp $ */
/*-
* Copyright (c) 2002-2003 Networks Associates Technology, Inc.
@@ -75,7 +75,7 @@ pam_start(const char *service,
#else
h = -1;
#endif
- hostname_size = (h < 10 ? 1024 : h) + 1;
+ hostname_size = (size_t)(h < 10 ? 1024 : h) + 1;
ENTER();
if ((ph = calloc((size_t)1, sizeof *ph)) == NULL)
