From: sibaz Date: Thu, 3 Jan 2002 17:29:10 +0000 (+0000) Subject: altered the layout of code calling syslog witha space to conform with the rest of... X-Git-Tag: point-backport-1-5-1~6 X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=commitdiff_plain;h=73eced85d8e37bac86d2c424d52bd27c245b26cc altered the layout of code calling syslog witha space to conform with the rest of the code which calls it wihout (syslog( rather than syslog ( ) --- diff --git a/etc/afpd/afp_dsi.c b/etc/afpd/afp_dsi.c index 68e33b76..65697409 100644 --- a/etc/afpd/afp_dsi.c +++ b/etc/afpd/afp_dsi.c @@ -1,5 +1,5 @@ /* - * $Id: afp_dsi.c,v 1.14 2001-12-23 01:19:55 jmarcus Exp $ + * $Id: afp_dsi.c,v 1.15 2002-01-03 17:29:10 sibaz Exp $ * * Copyright (c) 1999 Adrian Sun (asun@zoology.washington.edu) * Copyright (c) 1990,1993 Regents of The University of Michigan. @@ -72,7 +72,7 @@ static void afp_dsi_die(int sig) afp_dsi_close(child.obj); if (sig) /* if no signal, assume dieing because logins are disabled & don't log it (maintenance mode)*/ - syslog (LOG_INFO, "Connection terminated"); + syslog(LOG_INFO, "Connection terminated"); if (sig == SIGTERM || sig == SIGALRM) { exit( 0 ); } diff --git a/etc/afpd/auth.c b/etc/afpd/auth.c index 3b5177d4..c54e8224 100644 --- a/etc/afpd/auth.c +++ b/etc/afpd/auth.c @@ -1,5 +1,5 @@ /* - * $Id: auth.c,v 1.20 2001-12-03 05:03:38 jmarcus Exp $ + * $Id: auth.c,v 1.21 2002-01-03 17:29:10 sibaz Exp $ * * Copyright (c) 1990,1993 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. @@ -178,7 +178,7 @@ static int login(AFPObj *obj, struct passwd *pwd, void (*logout)(void)) sprintf(nodename, "%s/net%d.%dnode%d", obj->options.authprintdir, addr_net / 256, addr_net % 256, addr_node); - syslog (LOG_INFO, "registering %s (uid %d) on %u.%u as %s", + syslog(LOG_INFO, "registering %s (uid %d) on %u.%u as %s", pwd->pw_name, pwd->pw_uid, addr_net, addr_node, nodename); if (stat(nodename, &stat_buf) == 0) { /* file exists */ diff --git a/etc/afpd/file.c b/etc/afpd/file.c index 9a65b75f..54d44cd5 100644 --- a/etc/afpd/file.c +++ b/etc/afpd/file.c @@ -1,5 +1,5 @@ /* - * $Id: file.c,v 1.32 2002-01-02 21:14:10 srittau Exp $ + * $Id: file.c,v 1.33 2002-01-03 17:29:10 sibaz Exp $ * * Copyright (c) 1990,1993 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. @@ -761,7 +761,7 @@ const int noadouble; /* existence check moved to afp_moveandrename */ #ifdef DEBUG - syslog (LOG_INFO, "begin renamefile:"); + syslog(LOG_INFO, "begin renamefile:"); #endif /* DEBUG */ if ( rename( src, dst ) < 0 ) { @@ -832,7 +832,7 @@ rename_retry: ad_close( &ad, ADFLAGS_HF ); #ifdef DEBUG - syslog (LOG_INFO, "end renamefile:"); + syslog(LOG_INFO, "end renamefile:"); #endif /* DEBUG */ return( AFP_OK ); @@ -851,7 +851,7 @@ int ibuflen, *rbuflen; u_int16_t svid, dvid; #ifdef DEBUG - syslog (LOG_INFO, "begin afp_copyfile:"); + syslog(LOG_INFO, "begin afp_copyfile:"); #endif /* DEBUG */ *rbuflen = 0; @@ -935,7 +935,7 @@ int ibuflen, *rbuflen; #endif /* DROPKLUDGE */ #ifdef DEBUG - syslog (LOG_INFO, "end afp_copyfile:"); + syslog(LOG_INFO, "end afp_copyfile:"); #endif /* DEBUG */ return( retvalue ); diff --git a/etc/afpd/filedir.c b/etc/afpd/filedir.c index 1e1c7c99..818a5c2c 100644 --- a/etc/afpd/filedir.c +++ b/etc/afpd/filedir.c @@ -1,5 +1,5 @@ /* - * $Id: filedir.c,v 1.17 2002-01-02 21:14:10 srittau Exp $ + * $Id: filedir.c,v 1.18 2002-01-03 17:29:10 sibaz Exp $ * * Copyright (c) 1990,1993 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. @@ -71,7 +71,7 @@ more information */ int uid; #ifdef DEBUG - syslog (LOG_INFO, "begin matchfile2dirperms:"); + syslog(LOG_INFO, "begin matchfile2dirperms:"); #endif /* DEBUG */ if (stat(upath, &st ) < 0) @@ -79,11 +79,11 @@ more information */ strcpy (adpath, "./.AppleDouble/"); strcat (adpath, upath); if (( dir = dirsearch( vol, did )) == NULL ) { - syslog (LOG_ERR, "matchfile2dirperms: Unable to get directory info."); + syslog(LOG_ERR, "matchfile2dirperms: Unable to get directory info."); return( AFPERR_NOOBJ ); } else if (stat(".", &sb) < 0) { - syslog (LOG_ERR, + syslog(LOG_ERR, "matchfile2dirperms: Error checking directory \"%s\": %s", dir->d_name, strerror(errno)); return(AFPERR_NOOBJ ); @@ -95,54 +95,54 @@ more information */ seteuid(0); if (lchown(upath, sb.st_uid, sb.st_gid) < 0) { - syslog (LOG_ERR, + syslog(LOG_ERR, "matchfile2dirperms: Error changing owner/gid of %s: %s", upath, strerror(errno)); return (AFPERR_ACCESS); } if (chmod(upath,(st.st_mode&0777&~default_options.umask)| S_IRGRP| S_IROTH) < 0) { - syslog (LOG_ERR, + syslog(LOG_ERR, "matchfile2dirperms: Error adding file read permissions: %s", strerror(errno)); return (AFPERR_ACCESS); } #ifdef DEBUG else - syslog (LOG_INFO, + syslog(LOG_INFO, "matchfile2dirperms: Added S_IRGRP and S_IROTH: %s", strerror(errno)); #endif /* DEBUG */ if (lchown(adpath, sb.st_uid, sb.st_gid) < 0) { - syslog (LOG_ERR, + syslog(LOG_ERR, "matchfile2dirperms: Error changing AppleDouble owner/gid %s: %s", adpath, strerror(errno)); return (AFPERR_ACCESS); } if (chmod(adpath, (st.st_mode&0777&~default_options.umask)| S_IRGRP| S_IROTH) < 0) { - syslog (LOG_ERR, + syslog(LOG_ERR, "matchfile2dirperms: Error adding AD file read permissions: %s", strerror(errno)); return (AFPERR_ACCESS); } #ifdef DEBUG else - syslog (LOG_INFO, + syslog(LOG_INFO, "matchfile2dirperms: Added S_IRGRP and S_IROTH to AD: %s", strerror(errno)); #endif /* DEBUG */ } #ifdef DEBUG else - syslog (LOG_INFO, + syslog(LOG_INFO, "matchfile2dirperms: No ownership change necessary."); #endif /* DEBUG */ } /* end else if stat success */ seteuid(uid); /* Restore process ownership to normal */ #ifdef DEBUG - syslog (LOG_INFO, "end matchfile2dirperms:"); + syslog(LOG_INFO, "end matchfile2dirperms:"); #endif /* DEBUG */ return (AFP_OK); diff --git a/etc/afpd/messages.c b/etc/afpd/messages.c index 5b1a3387..f371d959 100644 --- a/etc/afpd/messages.c +++ b/etc/afpd/messages.c @@ -1,5 +1,5 @@ /* - * $Id: messages.c,v 1.11 2001-12-10 20:16:54 srittau Exp $ + * $Id: messages.c,v 1.12 2002-01-03 17:29:10 sibaz Exp $ * * Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu) * All Rights Reserved. See COPYRIGHT. @@ -45,12 +45,12 @@ void readmessage(void) sprintf(filename, "%s/message.%d", SERVERTEXT, getpid()); #ifdef DEBUG - syslog (LOG_DEBUG, "Reading file %s ", filename); + syslog(LOG_DEBUG, "Reading file %s ", filename); #endif /* DEBUG */ message=fopen(filename, "r"); if (message==NULL) { - syslog (LOG_INFO, "Unable to open file %s", filename); + syslog(LOG_INFO, "Unable to open file %s", filename); sprintf(filename, "%s/message", SERVERTEXT); message=fopen(filename, "r"); } @@ -82,14 +82,14 @@ void readmessage(void) } if (rc < 0) { - syslog (LOG_ERR, "Error deleting %s: %m", filename); + syslog(LOG_ERR, "Error deleting %s: %m", filename); } #ifdef DEBUG else { - syslog (LOG_INFO, "Deleted %s", filename); + syslog(LOG_INFO, "Deleted %s", filename); } - syslog (LOG_INFO, "Set server message to \"%s\"", servermesg); + syslog(LOG_INFO, "Set server message to \"%s\"", servermesg); #endif /* DEBUG */ } free(filename); diff --git a/etc/afpd/uid.c b/etc/afpd/uid.c index 4db2ce33..7ee42340 100644 --- a/etc/afpd/uid.c +++ b/etc/afpd/uid.c @@ -1,5 +1,5 @@ /* - * $Id: uid.c,v 1.6 2001-12-03 05:03:38 jmarcus Exp $ + * $Id: uid.c,v 1.7 2002-01-03 17:29:10 sibaz Exp $ * code: jeff@univrel.pr.uconn.edu * * These functions are abstracted here, so that all calls for resolving @@ -42,10 +42,10 @@ void restore_uidgid ( pair ) uidgidset **pair; { if ( seteuid ( (*pair)->uid ) < 0 ) - syslog ( LOG_ERR, "restore_uidgid: unable to seteuid '%s': %m", + syslog( LOG_ERR, "restore_uidgid: unable to seteuid '%s': %m", (*pair)->uid ); if ( setegid ( (*pair)->gid ) < 0 ) - syslog ( LOG_ERR, "restore_uidgid: unable to setegid '%s': %m", + syslog( LOG_ERR, "restore_uidgid: unable to setegid '%s': %m", (*pair)->gid ); } /* end function void restore_uidgid ( pair ) */ @@ -57,14 +57,14 @@ 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 ) - syslog ( LOG_ERR, "set_uidgid: unable to seteuid '%s': %m", + syslog( LOG_ERR, "set_uidgid: unable to seteuid '%s': %m", (this_volume)->v_forceuid ); } /* 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 ) - syslog ( LOG_ERR, "set_uidgid: unable to setegid '%s': %m", + syslog( LOG_ERR, "set_uidgid: unable to setegid '%s': %m", (this_volume)->v_forcegid ); } /* end of checking for (this_volume)->v_forcegid */ diff --git a/libatalk/adouble/ad_open.c b/libatalk/adouble/ad_open.c index 62154c7d..35875140 100644 --- a/libatalk/adouble/ad_open.c +++ b/libatalk/adouble/ad_open.c @@ -1,5 +1,5 @@ /* - * $Id: ad_open.c,v 1.10 2001-08-15 02:17:06 srittau Exp $ + * $Id: ad_open.c,v 1.11 2002-01-03 17:29:12 sibaz Exp $ * * Copyright (c) 1999 Adrian Sun (asun@u.washington.edu) * Copyright (c) 1990,1991 Regents of The University of Michigan. @@ -576,7 +576,7 @@ ad_mkdir( path, mode ) int mode; { #ifdef DEBUG - syslog (LOG_INFO, "ad_mkdir: Creating directory with mode %d", mode); + syslog(LOG_INFO, "ad_mkdir: Creating directory with mode %d", mode); #endif /* DEBUG */ return mkdir( path, ad_mode( path, mode ) ); }