This is an automated email from the git hooks/post-receive script.
rharwood pushed a change to branch master in repository gssproxy.
from f67470b Create krb5 config files before setting up LDAP new 486ff4d Fix error reporting in init_proc_nfsd new 28588d3 Conditionally reload kernel interface on SIGHUP
The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference.
Summary of changes: proxy/src/gp_init.c | 10 +++++----- proxy/src/gssproxy.c | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-)
This is an automated email from the git hooks/post-receive script.
rharwood pushed a commit to branch master in repository gssproxy.
commit 486ff4d817b2dbec196ac9c2135adfa5ec0209fc Author: Alexander Scheel ascheel@redhat.com Date: Mon Jun 26 14:21:49 2017 -0400
Fix error reporting in init_proc_nfsd
Signed-off-by: Alexander Scheel ascheel@redhat.com [rharwood@redhat.com: rewrote commit message, whitespace] Reviewed-by: Robbie Harwood rharwood@redhat.com --- proxy/src/gp_init.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/proxy/src/gp_init.c b/proxy/src/gp_init.c index e69934d..db56f1c 100644 --- a/proxy/src/gp_init.c +++ b/proxy/src/gp_init.c @@ -171,13 +171,11 @@ void init_proc_nfsd(struct gp_config *cfg) ret = errno; GPDEBUG("Failed to write to %s: %d (%s)\n", LINUX_PROC_USE_GSS_PROXY_FILE, ret, gp_strerror(ret)); - } - - close(fd); - if (ret != 0) { + close(fd); goto fail; }
+ close(fd); return; fail: GPDEBUG("Problem with kernel communication! NFS server will not work\n");
This is an automated email from the git hooks/post-receive script.
rharwood pushed a commit to branch master in repository gssproxy.
commit 28588d3170a4185122ca2ce1d33ef350703db969 Author: Alexander Scheel ascheel@redhat.com Date: Mon Jun 26 17:04:16 2017 -0400
Conditionally reload kernel interface on SIGHUP
Signed-off-by: Alexander Scheel ascheel@redhat.com [rharwood@redhat.com: Simplified logic, rewrote commit message] Reviewed-by: Robbie Harwood rharwood@redhat.com Resolves: #193 Merges: #201 --- proxy/src/gp_init.c | 4 +++- proxy/src/gssproxy.c | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/proxy/src/gp_init.c b/proxy/src/gp_init.c index db56f1c..f64e22c 100644 --- a/proxy/src/gp_init.c +++ b/proxy/src/gp_init.c @@ -145,6 +145,7 @@ void init_proc_nfsd(struct gp_config *cfg) char buf[] = "1"; bool enabled = false; int fd, ret; + static int poked = 0;
/* check first if any service enabled kernel support */ for (int i = 0; i < cfg->num_svcs; i++) { @@ -154,7 +155,7 @@ void init_proc_nfsd(struct gp_config *cfg) } }
- if (!enabled) { + if (!enabled || poked) { return; }
@@ -175,6 +176,7 @@ void init_proc_nfsd(struct gp_config *cfg) goto fail; }
+ poked = 1; close(fd); return; fail: diff --git a/proxy/src/gssproxy.c b/proxy/src/gssproxy.c index 9ffec5e..3cdc220 100644 --- a/proxy/src/gssproxy.c +++ b/proxy/src/gssproxy.c @@ -140,6 +140,9 @@ static void hup_handler(verto_ctx *vctx, verto_ev *ev UNUSED) exit(ret); }
+ /* conditionally reload kernel interface */ + init_proc_nfsd(gpctx->config); + free_config(&old_config);
GPDEBUG("New config loaded successfully.\n");
gss-proxy@lists.fedorahosted.org