s/sprintf/snprintf

[ngircd.git] / src / ngircd / log.c

diff --git a/src/ngircd/log.c b/src/ngircd/log.c
index 62113f11e77ca6435a4afdb6d1844395380cab67..6bc9250a8edf8e7af197b1a62ed520253387cea6 100644 (file)
--- a/src/ngircd/log.c
+++ b/src/ngircd/log.c
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: log.c,v 1.53 2005/03/19 18:43:49 fw Exp $";
+static char UNUSED id[] = "$Id: log.c,v 1.55 2005/06/17 19:16:53 fw Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -58,6 +58,12 @@ GLOBAL void
 Log_Init( void )
 {
 #ifdef SYSLOG
+#ifndef LOG_CONS       /* Kludge: mips-dec-ultrix4.5 has no LOG_CONS/LOG_LOCAL5 */
+#define LOG_CONS 0
+#endif
+#ifndef LOG_LOCAL5
+#define LOG_LOCAL5 0
+#endif
        /* Syslog initialisieren */
        openlog( PACKAGE_NAME, LOG_CONS|LOG_PID, LOG_LOCAL5 );
 #endif
@@ -70,24 +76,24 @@ Log_Init( void )
 #ifdef DEBUG
        if( NGIRCd_Debug )
        {
-               strcpy( Init_Txt, "debug-mode" );
+               strlcpy( Init_Txt, "debug-mode", sizeof Init_Txt );
        }
 #endif
        if( NGIRCd_NoDaemon )
        {
-               if( Init_Txt[0] ) strcat( Init_Txt, ", " );
-               strcat( Init_Txt, "no-daemon-mode" );
+               if( Init_Txt[0] ) strlcat( Init_Txt, ", ", sizeof Init_Txt );
+               strlcat( Init_Txt, "no-daemon-mode", sizeof Init_Txt );
        }
        if( NGIRCd_Passive )
        {
-               if( Init_Txt[0] ) strcat( Init_Txt, ", " );
-               strcat( Init_Txt, "passive-mode" );
+               if( Init_Txt[0] ) strlcat( Init_Txt, ", ", sizeof Init_Txt );
+               strlcat( Init_Txt, "passive-mode", sizeof Init_Txt );
        }
 #ifdef SNIFFER
        if( NGIRCd_Sniffer )
        {
-               if( Init_Txt[0] ) strcat( Init_Txt, ", " );
-               strcat( Init_Txt, "network sniffer" );
+               if( Init_Txt[0] ) strlcat( Init_Txt, ", ", sizeof Init_Txt );
+               strlcat( Init_Txt, "network sniffer", sizeof Init_Txt );
        }
 #endif
        if( Init_Txt[0] ) Log( LOG_INFO, "Activating: %s.", Init_Txt );
@@ -107,7 +113,7 @@ Log_InitErrorfile( void )
         * landen z.B. alle Ausgaben von assert()-Aufrufen. */
 
        /* Dateiname zusammen bauen */
-       sprintf( Error_File, "%s/%s-%ld.err", ERROR_DIR, PACKAGE_NAME, (long)getpid( ));
+       snprintf( Error_File, sizeof Error_File, "%s/%s-%ld.err", ERROR_DIR, PACKAGE_NAME, (long)getpid( ));
 
        /* stderr umlenken */
        fflush( stderr );