mirrors/shadow
0
0
Fork 0
mirror of https://github.com/shadow-maint/shadow.git synced 2024-11-24 10:35:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix some compilation warnings:

Browse Source 
* src/login.c: "dereferencing type-punned pointer will break
   strict-aliasing rules", add a variable indirection: ptr_pam_user.
 * lib/commonio.c: do not initialize the sb stat structure.
 * lib/pwio.c, lib/shadowio.c, lib/sgroupio.c, lib/groupio.c:
   initialize the security context if WITH_SELINUX.
 * lib/nscd.c: The service argument is not const (used in the exec*
   parameters). This matches with the prototype definition.
 * src/groupmems.c: Avoid ++i when i is also used in the same line.
 * src/newusers.c: i is positive every time it is compared. Add
   cast to unsigned int.
 * src/nologin.c: Use a main() prototype with no arguments.
 * libmisc/getdate.y: Initialize the type and value fields of the
   terminating entry for each TABLE.
 * libmisc/tz.c: Use "TZ=CST6CDT" as the default timezone.
This commit is contained in:
nekral-guest 2007-11-19 20:25:36 +00:00
parent d16cc1ea89
commit 39e5c0a1ab
13 changed files with 49 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ChangeLog
View File

@ -1,3 +1,21 @@
2007-11-19 Nicolas François <nicolas.francois@centraliens.net>
Fix some compilation warnings:
* src/login.c: "dereferencing type-punned pointer will break
strict-aliasing rules", add a variable indirection: ptr_pam_user.
* lib/commonio.c: do not initialize the sb stat structure.
* lib/pwio.c, lib/shadowio.c, lib/sgroupio.c, lib/groupio.c:
initialize the security context if WITH_SELINUX.
* lib/nscd.c: The service argument is not const (used in the exec*
parameters). This matches with the prototype definition.
* src/groupmems.c: Avoid ++i when i is also used in the same line.
* src/newusers.c: i is positive every time it is compared. Add
cast to unsigned int.
* src/nologin.c: Use a main() prototype with no arguments.
* libmisc/getdate.y: Initialize the type and value fields of the
terminating entry for each TABLE.
* libmisc/tz.c: Use "TZ=CST6CDT" as the default timezone.
2007-11-19 Nicolas François <nicolas.francois@centraliens.net>
* man/pl/Makefile.am: Add getspnam.3 to EXTRA_DIST since it is

2
lib/commonio.c
View File

@ -53,7 +53,7 @@ int lrename (const char *old, const char *new)
int res;
#if defined(S_ISLNK)
struct stat sb = { 0 };
struct stat sb;
if (lstat (new, &sb) == 0 && S_ISLNK (sb.st_mode)) {
if (realpath (new, resolved_path) == NULL) {
perror ("realpath in lrename()");

3
lib/groupio.c
View File

@ -63,6 +63,9 @@ static struct commonio_db group_db = {
GROUP_FILE, /* filename */
&group_ops, /* ops */
NULL, /* fp */
#ifdef WITH_SELINUX
NULL, /* scontext */
#endif
NULL, /* head */
NULL, /* tail */
NULL, /* cursor */

2
lib/nscd.c
View File

@ -16,7 +16,7 @@
/*
* nscd_flush_cache - flush specified service buffer in nscd cache
*/
int nscd_flush_cache (const char *service)
int nscd_flush_cache (char *service)
{
pid_t pid, termpid;
int err, status;

3
lib/pwio.c
View File

@ -64,6 +64,9 @@ static struct commonio_db passwd_db = {
PASSWD_FILE, /* filename */
&passwd_ops, /* ops */
NULL, /* fp */
#ifdef WITH_SELINUX
NULL, /* scontext */
#endif
NULL, /* head */
NULL, /* tail */
NULL, /* cursor */

3
lib/sgroupio.c
View File

@ -107,6 +107,9 @@ static struct commonio_db gshadow_db = {
SGROUP_FILE, /* filename */
&gshadow_ops, /* ops */
NULL, /* fp */
#ifdef WITH_SELINUX
NULL, /* scontext */
#endif
NULL, /* head */
NULL, /* tail */
NULL, /* cursor */

3
lib/shadowio.c
View File

@ -61,6 +61,9 @@ static struct commonio_db shadow_db = {
SHADOW_FILE, /* filename */
&shadow_ops, /* ops */
NULL, /* fp */
#ifdef WITH_SELINUX
NULL, /* scontext */
#endif
NULL, /* head */
NULL, /* tail */
NULL, /* cursor */

10
libmisc/getdate.y
View File

@ -464,7 +464,7 @@ static TABLE const MonthDayTable[] = {
{ "thurs", tDAY, 4 },
{ "friday", tDAY, 5 },
{ "saturday", tDAY, 6 },
{ NULL }
{ NULL, 0, 0 }
};
/* Time units table. */
@ -479,7 +479,7 @@ static TABLE const UnitsTable[] = {
{ "min", tMINUTE_UNIT, 1 },
{ "second", tSEC_UNIT, 1 },
{ "sec", tSEC_UNIT, 1 },
{ NULL }
{ NULL, 0, 0 }
};
/* Assorted relative-time words. */
@ -504,7 +504,7 @@ static TABLE const OtherTable[] = {
{ "eleventh", tUNUMBER, 11 },
{ "twelfth", tUNUMBER, 12 },
{ "ago", tAGO, 1 },
{ NULL }
{ NULL, 0, 0 }
};
/* The timezone table. */
@ -559,7 +559,7 @@ static TABLE const TimezoneTable[] = {
{ "nzst", tZONE, -HOUR (12) }, /* New Zealand Standard */
{ "nzdt", tDAYZONE, -HOUR (12) }, /* New Zealand Daylight */
{ "idle", tZONE, -HOUR (12) }, /* International Date Line East */
{ NULL }
{ NULL, 0, 0 }
};
/* Military timezone table. */
@ -589,7 +589,7 @@ static TABLE const MilitaryTable[] = {
{ "x", tZONE, HOUR (-11) },
{ "y", tZONE, HOUR (-12) },
{ "z", tZONE, HOUR ( 0) },
{ NULL }
{ NULL, 0, 0 }
};

2
libmisc/tz.c
View File

@ -45,7 +45,7 @@ char *tz (const char *fname)
{
FILE *fp = 0;
static char tzbuf[BUFSIZ];
const char *def_tz;
const char *def_tz = "TZ=CST6CDT";
if ((fp = fopen (fname, "r")) == NULL ||
fgets (tzbuf, sizeof (tzbuf), fp) == NULL) {

3
src/groupmems.c
View File

@ -126,7 +126,8 @@ static void rmfromgroup (char *user, char **members)
}
while (found && NULL != members[i]) {
members[i] = members[++i];
members[i] = members[i+1];
i++;
}
if (!found) {

7
src/login.c
View File

@ -348,6 +348,7 @@ int main (int argc, char **argv)
int retcode;
pid_t child;
char *pam_user;
char **ptr_pam_user = &pam_user;
#else
struct spwd *spwd = NULL;
#endif
@ -620,7 +621,7 @@ int main (int argc, char **argv)
/* if we didn't get a user on the command line,
set it to NULL */
pam_get_item (pamh, PAM_USER,
(const void **) &pam_user);
(const void **)ptr_pam_user);
if (pam_user[0] == '\0')
pam_set_item (pamh, PAM_USER, NULL);
@ -644,7 +645,7 @@ int main (int argc, char **argv)
retcode = pam_authenticate (pamh, 0);
pam_get_item (pamh, PAM_USER,
(const void **) &pam_user);
(const void **) ptr_pam_user);
if (pam_user && pam_user[0]) {
pwd = xgetpwnam(pam_user);
@ -737,7 +738,7 @@ int main (int argc, char **argv)
First get the username that we are actually using, though.
*/
retcode =
pam_get_item (pamh, PAM_USER, (const void **) &pam_user);
pam_get_item (pamh, PAM_USER, (const void **)ptr_pam_user);
setpwent ();
pwd = xgetpwnam (pam_user);
if (!pwd) {

8
src/newusers.c
View File

@ -116,11 +116,11 @@ static int add_group (const char *name, const char *gid, gid_t * ngid)
if (gid[0] == '\0') {
i = 100;
for (pw_rewind (); (pwd = pw_next ());) {
if (pwd->pw_uid >= i)
if (pwd->pw_uid >= (unsigned int)i)
i = pwd->pw_uid + 1;
}
for (gr_rewind (); (grp = gr_next ());) {
if (grp->gr_gid == i) {
if (grp->gr_gid == (unsigned int)i) {
i = -1;
break;
}
@ -133,7 +133,7 @@ static int add_group (const char *name, const char *gid, gid_t * ngid)
*/
i = atoi (gid);
for (gr_rewind (); (grp = gr_next ());)
if (grp->gr_gid == i)
if (grp->gr_gid == (unsigned int)i)
goto add_member;
} else
/*
@ -149,7 +149,7 @@ static int add_group (const char *name, const char *gid, gid_t * ngid)
*/
if (i == -1) {
for (i = 100, gr_rewind (); (grp = gr_next ());)
if (grp->gr_gid >= i)
if (grp->gr_gid >= (unsigned int)i)
i = grp->gr_gid + 1;
}

2
src/nologin.c
View File

@ -30,7 +30,7 @@
#include <unistd.h>
#include "exitcodes.h"
int main (int argc, char **argv)
int main ()
{
const char *user, *tty;