From aa9b1ed0f8bde2815c212ada6797bc953c341a8c Mon Sep 17 00:00:00 2001 From: jmarcus Date: Thu, 28 Feb 2002 21:20:39 +0000 Subject: [PATCH] Sanitized some LOG messages. MFH in: 2 days --- etc/afpd/afp_asp.c | 5 +++-- etc/afpd/auth.c | 4 ++-- etc/afpd/filedir.c | 6 +++--- etc/afpd/messages.c | 9 +++++---- etc/afpd/quota.c | 8 ++++---- etc/afpd/uid.c | 18 +++++++++--------- etc/afpd/unix.c | 8 ++++---- 7 files changed, 30 insertions(+), 28 deletions(-) diff --git a/etc/afpd/afp_asp.c b/etc/afpd/afp_asp.c index 86f98799..766a7c74 100644 --- a/etc/afpd/afp_asp.c +++ b/etc/afpd/afp_asp.c @@ -1,5 +1,5 @@ /* - * $Id: afp_asp.c,v 1.11 2002-02-02 21:08:21 jmarcus Exp $ + * $Id: afp_asp.c,v 1.12 2002-02-28 21:20:39 jmarcus Exp $ * * Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu) * Copyright (c) 1990,1993 Regents of The University of Michigan. @@ -173,7 +173,8 @@ void afp_over_asp(AFPObj *obj) #ifdef AFS if ( writtenfork ) { if ( flushfork( writtenfork ) < 0 ) { - LOG(log_error, logtype_default, "main flushfork: %m" ); + LOG(log_error, logtype_default, "main flushfork: %s", + strerror(errno)); } writtenfork = NULL; } diff --git a/etc/afpd/auth.c b/etc/afpd/auth.c index 8424951e..d2bae134 100644 --- a/etc/afpd/auth.c +++ b/etc/afpd/auth.c @@ -1,5 +1,5 @@ /* - * $Id: auth.c,v 1.24 2002-01-24 16:31:20 jmarcus Exp $ + * $Id: auth.c,v 1.25 2002-02-28 21:20:39 jmarcus Exp $ * * Copyright (c) 1990,1993 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. @@ -264,7 +264,7 @@ static int login(AFPObj *obj, struct passwd *pwd, void (*logout)(void)) inet_ntoa( dsi->client.sin_addr ) ); if (setegid( pwd->pw_gid ) < 0 || seteuid( pwd->pw_uid ) < 0) { - LOG(log_error, logtype_default, "login: %m" ); + LOG(log_error, logtype_default, "login: %s", strerror(errno) ); return AFPERR_BADUAM; } } diff --git a/etc/afpd/filedir.c b/etc/afpd/filedir.c index 3b7d2468..84bb49a1 100644 --- a/etc/afpd/filedir.c +++ b/etc/afpd/filedir.c @@ -1,5 +1,5 @@ /* - * $Id: filedir.c,v 1.21 2002-01-19 21:29:55 jmarcus Exp $ + * $Id: filedir.c,v 1.22 2002-02-28 21:20:39 jmarcus Exp $ * * Copyright (c) 1990,1993 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. @@ -100,7 +100,7 @@ more information */ upath, strerror(errno)); return (AFPERR_ACCESS); } - if (chmod(upath,(st.st_mode&0777&~default_options.umask)| S_IRGRP| S_IROTH) < 0) + if (chmod(upath,(st.st_mode&0xFFFF&~default_options.umask)| S_IRGRP| S_IROTH) < 0) { LOG(log_error, logtype_default, "matchfile2dirperms: Error adding file read permissions: %s", @@ -120,7 +120,7 @@ more information */ adpath, strerror(errno)); return (AFPERR_ACCESS); } - if (chmod(adpath, (st.st_mode&0777&~default_options.umask)| S_IRGRP| S_IROTH) < 0) + if (chmod(adpath, (st.st_mode&0xFFFF&~default_options.umask)| S_IRGRP| S_IROTH) < 0) { LOG(log_error, logtype_default, "matchfile2dirperms: Error adding AD file read permissions: %s", diff --git a/etc/afpd/messages.c b/etc/afpd/messages.c index 403a8493..28f17d64 100644 --- a/etc/afpd/messages.c +++ b/etc/afpd/messages.c @@ -1,5 +1,5 @@ /* - * $Id: messages.c,v 1.13 2002-01-04 04:45:47 sibaz Exp $ + * $Id: messages.c,v 1.14 2002-02-28 21:20:39 jmarcus Exp $ * * Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu) * All Rights Reserved. See COPYRIGHT. @@ -71,18 +71,19 @@ void readmessage(void) /* Delete will probably fail otherwise, but let's try anyways */ euid = geteuid(); if (seteuid(0) < 0) { - LOG(log_error, logtype_default, "Could not switch back to root: %m"); + LOG(log_error, logtype_default, "Could not switch back to root: %s", + strerror(errno)); } rc = unlink(filename); /* Drop privs again, failing this is very bad */ if (seteuid(euid) < 0) { - LOG(log_error, logtype_default, "Could not switch back to uid %d: %m", euid); + LOG(log_error, logtype_default, "Could not switch back to uid %d: %s", euid, strerror(errno)); } if (rc < 0) { - LOG(log_error, logtype_default, "Error deleting %s: %m", filename); + LOG(log_error, logtype_default, "Error deleting %s: %s", filename, strerror(rc)); } #ifdef DEBUG else { diff --git a/etc/afpd/quota.c b/etc/afpd/quota.c index 0596d7c7..b3c6b954 100644 --- a/etc/afpd/quota.c +++ b/etc/afpd/quota.c @@ -1,5 +1,5 @@ /* - * $Id: quota.c,v 1.19 2002-02-03 05:01:09 jmarcus Exp $ + * $Id: quota.c,v 1.20 2002-02-28 21:20:39 jmarcus Exp $ * * Copyright (c) 1990,1993 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. @@ -115,7 +115,7 @@ int *nfs; static struct fs_data fsd; if ( getmnt(0, &fsd, 0, STAT_ONE, file ) < 0 ) { - LOG(log_info, logtype_default, "special: getmnt %s: %m", file ); + LOG(log_info, logtype_default, "special: getmnt %s: %s", file, strerror(errno) ); return( NULL ); } @@ -316,7 +316,7 @@ const u_int32_t bsize; if (vol->v_nfs) { if (( vol->v_gvs = (char *)malloc( strlen( p ) + 1 )) == NULL ) { - LOG(log_error, logtype_default, "getquota: malloc: %m" ); + LOG(log_error, logtype_default, "getquota: malloc: %s", strerror(errno) ); return AFPERR_MISC; } strcpy( vol->v_gvs, p ); @@ -324,7 +324,7 @@ const u_int32_t bsize; } else { sprintf( buf, "%s/quotas", p ); if (( vol->v_qfd = open( buf, O_RDONLY, 0 )) < 0 ) { - LOG(log_info, logtype_default, "open %s: %m", buf ); + LOG(log_info, logtype_default, "open %s: %s", buf, strerror(errno) ); return( AFPERR_PARAM ); } } diff --git a/etc/afpd/uid.c b/etc/afpd/uid.c index 5173c32b..73a1eac5 100644 --- a/etc/afpd/uid.c +++ b/etc/afpd/uid.c @@ -1,5 +1,5 @@ /* - * $Id: uid.c,v 1.9 2002-01-19 21:29:55 jmarcus Exp $ + * $Id: uid.c,v 1.10 2002-02-28 21:20:39 jmarcus Exp $ * code: jeff@univrel.pr.uconn.edu * * These functions are abstracted here, so that all calls for resolving @@ -42,11 +42,11 @@ void restore_uidgid ( pair ) uidgidset **pair; { if ( seteuid ( (*pair)->uid ) < 0 ) - LOG(log_error, logtype_default, "restore_uidgid: unable to seteuid '%s': %m", - (*pair)->uid ); + LOG(log_error, logtype_default, "restore_uidgid: unable to seteuid '%s': %s", + (*pair)->uid, strerror(errno) ); if ( setegid ( (*pair)->gid ) < 0 ) - LOG(log_error, logtype_default, "restore_uidgid: unable to setegid '%s': %m", - (*pair)->gid ); + LOG(log_error, logtype_default, "restore_uidgid: unable to setegid '%s': %s", + (*pair)->gid, strerror(errno) ); } /* end function void restore_uidgid ( pair ) */ void set_uidgid ( this_volume ) @@ -57,15 +57,15 @@ const struct vol *this_volume; /* check to see if we have to switch users */ if ( uid = user_to_uid ( (this_volume)->v_forceuid ) ) { if ( seteuid ( uid ) < 0 ) - LOG(log_error, logtype_default, "set_uidgid: unable to seteuid '%s': %m", - (this_volume)->v_forceuid ); + LOG(log_error, logtype_default, "set_uidgid: unable to seteuid '%s': %s", + (this_volume)->v_forceuid, strerror(errno) ); } /* end of checking for (this_volume)->v_forceuid */ /* check to see if we have to switch groups */ if ( gid = group_to_gid ( (this_volume)->v_forcegid ) ) { if ( seteuid ( gid ) < 0 ) - LOG(log_error, logtype_default, "set_uidgid: unable to setegid '%s': %m", - (this_volume)->v_forcegid ); + LOG(log_error, logtype_default, "set_uidgid: unable to setegid '%s': %s", + (this_volume)->v_forcegid, strerror(errno) ); } /* end of checking for (this_volume)->v_forcegid */ } /* end function void set_uidgid ( username, group ) */ diff --git a/etc/afpd/unix.c b/etc/afpd/unix.c index 9f1b5a74..619f7064 100644 --- a/etc/afpd/unix.c +++ b/etc/afpd/unix.c @@ -1,5 +1,5 @@ /* - * $Id: unix.c,v 1.29 2002-01-19 21:29:55 jmarcus Exp $ + * $Id: unix.c,v 1.30 2002-02-28 21:20:39 jmarcus Exp $ * * Copyright (c) 1990,1993 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. @@ -232,14 +232,14 @@ const int dropbox; else { /* if S_IWOTH and not S_IROTH */ uid=geteuid(); if ( seteuid(0) < 0) { - LOG(log_error, logtype_default, "stickydirmode: unable to seteuid root: %m"); + LOG(log_error, logtype_default, "stickydirmode: unable to seteuid root: %s", strerror(errno)); } if ( retval=chmod( name, ( (DIRBITS | mode | S_ISVTX) & 0777 & ~default_options.umask) ) < 0) { - LOG(log_error, logtype_default, "stickydirmode: chmod \"%s\": %m", name ); + LOG(log_error, logtype_default, "stickydirmode: chmod \"%s\": %s", name, strerror(retval) ); return(AFPERR_ACCESS); } else { #ifdef DEBUG - LOG(log_info, logtype_default, "stickydirmode: (debug) chmod \"%s\": %m", name ); + LOG(log_info, logtype_default, "stickydirmode: (debug) chmod \"%s\": %s", name, strerror(retval) ); #endif /* DEBUG */ seteuid(uid); } /* end getting retval */ -- 2.39.2