lede-packages-rs

commit 03a638e0026699690c9f102f0c2004359c47353e
parent 3a1ce331c3bcb01e9249208f199b30cd59d12a7f
Author: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date:   Sun, 26 Apr 2015 17:22:23 +0200

ocserv: corrected session expiration in sec-mod

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>

Diffstat:
M
net/ocserv/Makefile
 | 
2
+-
A
net/ocserv/patches/001-correct-session-expiration.patch
 | 
22
++++++++++++++++++++++

2 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/net/ocserv/Makefile b/net/ocserv/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ocserv
 PKG_VERSION:=0.10.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_BUILD_DIR :=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
diff --git a/net/ocserv/patches/001-correct-session-expiration.patch b/net/ocserv/patches/001-correct-session-expiration.patch
@@ -0,0 +1,22 @@
+diff --git a/src/sec-mod-auth.c b/src/sec-mod-auth.c
+index 4ee6f57..2fc02b5 100644
+--- a/src/sec-mod-auth.c
++++ b/src/sec-mod-auth.c
+@@ -500,7 +500,7 @@ int handle_sec_auth_session_close(int cfd, sec_mod_st *sec, const SecAuthSession
+ 		                (pack_func) cli_stats_msg__pack);
+ 	}
+ 
+-	if (e->status != PS_AUTH_COMPLETED) {
++	if (e->status < PS_AUTH_COMPLETED) {
+ 		seclog(sec, LOG_DEBUG, "session close received in unauthenticated client %s "SESSION_STR"!", e->auth_info.username, e->auth_info.psid);
+ 		return send_msg(e, cfd, SM_CMD_AUTH_CLI_STATS, &rep,
+ 		                (pack_size_func) cli_stats_msg__get_packed_size,
+@@ -604,7 +604,7 @@ int handle_sec_auth_stats_cmd(sec_mod_st * sec, const CliStatsMsg * req)
+ 		e->stats.uptime = req->uptime;
+ 
+ 	if (req->has_invalidate_cookie && req->invalidate_cookie != 0) {
+-		seclog(sec, LOG_INFO, "invalidating session user '%s' "SESSION_STR,
++		seclog(sec, LOG_INFO, "invalidating session of user '%s' "SESSION_STR,
+ 			e->auth_info.username, e->auth_info.psid);
+ 		e->status = PS_AUTH_USER_TERM;
+ 	}