diff -ur ipscromp-2.4.1/CHANGES ipscromp-2.4.2/CHANGES --- ipscromp-2.4.1/CHANGES Sun May 11 08:59:57 2003 +++ ipscromp-2.4.2/CHANGES Thu Aug 7 03:38:22 2003 @@ -107,3 +107,6 @@ 2.4.1 11/05/2003, Cheesy Fixed to compile correctly again with libmd (SHA vs SHA1 stuff) Removed old Cygwin specific workarounds that are now unnecessary + +2.4.2 07/08/2003, Cheesy + Fixed bug in in.ipscrompd.c where the alt_ip in IPERMIT was ignored diff -ur ipscromp-2.4.1/in.ipscrompd.c ipscromp-2.4.2/in.ipscrompd.c --- ipscromp-2.4.1/in.ipscrompd.c Sat Apr 26 11:08:56 2003 +++ ipscromp-2.4.2/in.ipscrompd.c Thu Aug 7 03:31:20 2003 @@ -149,7 +149,7 @@ authreq.user = user; authreq.proto_version_num = proto_version_num; authreq.ip_to_add = sa.sin_addr; - + switch (proto_version_num) { case 0: @@ -183,34 +183,34 @@ } /* Check we can add this IP. Refuse to add 127.0.0.1 and some others */ - if (!addable_ip(sa.sin_addr)) + if (!addable_ip(authreq.ip_to_add)) { syslog(LOG_ERR, "Refusing to add IP '%s' for user '%s'", - inet_ntoa(sa.sin_addr), user); + inet_ntoa(authreq.ip_to_add), user); send_sock(STDOUT_FILENO, - errormsgs[ERROR_IP_INVALID], inet_ntoa(sa.sin_addr)); + errormsgs[ERROR_IP_INVALID], inet_ntoa(authreq.ip_to_add)); return 1; } - if((rc = fw_add_ip(sa.sin_addr, authreq.user)) < 0) + if((rc = fw_add_ip(authreq.ip_to_add, authreq.user)) < 0) { syslog(LOG_ERR, "User '%s' successfully authed but couldn't amend rules. " "IP was '%s', rc was %d (%s)\n", user, - inet_ntoa(sa.sin_addr), rc, strerror(-rc)); + inet_ntoa(authreq.ip_to_add), rc, strerror(-rc)); send_sock(STDOUT_FILENO, errormsgs[ERROR_AMENDING]); } else { syslog(LOG_NOTICE, "User '%s' opened firewall for %s. Limit is %d hrs\n", - user, inet_ntoa(sa.sin_addr), rc); + user, inet_ntoa(authreq.ip_to_add), rc); if (rc == 0) { - send_sock(STDOUT_FILENO, PERMIT_OK, inet_ntoa(sa.sin_addr)); + send_sock(STDOUT_FILENO, PERMIT_OK, inet_ntoa(authreq.ip_to_add)); } else { - send_sock(STDOUT_FILENO, PERMIT_OK_TIMED, inet_ntoa(sa.sin_addr), rc); + send_sock(STDOUT_FILENO, PERMIT_OK_TIMED, inet_ntoa(authreq.ip_to_add), rc); } }