summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-03-06 14:13:43 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2008-03-06 14:13:43 +0000
commit96ff31f5bfb75741115bf8586a7691efaa7bd06c (patch)
treef9d53efeefe26ba34904d63bb03c0f40f15d6418
parente802a7d965d5fcbc3cc848462744774e4d181a8f (diff)
downloadrsyslog-96ff31f5bfb75741115bf8586a7691efaa7bd06c.zip
rsyslog-96ff31f5bfb75741115bf8586a7691efaa7bd06c.tar.gz
rsyslog-96ff31f5bfb75741115bf8586a7691efaa7bd06c.tar.xz
applied some bugfixes to new code supplied by varmojfekoj - thanks!v3-12-1
-rw-r--r--modules.c2
-rw-r--r--plugins/imgssapi/imgssapi.c8
2 files changed, 6 insertions, 4 deletions
diff --git a/modules.c b/modules.c
index 2114103..9082283 100644
--- a/modules.c
+++ b/modules.c
@@ -461,7 +461,6 @@ Load(uchar *pModName)
}
pModInfo = GetNxt(pModInfo);
}
- free(pModNameDup);
/* now build our load module name */
if(*pModName == '/') {
@@ -485,6 +484,7 @@ Load(uchar *pModName)
/* ... so now add the extension */
strncat((char *) szPath, ".so", sizeof(szPath) - strlen((char*) szPath) - 1);
}
+ free(pModNameDup);
/* complete load path constructed, so ... GO! */
diff --git a/plugins/imgssapi/imgssapi.c b/plugins/imgssapi/imgssapi.c
index fcaae3b..1c0dd79 100644
--- a/plugins/imgssapi/imgssapi.c
+++ b/plugins/imgssapi/imgssapi.c
@@ -614,9 +614,11 @@ TCPSessGSSDeinit(void)
DEFiRet;
OM_uint32 maj_stat, min_stat;
- maj_stat = gss_release_cred(&min_stat, &gss_server_creds);
- if (maj_stat != GSS_S_COMPLETE)
- gssutil.display_status("releasing credentials", maj_stat, min_stat);
+ if (gss_server_creds != GSS_C_NO_CREDENTIAL) {
+ maj_stat = gss_release_cred(&min_stat, &gss_server_creds);
+ if (maj_stat != GSS_S_COMPLETE)
+ gssutil.display_status("releasing credentials", maj_stat, min_stat);
+ }
RETiRet;
}