diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-24 17:43:45 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-24 17:43:45 +0200 |
| commit | 4b05bef636c11cbaf4d32097ed9656a1447ed3d0 (patch) | |
| tree | 15c698fa86a85e5e3a1db1f14e2eaf6f11c6948f /runtime/obj.c | |
| parent | 82095efa24ea0692a6747d4296f398ebd37e5339 (diff) | |
| parent | a7040a9623e228043209da897dbf30b9ab02d771 (diff) | |
| download | rsyslog-4b05bef636c11cbaf4d32097ed9656a1447ed3d0.tar.gz rsyslog-4b05bef636c11cbaf4d32097ed9656a1447ed3d0.tar.bz2 rsyslog-4b05bef636c11cbaf4d32097ed9656a1447ed3d0.zip | |
Merge branch 'sock-abstract' into tls
Conflicts:
runtime/Makefile.am
runtime/netstrm.c
runtime/nsd.h
runtime/nsd_ptcp.c
runtime/rsyslog.h
Diffstat (limited to 'runtime/obj.c')
| -rw-r--r-- | runtime/obj.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/obj.c b/runtime/obj.c index 8ab606f9..18a4a726 100644 --- a/runtime/obj.c +++ b/runtime/obj.c @@ -1198,7 +1198,7 @@ ReleaseObj(char *srcFile, uchar *pObjName, uchar *pObjFile, interface_t *pIf) FINALIZE; /* if it is not a lodable module, we do not need to do anything... */ if(pIf->ifIsLoaded == 0) { - ABORT_FINALIZE(RS_RET_OK); /* we are already set */ /* TODO: flag an error? */ + ABORT_FINALIZE(RS_RET_OK); /* we are not loaded - this is perfectly OK... */ } if(pIf->ifIsLoaded == 2) { pIf->ifIsLoaded = 0; /* clean up */ |