From 8e9b2075ba1d6ce2ab82c2eb2547e2c2ef3ecca8 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 27 Nov 2001 03:47:06 +0000 Subject: Update. 2001-11-21 Bruno Haible * charmaps/ISO-8859-16: Swap 0xa5 and 0xab entries. --- nis/nss_compat/compat-grp.c | 4 ++-- nis/nss_compat/compat-pwd.c | 7 ++++--- nis/nss_nis/nis-grp.c | 2 +- nis/nss_nis/nis-publickey.c | 17 ++++++++++------- nis/nss_nis/nis-pwd.c | 2 +- nis/nss_nisplus/nisplus-grp.c | 2 +- nis/nss_nisplus/nisplus-parser.c | 6 +++--- nis/nss_nisplus/nisplus-publickey.c | 16 ++++++++++------ nis/nss_nisplus/nisplus-pwd.c | 2 +- 9 files changed, 33 insertions(+), 25 deletions(-) (limited to 'nis') diff --git a/nis/nss_compat/compat-grp.c b/nis/nss_compat/compat-grp.c index 961c3b9b4b..cd939eb9e1 100644 --- a/nis/nss_compat/compat-grp.c +++ b/nis/nss_compat/compat-grp.c @@ -764,7 +764,7 @@ getgrgid_plusgroup (gid_t gid, struct group *result, char *buffer, nis_result *res; char buf[24 + grptablelen]; - sprintf(buf, "[gid=%d],%s", gid, grptable); + sprintf(buf, "[gid=%lu],%s", (unsigned long int) gid, grptable); res = nis_list(buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL); if (niserr2nss (res->status) != NSS_STATUS_SUCCESS) { @@ -794,7 +794,7 @@ getgrgid_plusgroup (gid_t gid, struct group *result, char *buffer, return NSS_STATUS_NOTFOUND; } - snprintf (buf, sizeof (buf), "%d", gid); + snprintf (buf, sizeof (buf), "%lu", (unsigned long int) gid); if (yp_match (domain, "group.bygid", buf, strlen (buf), &outval, &outvallen) != YPERR_SUCCESS) diff --git a/nis/nss_compat/compat-pwd.c b/nis/nss_compat/compat-pwd.c index 3579520944..2a55df2908 100644 --- a/nis/nss_compat/compat-pwd.c +++ b/nis/nss_compat/compat-pwd.c @@ -1353,8 +1353,9 @@ getpwuid_plususer (uid_t uid, struct passwd *result, char *buffer, nis_result *res; char buf[1024 + pwdtablelen]; - snprintf(buf, sizeof (buf), "[uid=%d],%s", uid, pwdtable); - res = nis_list(buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL); + snprintf (buf, sizeof (buf), "[uid=%lu],%s", (unsigned long int) uid, + pwdtable); + res = nis_list (buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL); if (niserr2nss (res->status) != NSS_STATUS_SUCCESS) { enum nss_status status = niserr2nss (res->status); @@ -1383,7 +1384,7 @@ getpwuid_plususer (uid_t uid, struct passwd *result, char *buffer, return NSS_STATUS_NOTFOUND; } - sprintf (buf, "%d", uid); + sprintf (buf, "%lu", (unsigned long int) uid); if (yp_match (domain, "passwd.byuid", buf, strlen (buf), &outval, &outvallen) != YPERR_SUCCESS) diff --git a/nis/nss_nis/nis-grp.c b/nis/nss_nis/nis-grp.c index 9b7531a68d..e85d68bdf7 100644 --- a/nis/nss_nis/nis-grp.c +++ b/nis/nss_nis/nis-grp.c @@ -227,7 +227,7 @@ _nss_nis_getgrgid_r (gid_t gid, struct group *grp, if (yp_get_default_domain (&domain)) return NSS_STATUS_UNAVAIL; - nlen = sprintf (buf, "%d", gid); + nlen = sprintf (buf, "%lu", (unsigned long int) gid); retval = yperr2nss (yp_match (domain, "group.bygid", buf, nlen, &result, &len)); diff --git a/nis/nss_nis/nis-publickey.c b/nis/nss_nis/nis-publickey.c index ecdf80f66b..f686054426 100644 --- a/nis/nss_nis/nis-publickey.c +++ b/nis/nss_nis/nis-publickey.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 1998, 1999, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk , 1996. @@ -143,7 +143,7 @@ static enum nss_status parse_netid_str (const char *s, uid_t *uidp, gid_t *gidp, int *gidlenp, gid_t *gidlist) { - char *p; + char *p, *ep; int gidlen; if (!s || !isdigit (*s)) @@ -153,7 +153,7 @@ parse_netid_str (const char *s, uid_t *uidp, gid_t *gidp, int *gidlenp, } /* Fetch the uid */ - *uidp = (atoi (s)); + *uidp = strtoul (s, NULL, 10); if (*uidp == 0) { @@ -175,14 +175,17 @@ parse_netid_str (const char *s, uid_t *uidp, gid_t *gidp, int *gidlenp, return NSS_STATUS_NOTFOUND; } - *gidp = (atoi (p)); + *gidp = strtoul (p, &ep, 10); gidlen = 0; - while ((p = strchr (p, ',')) != NULL) + /* After strtoul() ep should point to the first invalid character. + This is the marker "," we search for the next value. */ + while (ep != NULL && *ep == ',') { - p++; - gidlist[gidlen++] = atoi (p); + ep++; + p = ep; + gidlist[gidlen++] = strtoul (p, &ep, 10); } *gidlenp = gidlen; diff --git a/nis/nss_nis/nis-pwd.c b/nis/nss_nis/nis-pwd.c index c343d80def..4845fd1c75 100644 --- a/nis/nss_nis/nis-pwd.c +++ b/nis/nss_nis/nis-pwd.c @@ -329,7 +329,7 @@ _nss_nis_getpwuid_r (uid_t uid, struct passwd *pwd, if (yp_get_default_domain (&domain)) return NSS_STATUS_UNAVAIL; - nlen = sprintf (buf, "%d", uid); + nlen = sprintf (buf, "%lu", (unsigned long int) uid); retval = yperr2nss (yp_match (domain, "passwd.byuid", buf, nlen, &result, &len)); diff --git a/nis/nss_nisplus/nisplus-grp.c b/nis/nss_nisplus/nisplus-grp.c index 7cdf21553b..84bc6746a5 100644 --- a/nis/nss_nisplus/nisplus-grp.c +++ b/nis/nss_nisplus/nisplus-grp.c @@ -227,7 +227,7 @@ _nss_nisplus_getgrgid_r (const gid_t gid, struct group *gr, nis_result *result; char buf[36 + tablename_len]; - sprintf (buf, "[gid=%d],%s", gid, tablename_val); + sprintf (buf, "[gid=%lu],%s", (unsigned long int) gid, tablename_val); result = nis_list (buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL); diff --git a/nis/nss_nisplus/nisplus-parser.c b/nis/nss_nisplus/nisplus-parser.c index ce121ec22b..f160338cee 100644 --- a/nis/nss_nisplus/nisplus-parser.c +++ b/nis/nss_nisplus/nisplus-parser.c @@ -89,7 +89,7 @@ _nss_nisplus_parse_pwent (nis_result *result, struct passwd *pw, len = strlen (first_unused); if (len == 0) /* If we don't have a uid, it's an invalid shadow entry */ return 0; - pw->pw_uid = atoi (first_unused); + pw->pw_uid = strtoul (first_unused, NULL, 10); room_left -= (len + 1); first_unused += (len + 1); @@ -102,7 +102,7 @@ _nss_nisplus_parse_pwent (nis_result *result, struct passwd *pw, len = strlen (first_unused); if (len == 0) /* If we don't have a gid, it's an invalid shadow entry */ return 0; - pw->pw_gid = atoi (first_unused); + pw->pw_gid = strtoul (first_unused, NULL, 10); room_left -= (len + 1); first_unused += (len + 1); @@ -200,7 +200,7 @@ _nss_nisplus_parse_grent (nis_result *result, u_long entry, struct group *gr, len = strlen (first_unused); if (len == 0) /* We should always have an gid */ return 0; - gr->gr_gid = atoi (first_unused); + gr->gr_gid = strtoul (first_unused, NULL, 10); room_left -= (strlen (first_unused) + 1); first_unused += strlen (first_unused) + 1; diff --git a/nis/nss_nisplus/nisplus-publickey.c b/nis/nss_nisplus/nisplus-publickey.c index 1be6139977..ec1290a683 100644 --- a/nis/nss_nisplus/nisplus-publickey.c +++ b/nis/nss_nisplus/nisplus-publickey.c @@ -1,4 +1,4 @@ -/* Copyright (c) 1997, 1999 Free Software Foundation, Inc. +/* Copyright (c) 1997, 1999, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk , 1997. @@ -200,6 +200,7 @@ static enum nss_status parse_grp_str (const char *s, gid_t *gidp, int *gidlenp, gid_t *gidlist, int *errnop) { + char *ep; int gidlen; if (!s || (!isdigit (*s))) @@ -208,14 +209,17 @@ parse_grp_str (const char *s, gid_t *gidp, int *gidlenp, gid_t *gidlist, return NSS_STATUS_NOTFOUND; } - *gidp = atoi (s); + *gidp = strtoul (s, &ep, 10); gidlen = 0; - while ((s = strchr (s, ',')) != NULL) + /* After strtoul() ep should point to the marker ',', which means + here starts a new value. */ + while (ep != NULL && *ep == ',') { - s++; - gidlist[gidlen++] = atoi (s); + ep++; + s = ep; + gidlist[gidlen++] = strtoul (s, &ep, 10); } *gidlenp = gidlen; @@ -368,7 +372,7 @@ _nss_nisplus_netname2user (char netname[MAXNETNAMELEN + 1], uid_t *uidp, _("netname2user: LOCAL entry for %s in directory %s not unique"), netname, domain); /* Fetch the uid */ - *uidp = atoi (ENTRY_VAL (res->objects.objects_val, 2)); + *uidp = strtoul (ENTRY_VAL (res->objects.objects_val, 2), NULL, 10); if (*uidp == 0) { diff --git a/nis/nss_nisplus/nisplus-pwd.c b/nis/nss_nisplus/nisplus-pwd.c index c387f8e4f8..f7bc8321bd 100644 --- a/nis/nss_nisplus/nisplus-pwd.c +++ b/nis/nss_nisplus/nisplus-pwd.c @@ -235,7 +235,7 @@ _nss_nisplus_getpwuid_r (const uid_t uid, struct passwd *pw, nis_result *result; char buf[100 + tablename_len]; - sprintf (buf, "[uid=%d],%s", uid, tablename_val); + sprintf (buf, "[uid=%lu],%s", (unsigned long int) uid, tablename_val); result = nis_list(buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL); -- cgit 1.4.1