ngIRCd GIT Updates

ngircd-commits@lists.barton.de

2442 Diskussionen

Alexander Barton : Conn_SetPenalty(): Add new "penalty time" on each function call
by alex＠arthur.barton.de 04 Jan '12

04 Jan '12

Module: ngircd.git Branch: master Commit: b24d645ca183194b0158cd7bba1e0c1f468a7de9 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b24d645c… Author: Alexander Barton <alex(a)barton.de> Date: Wed Jan 4 21:39:46 2012 +0100 Conn_SetPenalty(): Add new "penalty time" on each function call Until now, the penalty time has only been set when longer as the already set one, so it didn't accumulate. And add documentation for and clean up code in Conn_SetPenalty() and Conn_ResetPenalty() functions. --- src/ngircd/conn-func.c | 51 +++++++++++++++++++++++++++++++++-------------- 1 files changed, 36 insertions(+), 15 deletions(-) diff --git a/src/ngircd/conn-func.c b/src/ngircd/conn-func.c index 8b0b6f7..32001f0 100644 --- a/src/ngircd/conn-func.c +++ b/src/ngircd/conn-func.c @@ -65,35 +65,56 @@ Conn_LastPing( CONN_ID Idx ) } /* Conn_LastPing */ +/** + * Add "penalty time" for a connection. + * + * During the "penalty time" the socket is ignored completely, no new data + * is read. This function only increases the penalty, it is not possible to + * decrease the penalty time. + * + * @param Idex Connection index. + * @param Seconds Seconds to add. + * @see Conn_ResetPenalty + */ GLOBAL void -Conn_SetPenalty( CONN_ID Idx, time_t Seconds ) +Conn_SetPenalty(CONN_ID Idx, time_t Seconds) { - /* set Penalty-Delay for a socket. - * during the penalty, the socket is ignored completely, no new - * data is read. This function only increases the penalty, it is - * not possible to decrease the penalty time. - */ time_t t; - - assert( Idx > NONE ); - assert( Seconds >= 0 ); - t = time( NULL ) + Seconds; - if (t > My_Connections[Idx].delaytime) + assert(Idx > NONE); + assert(Seconds >= 0); + + t = time(NULL); + if (My_Connections[Idx].delaytime < t) My_Connections[Idx].delaytime = t; + My_Connections[Idx].delaytime += Seconds; + #ifdef DEBUG - Log(LOG_DEBUG, "Add penalty time on connection %d: %ld second(s).", - Idx, (long)Seconds); + Log(LOG_DEBUG, + "Add penalty time on connection %d: %ld second%s, total %ld second%s.", + Idx, (long)Seconds, Seconds != 1 ? "s" : "", + My_Connections[Idx].delaytime - t, + My_Connections[Idx].delaytime - t != 1 ? "s" : ""); #endif } /* Conn_SetPenalty */ +/** + * Reset the "penalty time" for one connection. + * + * @param Idx Connection index. + * @see Conn_SetPenalty + */ GLOBAL void -Conn_ResetPenalty( CONN_ID Idx ) +Conn_ResetPenalty(CONN_ID Idx) { - assert( Idx > NONE ); + assert(Idx > NONE); + My_Connections[Idx].delaytime = 0; +#ifdef DEBUG + Log(LOG_DEBUG, "Penalty time on connection %d has been reset."); +#endif } /* Conn_ResetPenalty */

1 0

Alexander Barton : main(): Code cleanup
by alex＠arthur.barton.de 03 Jan '12

03 Jan '12

Module: ngircd.git Branch: master Commit: 9069380ddfe8f1cf92ad711fbf050d2d65242091 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=9069380d… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jan 3 19:25:31 2012 +0100 main(): Code cleanup --- src/ngircd/ngircd.c | 193 +++++++++++++++++++++++++-------------------------- 1 files changed, 96 insertions(+), 97 deletions(-) diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index a1f1d88..e8370a1 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -74,12 +74,12 @@ static bool NGIRCd_Init PARAMS(( bool )); * Here all starts: this function is called by the operating system loader, * it is the first portion of code executed of ngIRCd. * - * @param argc The number of arguments passed to ngIRCd on the command line. - * @param argv An array containing all the arguments passed to ngIRCd. - * @return Global exit code of ngIRCd, zero on success. + * @param argc The number of arguments passed to ngIRCd on the command line. + * @param argv An array containing all the arguments passed to ngIRCd. + * @return Global exit code of ngIRCd, zero on success. */ GLOBAL int -main( int argc, const char *argv[] ) +main(int argc, const char *argv[]) { bool ok, configtest = false; bool NGIRCd_NoDaemon = false; @@ -92,7 +92,7 @@ main( int argc, const char *argv[] ) mtrace(); #endif - umask( 0077 ); + umask(0077); NGIRCd_SignalQuit = NGIRCd_SignalRestart = false; NGIRCd_Passive = false; @@ -102,75 +102,62 @@ main( int argc, const char *argv[] ) #ifdef SNIFFER NGIRCd_Sniffer = false; #endif - strlcpy( NGIRCd_ConfFile, SYSCONFDIR, sizeof( NGIRCd_ConfFile )); - strlcat( NGIRCd_ConfFile, CONFIG_FILE, sizeof( NGIRCd_ConfFile )); + strlcpy(NGIRCd_ConfFile, SYSCONFDIR, sizeof(NGIRCd_ConfFile)); + strlcat(NGIRCd_ConfFile, CONFIG_FILE, sizeof(NGIRCd_ConfFile)); - Fill_Version( ); + Fill_Version(); /* parse conmmand line */ - for( i = 1; i < argc; i++ ) - { + for (i = 1; i < argc; i++) { ok = false; - if(( argv[i][0] == '-' ) && ( argv[i][1] == '-' )) - { + if (argv[i][0] == '-' && argv[i][1] == '-') { /* long option */ - if( strcmp( argv[i], "--config" ) == 0 ) - { - if( i + 1 < argc ) - { + if (strcmp(argv[i], "--config") == 0) { + if (i + 1 < argc) { /* Ok, there's an parameter left */ - strlcpy( NGIRCd_ConfFile, argv[i + 1], sizeof( NGIRCd_ConfFile )); - + strlcpy(NGIRCd_ConfFile, argv[i+1], + sizeof(NGIRCd_ConfFile)); /* next parameter */ i++; ok = true; } } - if( strcmp( argv[i], "--configtest" ) == 0 ) - { + if (strcmp(argv[i], "--configtest") == 0) { configtest = true; ok = true; } #ifdef DEBUG - if( strcmp( argv[i], "--debug" ) == 0 ) - { + if (strcmp(argv[i], "--debug") == 0) { NGIRCd_Debug = true; ok = true; } #endif - if( strcmp( argv[i], "--help" ) == 0 ) - { - Show_Version( ); - puts( "" ); Show_Help( ); puts( "" ); - exit( 1 ); + if (strcmp(argv[i], "--help") == 0) { + Show_Version(); + puts(""); Show_Help( ); puts( "" ); + exit(1); } - if( strcmp( argv[i], "--nodaemon" ) == 0 ) - { + if (strcmp(argv[i], "--nodaemon") == 0) { NGIRCd_NoDaemon = true; ok = true; } - if( strcmp( argv[i], "--passive" ) == 0 ) - { + if (strcmp(argv[i], "--passive") == 0) { NGIRCd_Passive = true; ok = true; } #ifdef SNIFFER - if( strcmp( argv[i], "--sniffer" ) == 0 ) - { + if (strcmp(argv[i], "--sniffer") == 0) { NGIRCd_Sniffer = true; ok = true; } #endif - if( strcmp( argv[i], "--version" ) == 0 ) - { - Show_Version( ); - exit( 1 ); + if (strcmp(argv[i], "--version") == 0) { + Show_Version(); + exit(1); } } - else if(( argv[i][0] == '-' ) && ( argv[i][1] != '-' )) - { + else if(argv[i][0] == '-' && argv[i][1] != '-') { /* short option */ - for( n = 1; n < strlen( argv[i] ); n++ ) - { + for (n = 1; n < strlen(argv[i]); n++) { ok = false; #ifdef DEBUG if (argv[i][n] == 'd') { @@ -179,14 +166,14 @@ main( int argc, const char *argv[] ) } #endif if (argv[i][n] == 'f') { - if(( ! argv[i][n + 1] ) && ( i + 1 < argc )) - { + if (!argv[i][n+1] && i+1 < argc) { /* Ok, next character is a blank */ - strlcpy( NGIRCd_ConfFile, argv[i + 1], sizeof( NGIRCd_ConfFile )); + strlcpy(NGIRCd_ConfFile, argv[i+1], + sizeof(NGIRCd_ConfFile)); /* go to the following parameter */ i++; - n = strlen( argv[i] ); + n = strlen(argv[i]); ok = true; } } @@ -221,46 +208,49 @@ main( int argc, const char *argv[] ) exit(1); } - if (! ok) { - printf( "%s: invalid option \"-%c\"!\n", PACKAGE_NAME, argv[i][n] ); - printf( "Try \"%s --help\" for more information.\n", PACKAGE_NAME ); - exit( 1 ); + if (!ok) { + printf("%s: invalid option \"-%c\"!\n", + PACKAGE_NAME, argv[i][n]); + printf("Try \"%s --help\" for more information.\n", + PACKAGE_NAME); + exit(1); } } } - if( ! ok ) - { - printf( "%s: invalid option \"%s\"!\n", PACKAGE_NAME, argv[i] ); - printf( "Try \"%s --help\" for more information.\n", PACKAGE_NAME ); - exit( 1 ); + if (!ok) { + printf("%s: invalid option \"%s\"!\n", + PACKAGE_NAME, argv[i]); + printf("Try \"%s --help\" for more information.\n", + PACKAGE_NAME); + exit(1); } } /* Debug level for "VERSION" command */ NGIRCd_DebugLevel[0] = '\0'; #ifdef DEBUG - if( NGIRCd_Debug ) strcpy( NGIRCd_DebugLevel, "1" ); + if (NGIRCd_Debug) + strcpy(NGIRCd_DebugLevel, "1"); #endif #ifdef SNIFFER - if( NGIRCd_Sniffer ) - { + if (NGIRCd_Sniffer) { NGIRCd_Debug = true; - strcpy( NGIRCd_DebugLevel, "2" ); + strcpy(NGIRCd_DebugLevel, "2"); } #endif - if( configtest ) - { - Show_Version( ); puts( "" ); - exit( Conf_Test( )); + if (configtest) { + Show_Version(); puts(""); + exit(Conf_Test()); } - - while( ! NGIRCd_SignalQuit ) - { + + while (!NGIRCd_SignalQuit) { /* Initialize global variables */ - NGIRCd_Start = time( NULL ); - (void)strftime( NGIRCd_StartStr, 64, "%a %b %d %Y at %H:%M:%S (%Z)", localtime( &NGIRCd_Start )); + NGIRCd_Start = time(NULL); + (void)strftime(NGIRCd_StartStr, 64, + "%a %b %d %Y at %H:%M:%S (%Z)", + localtime(&NGIRCd_Start)); NGIRCd_SignalRestart = false; NGIRCd_SignalQuit = false; @@ -268,8 +258,8 @@ main( int argc, const char *argv[] ) Random_Init(); /* Initialize modules, part I */ - Log_Init( ! NGIRCd_NoDaemon ); - Conf_Init( ); + Log_Init(!NGIRCd_NoDaemon); + Conf_Init(); /* Initialize the "main program": chroot environment, user and * group ID, ... */ @@ -280,18 +270,22 @@ main( int argc, const char *argv[] ) /* Initialize modules, part II: these functions are eventually * called with already dropped privileges ... */ - Channel_Init( ); - Client_Init( ); - Conn_Init( ); - Class_Init( ); + Channel_Init(); + Client_Init(); + Conn_Init(); + Class_Init(); if (!io_library_init(CONNECTION_POOL)) { - Log(LOG_ALERT, "Fatal: Cannot initialize IO routines: %s", strerror(errno)); + Log(LOG_ALERT, + "Fatal: Could not initialize IO routines: %s", + strerror(errno)); exit(1); } if (!Signals_Init()) { - Log(LOG_ALERT, "Fatal: Could not set up signal handlers: %s", strerror(errno)); + Log(LOG_ALERT, + "Fatal: Could not set up signal handlers: %s", + strerror(errno)); exit(1); } @@ -299,40 +293,45 @@ main( int argc, const char *argv[] ) * used by ngIRCd in PASS commands and the known "extended * flags" are described in doc/Protocol.txt. */ #ifdef IRCPLUS - snprintf( NGIRCd_ProtoID, sizeof NGIRCd_ProtoID, "%s%s %s|%s:%s", PROTOVER, PROTOIRCPLUS, PACKAGE_NAME, PACKAGE_VERSION, IRCPLUSFLAGS ); + snprintf(NGIRCd_ProtoID, sizeof NGIRCd_ProtoID, "%s%s %s|%s:%s", + PROTOVER, PROTOIRCPLUS, PACKAGE_NAME, PACKAGE_VERSION, + IRCPLUSFLAGS); #ifdef ZLIB - strcat( NGIRCd_ProtoID, "Z" ); -#endif - if( Conf_OperCanMode ) strcat( NGIRCd_ProtoID, "o" ); -#else - snprintf( NGIRCd_ProtoID, sizeof NGIRCd_ProtoID, "%s%s %s|%s", PROTOVER, PROTOIRC, PACKAGE_NAME, PACKAGE_VERSION ); + strcat(NGIRCd_ProtoID, "Z"); #endif - strlcat( NGIRCd_ProtoID, " P", sizeof NGIRCd_ProtoID ); + if (Conf_OperCanMode) + strcat(NGIRCd_ProtoID, "o"); +#else /* IRCPLUS */ + snprintf(NGIRCd_ProtoID, sizeof NGIRCd_ProtoID, "%s%s %s|%s", + PROTOVER, PROTOIRC, PACKAGE_NAME, PACKAGE_VERSION); +#endif /* IRCPLUS */ + strlcat(NGIRCd_ProtoID, " P", sizeof NGIRCd_ProtoID); #ifdef ZLIB - strlcat( NGIRCd_ProtoID, "Z", sizeof NGIRCd_ProtoID ); + strlcat(NGIRCd_ProtoID, "Z", sizeof NGIRCd_ProtoID); #endif LogDebug("Protocol and server ID is \"%s\".", NGIRCd_ProtoID); - Channel_InitPredefined( ); + Channel_InitPredefined(); - if( Conn_InitListeners( ) < 1 ) - { - Log( LOG_ALERT, "Server isn't listening on a single port!" ); - Log( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE_NAME ); - Pidfile_Delete( ); - exit( 1 ); + if (Conn_InitListeners() < 1) { + Log(LOG_ALERT, + "Server isn't listening on a single port!" ); + Log(LOG_ALERT, + "%s exiting due to fatal errors!", PACKAGE_NAME); + Pidfile_Delete(); + exit(1); } /* Main Run Loop */ - Conn_Handler( ); + Conn_Handler(); - Conn_Exit( ); - Client_Exit( ); - Channel_Exit( ); - Class_Exit( ); - Log_Exit( ); + Conn_Exit(); + Client_Exit(); + Channel_Exit(); + Class_Exit(); + Log_Exit(); } - Pidfile_Delete( ); + Pidfile_Delete(); return 0; } /* main */

1 0

Alexander Barton : NGIRCd_Init(): Code cleanup
by alex＠arthur.barton.de 03 Jan '12

03 Jan '12

Module: ngircd.git Branch: master Commit: e4006a93e3999ce5ab9dc82b29ef7e01ac370948 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=e4006a93… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jan 3 19:34:54 2012 +0100 NGIRCd_Init(): Code cleanup --- src/ngircd/ngircd.c | 115 +++++++++++++++++++++++++++++---------------------- 1 files changed, 66 insertions(+), 49 deletions(-) diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index e8370a1..170a3cd 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -602,12 +602,12 @@ Random_Init(void) /** * Initialize ngIRCd daemon. * - * @param NGIRCd_NoDaemon Set to true if ngIRCd should run in the - * foreground and not as a daemon. - * @return true on success. + * @param NGIRCd_NoDaemon Set to true if ngIRCd should run in the + * foreground (and not as a daemon). + * @return true on success. */ static bool -NGIRCd_Init( bool NGIRCd_NoDaemon ) +NGIRCd_Init(bool NGIRCd_NoDaemon) { static bool initialized; bool chrooted = false; @@ -623,57 +623,70 @@ NGIRCd_Init( bool NGIRCd_NoDaemon ) /* open /dev/null before chroot() */ fd = open( "/dev/null", O_RDWR); if (fd < 0) - Log(LOG_WARNING, "Could not open /dev/null: %s", strerror(errno)); + Log(LOG_WARNING, "Could not open /dev/null: %s", + strerror(errno)); } + /* SSL initialization */ if (!ConnSSL_InitLibrary()) Log(LOG_WARNING, "Warning: Error during SSL initialization, continuing ..."); - if( Conf_Chroot[0] ) { - if( chdir( Conf_Chroot ) != 0 ) { - Log( LOG_ERR, "Can't chdir() in ChrootDir (%s): %s", Conf_Chroot, strerror( errno )); + /* Change root */ + if (Conf_Chroot[0]) { + if (chdir(Conf_Chroot) != 0) { + Log(LOG_ERR, "Can't chdir() in ChrootDir (%s): %s", + Conf_Chroot, strerror(errno)); goto out; } - if( chroot( Conf_Chroot ) != 0 ) { + if (chroot(Conf_Chroot) != 0) { if (errno != EPERM) { - Log( LOG_ERR, "Can't change root directory to \"%s\": %s", - Conf_Chroot, strerror( errno )); + Log(LOG_ERR, + "Can't change root directory to \"%s\": %s", + Conf_Chroot, strerror(errno)); goto out; } } else { chrooted = true; - Log( LOG_INFO, "Changed root and working directory to \"%s\".", Conf_Chroot ); + Log(LOG_INFO, + "Changed root and working directory to \"%s\".", + Conf_Chroot); } } + /* Check user ID */ if (Conf_UID == 0) { - Log(LOG_INFO, "ServerUID must not be 0, using \"nobody\" instead.", Conf_UID); - - if (! NGIRCd_getNobodyID(&Conf_UID, &Conf_GID)) { - Log(LOG_WARNING, "Could not get user/group ID of user \"nobody\": %s", - errno ? strerror(errno) : "not found" ); + Log(LOG_INFO, + "ServerUID must not be 0, using \"nobody\" instead.", + Conf_UID); + + if (!NGIRCd_getNobodyID(&Conf_UID, &Conf_GID)) { + Log(LOG_WARNING, + "Could not get user/group ID of user \"nobody\": %s", + errno ? strerror(errno) : "not found" ); goto out; } } + /* Change group ID */ if (getgid() != Conf_GID) { - /* Change group ID */ if (setgid(Conf_GID) != 0) { real_errno = errno; - Log( LOG_ERR, "Can't change group ID to %u: %s", Conf_GID, strerror( errno )); + Log(LOG_ERR, "Can't change group ID to %u: %s", + Conf_GID, strerror(errno)); if (real_errno != EPERM) goto out; } } + /* Change user ID */ if (getuid() != Conf_UID) { - /* Change user ID */ if (setuid(Conf_UID) != 0) { real_errno = errno; - Log(LOG_ERR, "Can't change user ID to %u: %s", Conf_UID, strerror(errno)); - if (real_errno != EPERM) + Log(LOG_ERR, "Can't change user ID to %u: %s", + Conf_UID, strerror(errno)); + if (real_errno != EPERM) goto out; } } @@ -683,26 +696,27 @@ NGIRCd_Init( bool NGIRCd_NoDaemon ) /* Normally a child process is forked which isn't any longer * connected to ther controlling terminal. Use "--nodaemon" * to disable this "daemon mode" (useful for debugging). */ - if ( ! NGIRCd_NoDaemon ) { - pid = fork( ); - if( pid > 0 ) { + if (!NGIRCd_NoDaemon) { + pid = fork(); + if (pid > 0) { /* "Old" process: exit. */ - exit( 0 ); + exit(0); } - if( pid < 0 ) { + if (pid < 0) { /* Error!? */ - fprintf( stderr, "%s: Can't fork: %s!\nFatal error, exiting now ...\n", - PACKAGE_NAME, strerror( errno )); - exit( 1 ); + fprintf(stderr, + "%s: Can't fork: %s!\nFatal error, exiting now ...\n", + PACKAGE_NAME, strerror(errno)); + exit(1); } /* New child process */ #ifndef NeXT - (void)setsid( ); + (void)setsid(); #else setpgrp(0, getpid()); #endif - if (chdir( "/" ) != 0) + if (chdir("/") != 0) Log(LOG_ERR, "Can't change directory to '/': %s", strerror(errno)); @@ -713,19 +727,19 @@ NGIRCd_Init( bool NGIRCd_NoDaemon ) } pid = getpid(); - Pidfile_Create( pid ); + Pidfile_Create(pid); /* Check UID/GID we are running as, can be different from values * configured (e. g. if we were already started with a UID>0. */ Conf_UID = getuid(); Conf_GID = getgid(); - pwd = getpwuid( Conf_UID ); - grp = getgrgid( Conf_GID ); + pwd = getpwuid(Conf_UID); + grp = getgrgid(Conf_GID); Log(LOG_INFO, "Running as user %s(%ld), group %s(%ld), with PID %ld.", - pwd ? pwd->pw_name : "unknown", (long)Conf_UID, - grp ? grp->gr_name : "unknown", (long)Conf_GID, (long)pid); + pwd ? pwd->pw_name : "unknown", (long)Conf_UID, + grp ? grp->gr_name : "unknown", (long)Conf_GID, (long)pid); if (chrooted) { Log(LOG_INFO, "Running with root directory \"%s\".", @@ -734,20 +748,23 @@ NGIRCd_Init( bool NGIRCd_NoDaemon ) } else Log(LOG_INFO, "Not running with changed root directory."); - /* Change working directory to home directory of the user - * we are running as (only when running in daemon mode and not in chroot) */ + /* Change working directory to home directory of the user we are + * running as (only when running in daemon mode and not in chroot) */ + + if (NGIRCd_NoDaemon) + return true; if (pwd) { - if (!NGIRCd_NoDaemon ) { - if( chdir( pwd->pw_dir ) == 0 ) - Log( LOG_DEBUG, "Changed working directory to \"%s\" ...", pwd->pw_dir ); - else - Log( LOG_INFO, "Notice: Can't change working directory to \"%s\": %s", - pwd->pw_dir, strerror( errno )); - } - } else { - Log( LOG_ERR, "Can't get user informaton for UID %d!?", Conf_UID ); - } + if (chdir(pwd->pw_dir) == 0) + Log(LOG_DEBUG, + "Changed working directory to \"%s\" ...", + pwd->pw_dir); + else + Log(LOG_INFO, + "Notice: Can't change working directory to \"%s\": %s", + pwd->pw_dir, strerror(errno)); + } else + Log(LOG_ERR, "Can't get user informaton for UID %d!?", Conf_UID); return true; out:

1 0

Alexander Barton : NGIRCd_getNobodyID(): Code cleanup
by alex＠arthur.barton.de 03 Jan '12

03 Jan '12

Module: ngircd.git Branch: master Commit: 3193d5477c9f70e34f7ae636e51771b8e6039138 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3193d547… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jan 3 20:49:42 2012 +0100 NGIRCd_getNobodyID(): Code cleanup --- src/ngircd/ngircd.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 170a3cd..ec2462a 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -555,9 +555,10 @@ NGIRCd_getNobodyID(uid_t *uid, gid_t *gid ) #endif pwd = getpwnam("nobody"); - if (!pwd) return false; + if (!pwd) + return false; - if ( !pwd->pw_uid || !pwd->pw_gid) + if (!pwd->pw_uid || !pwd->pw_gid) return false; *uid = pwd->pw_uid;

1 0

Alexander Barton : Display correct error message when "Server{UID|GID}" is invalid
by alex＠arthur.barton.de 03 Jan '12

03 Jan '12

Module: ngircd.git Branch: master Commit: edab86e0f843dc07815477e25a0a6184d7500120 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=edab86e0… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jan 3 20:37:41 2012 +0100 Display correct error message when "Server{UID|GID}" is invalid This partly closes bug #118. ngIRCd still starts up even when Server{UID|GID} is invalid: then the daemon falls back to "nobody" when running with root(0) privileges (as before). --- src/ngircd/conf.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index b0c7fb4..f18016b 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -1308,7 +1308,9 @@ Handle_GLOBAL( int Line, char *Var, char *Arg ) else { Conf_GID = (unsigned int)atoi(Arg); if (!Conf_GID && strcmp(Arg, "0")) - Config_Error_NaN(Line, Var); + Config_Error(LOG_WARNING, + "%s, line %d: Value of \"%s\" is not a valid group name or ID!", + NGIRCd_ConfFile, Line, Var); } return; } @@ -1319,7 +1321,9 @@ Handle_GLOBAL( int Line, char *Var, char *Arg ) else { Conf_UID = (unsigned int)atoi(Arg); if (!Conf_UID && strcmp(Arg, "0")) - Config_Error_NaN(Line, Var); + Config_Error(LOG_WARNING, + "%s, line %d: Value of \"%s\" is not a valid user name or ID!", + NGIRCd_ConfFile, Line, Var); } return; }

1 0

Alexander Barton : Enhance log messages when setting user and group
by alex＠arthur.barton.de 03 Jan '12

03 Jan '12

Module: ngircd.git Branch: master Commit: 1bb2fbedcc975aa6e424fd201f59a178a03d45b0 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1bb2fbed… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jan 3 21:05:35 2012 +0100 Enhance log messages when setting user and group --- src/ngircd/ngircd.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index ec2462a..874dfa3 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -658,10 +658,10 @@ NGIRCd_Init(bool NGIRCd_NoDaemon) /* Check user ID */ if (Conf_UID == 0) { + pwd = getpwuid(0); Log(LOG_INFO, - "ServerUID must not be 0, using \"nobody\" instead.", - Conf_UID); - + "ServerUID must not be %s(0), using \"nobody\" instead.", + pwd ? pwd->pw_name : "?"); if (!NGIRCd_getNobodyID(&Conf_UID, &Conf_GID)) { Log(LOG_WARNING, "Could not get user/group ID of user \"nobody\": %s", @@ -674,8 +674,10 @@ NGIRCd_Init(bool NGIRCd_NoDaemon) if (getgid() != Conf_GID) { if (setgid(Conf_GID) != 0) { real_errno = errno; - Log(LOG_ERR, "Can't change group ID to %u: %s", - Conf_GID, strerror(errno)); + grp = getgrgid(Conf_GID); + Log(LOG_ERR, "Can't change group ID to %s(%u): %s", + grp ? grp->gr_name : "?", Conf_GID, + strerror(errno)); if (real_errno != EPERM) goto out; } @@ -685,8 +687,10 @@ NGIRCd_Init(bool NGIRCd_NoDaemon) if (getuid() != Conf_UID) { if (setuid(Conf_UID) != 0) { real_errno = errno; - Log(LOG_ERR, "Can't change user ID to %u: %s", - Conf_UID, strerror(errno)); + pwd = getpwuid(Conf_UID); + Log(LOG_ERR, "Can't change user ID to %s(%u): %s", + pwd ? pwd->pw_name : "?", Conf_UID, + strerror(errno)); if (real_errno != EPERM) goto out; }

1 0

Alexander Barton : README: point to included COPYING file, not gnu.org
by alex＠arthur.barton.de 03 Jan '12

03 Jan '12

Module: ngircd.git Branch: master Commit: ab188c148659959060fb7a27ffa00214093ced6f URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=ab188c14… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jan 3 18:56:31 2012 +0100 README: point to included COPYING file, not gnu.org --- README | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README b/README index 53b4205..f9b3662 100644 --- a/README +++ b/README @@ -14,9 +14,10 @@ I. Introduction ngIRCd is an Open Source server for the Internet Relay Chat (IRC), which is developed and published under the terms of the GNU General Public -Licence (URL: http://www.gnu.org/licenses/gpl.html). ngIRCd means "next -generation IRC daemon", it's written from scratch and not deduced from the -"grandfather of IRC daemons", the daemon of the IRCNet. +Licence, see the file COPYING for details. ngIRCd means "next generation +IRC daemon" (which is a little bit exaggerated, "lightweight Internet Relay +Chat server" would be better), it's written from scratch and not deduced +from the "grandfather of IRC daemons", the daemon of the IRCNet. Please see the INSTALL document for installation and upgrade information!

1 0

Alexander Barton : Update Copyright notices for 2012
by alex＠arthur.barton.de 03 Jan '12

03 Jan '12

Module: ngircd.git Branch: master Commit: 5eb9f2e7172620874d5ad4c247b82fc2aee3ac1b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=5eb9f2e7… Author: Alexander Barton <alex(a)barton.de> Date: Tue Jan 3 11:30:45 2012 +0100 Update Copyright notices for 2012 --- AUTHORS | 2 +- INSTALL | 2 +- NEWS | 2 +- README | 2 +- src/ngircd/ngircd.c | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/AUTHORS b/AUTHORS index 03a19dd..241d3a4 100644 --- a/AUTHORS +++ b/AUTHORS @@ -2,7 +2,7 @@ ngIRCd - Next Generation IRC Server http://ngircd.barton.de/ - (c)2001-2011 Alexander Barton and Contributors. + (c)2001-2012 Alexander Barton and Contributors. ngIRCd is free software and published under the terms of the GNU General Public License. diff --git a/INSTALL b/INSTALL index 99fe33d..45ebe99 100644 --- a/INSTALL +++ b/INSTALL @@ -2,7 +2,7 @@ ngIRCd - Next Generation IRC Server http://ngircd.barton.de/ - (c)2001-2011 Alexander Barton and Contributors. + (c)2001-2012 Alexander Barton and Contributors. ngIRCd is free software and published under the terms of the GNU General Public License. diff --git a/NEWS b/NEWS index 3a8d1c5..d44b4a8 100644 --- a/NEWS +++ b/NEWS @@ -2,7 +2,7 @@ ngIRCd - Next Generation IRC Server http://ngircd.barton.de/ - (c)2001-2011 Alexander Barton and Contributors. + (c)2001-2012 Alexander Barton and Contributors. ngIRCd is free software and published under the terms of the GNU General Public License. diff --git a/README b/README index 888385c..53b4205 100644 --- a/README +++ b/README @@ -2,7 +2,7 @@ ngIRCd - Next Generation IRC Server http://ngircd.barton.de/ - (c)2001-2011 Alexander Barton and Contributors. + (c)2001-2012 Alexander Barton and Contributors. ngIRCd is free software and published under the terms of the GNU General Public License. diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 3e64f35..a1f1d88 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2011 Alexander Barton (alex(a)barton.de) and Contributors. + * Copyright (c)2001-2012 Alexander Barton (alex(a)barton.de) and Contributors. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -424,7 +424,7 @@ static void Show_Version( void ) { puts( NGIRCd_Version ); - puts( "Copyright (c)2001-2011 Alexander Barton (<alex(a)barton.de>) and Contributors." ); + puts( "Copyright (c)2001-2012 Alexander Barton (<alex(a)barton.de>) and Contributors." ); puts( "Homepage: <http://ngircd.barton.de/>\n" ); puts( "This is free software; see the source for copying conditions. There is NO" ); puts( "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." );

1 0

Florian Westphal : lists: don't crash if reason ptr is NULL
by fw＠arthur.barton.de 02 Jan '12

02 Jan '12

Module: ngircd.git Branch: master Commit: abfc5c6e27bcabec450b7e91ebc0bdca48ac8ef6 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=abfc5c6e… Author: Florian Westphal <fw(a)strlen.de> Date: Mon Jan 2 23:37:46 2012 +0100 lists: don't crash if reason ptr is NULL commit 15fec92ed75c3de0b32c40d005e93e3f61aef77e (Update list item, if it already exists) can make ngircd crash because 'Reason' can be NULL, as reported by Cahata on the ngircd mailing list. Doesn't affect any released ngircd versions. Also, make sure that we do not pass NULL as arguments to a '%s' printf-like function. --- src/ngircd/lists.c | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/ngircd/lists.c b/src/ngircd/lists.c index d3f26e2..fd86f30 100644 --- a/src/ngircd/lists.c +++ b/src/ngircd/lists.c @@ -60,13 +60,13 @@ Lists_GetMask(const struct list_elem *e) * Get optional "reason" text stored in list element. * * @param list_elem List element. - * @return Pointer to "reason" text or NULL. + * @return Pointer to "reason" text or empty string (""). */ GLOBAL const char * Lists_GetReason(const struct list_elem *e) { assert(e != NULL); - return e->reason; + return e->reason ? e->reason : ""; } /** @@ -129,14 +129,10 @@ Lists_Add(struct list_head *h, const char *Mask, time_t ValidUntil, e = Lists_CheckDupeMask(h, Mask); if (e) { e->valid_until = ValidUntil; - if (e->reason) + if (Reason) { free(e->reason); - e->reason = malloc(strlen(Reason) + 1); - if (e->reason) - strlcpy(e->reason, Reason, strlen(Reason) + 1); - else - Log(LOG_EMERG, - "Can't allocate memory for new list reason text!"); + e->reason = strdup(Reason); + } return true; }

1 0

Alexander Barton : IRC_JOIN(): Code cleanup
by alex＠arthur.barton.de 02 Jan '12

02 Jan '12

Module: ngircd.git Branch: master Commit: 013298d4c68cc82c8b723fedb81ea87ced7fb306 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=013298d4… Author: Alexander Barton <alex(a)barton.de> Date: Mon Jan 2 15:22:52 2012 +0100 IRC_JOIN(): Code cleanup --- src/ngircd/irc-channel.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index cc70eb4..a41f1d4 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -301,9 +301,9 @@ join_send_topic(CLIENT *Client, CLIENT *target, CHANNEL *chan, * * See RFC 2812, 3.2.1 "Join message"; RFC 2813, 4.2.1 "Join message". * - * @param Client The client from which this command has been received - * @param Req Request structure with prefix and all parameters - * @returns CONNECTED or DISCONNECTED + * @param Client The client from which this command has been received + * @param Req Request structure with prefix and all parameters + * @returns CONNECTED or DISCONNECTED */ GLOBAL bool IRC_JOIN( CLIENT *Client, REQUEST *Req ) @@ -312,8 +312,8 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) CLIENT *target; CHANNEL *chan; - assert( Client != NULL ); - assert( Req != NULL ); + assert (Client != NULL); + assert (Req != NULL); /* Bad number of arguments? */ if (Req->argc < 1 || Req->argc > 2) @@ -327,7 +327,8 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) target = Client; if (!target) - return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, Client_ID(Client), Req->prefix); + return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, + Client_ID(Client), Req->prefix); /* Is argument "0"? */ if (Req->argc == 1 && !strncmp("0", Req->argv[0], 2)) @@ -359,8 +360,9 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) chan = Channel_Search(channame); if (!chan && Conf_PredefChannelsOnly) { - /* channel must be created, but server does not allow this */ - IRC_WriteStrClient(Client, ERR_BANNEDFROMCHAN_MSG, Client_ID(Client), channame); + /* channel must be created, but forbidden by config */ + IRC_WriteStrClient(Client, ERR_BANNEDFROMCHAN_MSG, + Client_ID(Client), channame); break; }

1 0

Springe zur Seite:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

ngIRCd GIT Updates