? Makefile.2 Index: AccountingProcess.cpp =================================================================== RCS file: /sources/radiusplugin/radiusplugin/AccountingProcess.cpp,v retrieving revision 1.9 diff -u -r1.9 AccountingProcess.cpp --- AccountingProcess.cpp 16 Dec 2010 21:11:28 -0000 1.9 +++ AccountingProcess.cpp 4 Aug 2012 16:09:52 -0000 @@ -38,7 +38,7 @@ string key; //The unique key. AcctScheduler scheduler; //The scheduler for the accounting. fd_set set; //A set for the select function. - struct timeval tv; //A timeinterval for the select funtion. + struct timeval tv; //A timeinterval for the select function. Index: ChangeLog =================================================================== RCS file: /sources/radiusplugin/radiusplugin/ChangeLog,v retrieving revision 1.17 diff -u -r1.17 ChangeLog --- ChangeLog 31 Oct 2010 09:28:42 -0000 1.17 +++ ChangeLog 4 Aug 2012 16:09:52 -0000 @@ -88,7 +88,7 @@ - Adapted to OPENVPN_PLUGIN_VERSION 2 - Internal key is now based on untrusted_ip and untrusted_before. - Separated key for status file is added. -- Update password and username if the user (key) is already known. Before if the ip and port would be the same and the timeout hasn't occured the login will success. The update prevents against this behaviour. +- Update password and username if the user (key) is already known. Before if the ip and port were the same and the timeout hasn't occurred the login will success. The update prevents against this behaviour. - Initialization of gcrypt library added. - Rewrite ACF file when the user is authenticated. - Include nested configfiles from main configfile. Index: Config.h =================================================================== RCS file: /sources/radiusplugin/radiusplugin/Config.h,v retrieving revision 1.5 diff -u -r1.5 Config.h --- Config.h 2 Sep 2010 11:00:07 -0000 1.5 +++ Config.h 4 Aug 2012 16:09:52 -0000 @@ -43,7 +43,7 @@ string statusfile; /**< The path and filename of the status file, where openvpn writes the status information.*/ char subnet[16]; /** * serverlist; Index: radiusplugin.cpp =================================================================== RCS file: /sources/radiusplugin/radiusplugin/radiusplugin.cpp,v retrieving revision 1.24 diff -u -r1.24 radiusplugin.cpp --- radiusplugin.cpp 26 Nov 2011 08:38:02 -0000 1.24 +++ radiusplugin.cpp 4 Aug 2012 16:09:54 -0000 @@ -30,7 +30,7 @@ extern "C" { - /** The function is needed by the OpenVpn plugin model. The funtion is called + /** The function is needed by the OpenVpn plugin model. The function is called * when OpenVpn starts. In this case here two background process are * started. One for authentication and one for accounting. The communication * between the processes is made via sockets. @@ -43,7 +43,7 @@ * and it is undependent from the openvpn process. * @param The type of plugin, maybe client_connect, client_disconnect, user_auth_pass_verify... * @param A list of arguments which are set in the configuration file of openvpn in plugin line. - * @param The list of enviromental variables, it is created by the OpenVpn-Process. + * @param The list of environmental variables, it is created by the OpenVpn-Process. */ @@ -320,7 +320,7 @@ } - /** This funtion is called from the OpenVpn process everytime + /** This function is called from the OpenVpn process every time * a event happens. The function handle the events (plugins) * AUTH_USER_PASS_VERIFY, CLIENT_CONNECT, CLIENT_DISCONNECT. * The function reads the information from the envriomental @@ -336,8 +336,8 @@ * @param The handle which was allocated in the open function. * @param The type of plugin, maybe client_conect, client_disconnect, auth_user_pass_verify * @param A list of arguments which are set in the openvpn configuration file. - * @param The list of enviromental variables, it is created by the OpenVpn-Process. - * @return A interger with the status of the funtion (OPENVPN_PLUGIN_FUNC_SUCCESS or OPENVPN_PLUGIN_FUNC_ERROR). + * @param The list of environmental variables, it is created by the OpenVpn-Process. + * @return An integer with the status of the function (OPENVPN_PLUGIN_FUNC_SUCCESS or OPENVPN_PLUGIN_FUNC_ERROR). */ //OPENVPN_EXPORT int @@ -377,7 +377,7 @@ UserPlugin *newuser=NULL; /**< A context for an new user.*/ UserPlugin *tmpuser=NULL; /**< A context for an temporary user.*/ - string common_name; /**acctsocketbackgr.send ( DEL_USER ); context->acctsocketbackgr.send ( newuser->getKey() ); - //get the responce + //get the response const int status = context->acctsocketbackgr.recvInt(); if ( status == RESPONSE_SUCCEEDED ) { @@ -733,7 +733,7 @@ * if found or NULL otherwise. * A field in the envp-array looks like: name=user1 * @param The name of the variable. - * @param The array with the enviromental variables. + * @param The array with the environmental variables. * @return A poniter to the variable value or NULL, if the varaible was not found. */ const char * get_env ( const char *name, const char *envp[] ) @@ -745,7 +745,7 @@ for ( i = 0; envp[i]; ++i ) { - //compare the enviromental names + //compare the environmental names if ( !strncmp ( envp[i], name, namelen ) ) { //if the varibale is found @@ -963,7 +963,7 @@ //there must be a username if ( newuser->getUsername().size() > 0 ) //&& olduser==NULL) { - //send the informations to the backgorund process + //send the informations to the background process context->authsocketbackgr.send ( COMMAND_VERIFY ); context->authsocketbackgr.send ( newuser->getUsername() ); context->authsocketbackgr.send ( newuser->getPassword() ); @@ -1044,7 +1044,7 @@ context->acctsocketbackgr.send ( DEL_USER ); context->acctsocketbackgr.send ( newuser->getKey() ); - //get the responce + //get the response const int status = context->acctsocketbackgr.recvInt(); if ( status == RESPONSE_SUCCEEDED ) { @@ -1202,7 +1202,7 @@ user->setCommonname ("UNDEF"); } - //rewrite the commonname if OpenVPN use the option username-as-comon-name + //rewrite the commonname if OpenVPN use the option username-as-common-name if ( context->conf.getUsernameAsCommonname() == true ) { if ( DEBUG ( context->getVerbosity() ) ) cerr << getTime() << "RADIUS-PLUGIN: FOREGROUND: Commonname set to Username\n"; Index: RadiusClass/RadiusAttribute.cpp =================================================================== RCS file: /sources/radiusplugin/radiusplugin/RadiusClass/RadiusAttribute.cpp,v retrieving revision 1.6 diff -u -r1.6 RadiusAttribute.cpp --- RadiusClass/RadiusAttribute.cpp 2 Apr 2010 06:36:26 -0000 1.6 +++ RadiusClass/RadiusAttribute.cpp 4 Aug 2012 16:09:54 -0000 @@ -282,7 +282,7 @@ * value. The datatypes ipv6addr,ifid, ipv6prefix, ipv6addr are treated as * strings. * @param value : A pointer to the value. - * @return An integer which indicates errors, 0 if everthing is ok, + * @return An integer which indicates errors, 0 if everything is ok, * else a number defined in the error.h */ @@ -460,7 +460,7 @@ * must to know which type it is. So you know the datatype and you * can convert it. But this done in another method. * @param value A pointer to the value which is copied to the value of the attribute. - * @return An integer which indicates errors, 0 if everthing is ok, + * @return An integer which indicates errors, 0 if everything is ok, * else a number defined in the error.h. */ Index: RadiusClass/RadiusPacket.cpp =================================================================== RCS file: /sources/radiusplugin/radiusplugin/RadiusClass/RadiusPacket.cpp,v retrieving revision 1.6 diff -u -r1.6 RadiusPacket.cpp --- RadiusClass/RadiusPacket.cpp 14 Nov 2010 11:37:20 -0000 1.6 +++ RadiusClass/RadiusPacket.cpp 4 Aug 2012 16:09:54 -0000 @@ -419,7 +419,7 @@ remoteServAddr.sin_family=h->h_addrtype; memcpy((char*)&(remoteServAddr.sin_addr.s_addr),h->h_addr_list[0],h->h_length); - //set the port, they are differnt for accounting and authentication + //set the port, they are different for accounting and authentication if (this->code==ACCOUNTING_REQUEST) { remoteServAddr.sin_port=htons(server->getAcctPort()); Index: RadiusClass/RadiusVendorSpecificAttribute.cpp =================================================================== RCS file: /sources/radiusplugin/radiusplugin/RadiusClass/RadiusVendorSpecificAttribute.cpp,v retrieving revision 1.2 diff -u -r1.2 RadiusVendorSpecificAttribute.cpp --- RadiusClass/RadiusVendorSpecificAttribute.cpp 23 Nov 2008 15:45:08 -0000 1.2 +++ RadiusClass/RadiusVendorSpecificAttribute.cpp 4 Aug 2012 16:09:54 -0000 @@ -151,7 +151,7 @@ /** Decodes a vendor specific attribute from a buffer. * @param value A pointer to the a buffer which keeps a vendor specific attribute. - * @return An integer which indicates errors, 0 if everthing is ok, + * @return An integer which indicates errors, 0 if everything is ok, * else a number defined in the error.h. */ int RadiusVendorSpecificAttribute::decodeRecvAttribute(Octet * v) Index: RadiusClass/main.cpp =================================================================== RCS file: /sources/radiusplugin/radiusplugin/RadiusClass/main.cpp,v retrieving revision 1.5 diff -u -r1.5 main.cpp --- RadiusClass/main.cpp 21 May 2009 14:34:06 -0000 1.5 +++ RadiusClass/main.cpp 4 Aug 2012 16:09:55 -0000 @@ -29,7 +29,7 @@ * * \section Features * - Sending and receiving RADIUS packets. - * - Generates password and authentication fields at sending automaticly, + * - Generates password and authentication fields at sending automatically, * you only need to set the plain text password of the user for ACCESS_REQUEST packets. * - optional password length * - timeouts for waiting on response packets