renamed library module file names to lm*, so that they match the overall

    scheme (like im* and om*)

16 files changed, 43 insertions, 31 deletions

diff --git a/Makefile.am b/Makefile.am
index c924f7bb..5b3253f9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -94,29 +94,29 @@ rsyslogd_LDADD = $(zlib_libs) $(pthreads_libs) $(dl_libs) $(rt_libs)
 rsyslogd_LDFLAGS = -export-dynamic
 
 # now come the library plugins
-pkglib_LTLIBRARIES = tcpsrv.la
+pkglib_LTLIBRARIES = lmtcpsrv.la
 
 #
 # TCP (Stream) Server support
 #
-tcpsrv_la_SOURCES = \
+lmtcpsrv_la_SOURCES = \
 	tcps_sess.c \
 	tcps_sess.h \
 	tcpsrv.c \
 	tcpsrv.h
-tcpsrv_la_CPPFLAGS = $(pthreads_cflags)
-tcpsrv_la_LDFLAGS = -module -avoid-version
-tcpsrv_la_LIBADD = 
+lmtcpsrv_la_CPPFLAGS = $(pthreads_cflags)
+lmtcpsrv_la_LDFLAGS = -module -avoid-version
+lmtcpsrv_la_LIBADD = 
 
 #
 # network support
 # 
 if ENABLE_INET
-pkglib_LTLIBRARIES += net.la
-net_la_SOURCES = net.c net.h
-net_la_CPPFLAGS = $(pthreads_cflags)
-net_la_LDFLAGS = -module -avoid-version
-net_la_LIBADD =
+pkglib_LTLIBRARIES += lmnet.la
+lmnet_la_SOURCES = net.c net.h
+lmnet_la_CPPFLAGS = $(pthreads_cflags)
+lmnet_la_LDFLAGS = -module -avoid-version
+lmnet_la_LIBADD =
 endif
 
 #
@@ -134,11 +134,11 @@ endif
 # gssapi support
 # 
 if ENABLE_GSSAPI
-pkglib_LTLIBRARIES += gssutil.la
-gssutil_la_SOURCES = gss-misc.c gss-misc.h
-gssutil_la_CPPFLAGS = $(pthreads_cflags)
-gssutil_la_LDFLAGS = -module -avoid-version
-gssutil_la_LIBADD = $(gss_libs)
+pkglib_LTLIBRARIES += lmgssutil.la
+lmgssutil_la_SOURCES = gss-misc.c gss-misc.h
+lmgssutil_la_CPPFLAGS = $(pthreads_cflags)
+lmgssutil_la_LDFLAGS = -module -avoid-version
+lmgssutil_la_LIBADD = $(gss_libs)
 endif
 
 man_MANS = rfc3195d.8 rsyslogd.8 rsyslog.conf.5 
diff --git a/gss-misc.h b/gss-misc.h
index 12e42ad8..3e94bf41 100644
--- a/gss-misc.h
+++ b/gss-misc.h
@@ -39,4 +39,7 @@ ENDinterface(gssutil)
 /* prototypes */
 PROTOTYPEObj(gssutil);
 
+/* the name of our library binary */
+#define LM_GSSUTIL_FILENAME "lmgssutil"
+
 #endif /* #ifndef GSS_MISC_H_INCLUDED */
diff --git a/msg.c b/msg.c
index d40087ad..f99fd853 100644
--- a/msg.c
+++ b/msg.c
@@ -1771,7 +1771,7 @@ char *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe,
 
 			dbgprintf("debug: String to match for regex is: %s\n", pRes);
 
-			if(objUse(regexp, "lmregexp") == RS_RET_OK) {
+			if(objUse(regexp, LM_REGEXP_FILENAME) == RS_RET_OK) {
 				if (0 != regexp.regexec(&pTpe->data.field.re, pRes, nmatch,
 					    pmatch, 0)) {
 					/* we got no match! */
diff --git a/net.h b/net.h
index 92a27096..cd2b22cd 100644
--- a/net.h
+++ b/net.h
@@ -114,5 +114,8 @@ ENDinterface(net)
 /* prototypes */
 PROTOTYPEObj(net);
 
+/* the name of our library binary */
+#define LM_NET_FILENAME "lmnet"
+
 #endif /* #ifdef SYSLOG_INET */
 #endif /* #ifndef INCLUDED_NET_H */
diff --git a/obj-types.h b/obj-types.h
index dda9b364..aaca5cca 100644
--- a/obj-types.h
+++ b/obj-types.h
@@ -345,6 +345,7 @@ finalize_it: \
  * methods can be accessed.
  */
 #define CORE_COMPONENT NULL /* use this to indicate this is a core component */
+#define DONT_LOAD_LIB NULL /* do not load a library to obtain object interface (currently same as CORE_COMPONENT) */
 #define objUse(objName, FILENAME) \
 	obj.UseObj(__FILE__, (uchar*)#objName, (uchar*)FILENAME, (void*) &objName)
 
diff --git a/omfwd.c b/omfwd.c
index a931fdec..61a879d3 100644
--- a/omfwd.c
+++ b/omfwd.c
@@ -622,7 +622,7 @@ CODESTARTmodInit
 	*ipIFVersProvided = CURR_MOD_IF_VERSION; /* we only support the current interface specification */
 CODEmodInit_QueryRegCFSLineHdlr
 	CHKiRet(objUse(errmsg, CORE_COMPONENT));
-	CHKiRet(objUse(net, "net"));
+	CHKiRet(objUse(net, LM_NET_FILENAME));
 ENDmodInit
 
 #endif /* #ifdef SYSLOG_INET */
diff --git a/plugins/imgssapi/imgssapi.c b/plugins/imgssapi/imgssapi.c
index 4a7479f4..5b966c65 100644
--- a/plugins/imgssapi/imgssapi.c
+++ b/plugins/imgssapi/imgssapi.c
@@ -690,11 +690,11 @@ CODESTARTmodInit
 CODEmodInit_QueryRegCFSLineHdlr
 	pOurTcpsrv = NULL;
 	/* request objects we use */
-	CHKiRet(objUse(tcps_sess, "tcpsrv"));
-	CHKiRet(objUse(tcpsrv, "tcpsrv"));
-	CHKiRet(objUse(gssutil, "gssutil"));
+	CHKiRet(objUse(tcps_sess, LM_TCPSRV_FILENAME));
+	CHKiRet(objUse(tcpsrv, LM_TCPSRV_FILENAME));
+	CHKiRet(objUse(gssutil, LM_GSSUTIL_FILENAME));
 	CHKiRet(objUse(errmsg, CORE_COMPONENT));
-	CHKiRet(objUse(net, "net"));
+	CHKiRet(objUse(net, LM_NET_FILENAME));
 
 	/* register config file handlers */
 	CHKiRet(omsdRegCFSLineHdlr((uchar *)"inputgssserverpermitplaintcp", 0, eCmdHdlrBinary,
diff --git a/plugins/imtcp/imtcp.c b/plugins/imtcp/imtcp.c
index 2da094a4..d58c6f56 100644
--- a/plugins/imtcp/imtcp.c
+++ b/plugins/imtcp/imtcp.c
@@ -205,9 +205,9 @@ CODESTARTmodInit
 CODEmodInit_QueryRegCFSLineHdlr
 	pOurTcpsrv = NULL;
 	/* request objects we use */
-	CHKiRet(objUse(net, "net"));
-	CHKiRet(objUse(tcps_sess, "tcpsrv"));
-	CHKiRet(objUse(tcpsrv, "tcpsrv"));
+	CHKiRet(objUse(net, LM_NET_FILENAME));
+	CHKiRet(objUse(tcps_sess, LM_TCPSRV_FILENAME));
+	CHKiRet(objUse(tcpsrv, LM_TCPSRV_FILENAME));
 
 	/* register config file handlers */
 	CHKiRet(omsdRegCFSLineHdlr((uchar *)"inputtcpserverrun", 0, eCmdHdlrGetWord,
diff --git a/plugins/imudp/imudp.c b/plugins/imudp/imudp.c
index f18461e7..17afa9a0 100644
--- a/plugins/imudp/imudp.c
+++ b/plugins/imudp/imudp.c
@@ -278,7 +278,7 @@ CODESTARTmodInit
 	*ipIFVersProvided = CURR_MOD_IF_VERSION; /* we only support the current interface specification */
 CODEmodInit_QueryRegCFSLineHdlr
 	CHKiRet(objUse(errmsg, CORE_COMPONENT));
-	CHKiRet(objUse(net, "net"));
+	CHKiRet(objUse(net, LM_NET_FILENAME));
 
 	/* register config file handlers */
 	CHKiRet(omsdRegCFSLineHdlr((uchar *)"udpserverrun", 0, eCmdHdlrGetWord,
diff --git a/plugins/omgssapi/omgssapi.c b/plugins/omgssapi/omgssapi.c
index bb4a2712..ba7b0b6c 100644
--- a/plugins/omgssapi/omgssapi.c
+++ b/plugins/omgssapi/omgssapi.c
@@ -675,7 +675,7 @@ CODESTARTmodInit
 	*ipIFVersProvided = CURR_MOD_IF_VERSION; /* we only support the current interface specification */
 CODEmodInit_QueryRegCFSLineHdlr
 	CHKiRet(objUse(errmsg, CORE_COMPONENT));
-	CHKiRet(objUse(gssutil, "gssutil"));
+	CHKiRet(objUse(gssutil, LM_GSSUTIL_FILENAME));
 
 	CHKiRet(omsdRegCFSLineHdlr((uchar *)"gssforwardservicename", 0, eCmdHdlrGetWord, NULL, &gss_base_service_name, STD_LOADABLE_MODULE_ID));
 	CHKiRet(omsdRegCFSLineHdlr((uchar *)"gssmode", 0, eCmdHdlrGetWord, setGSSMode, &gss_mode, STD_LOADABLE_MODULE_ID));
diff --git a/regexp.h b/regexp.h
index 2ff00ae7..05599751 100644
--- a/regexp.h
+++ b/regexp.h
@@ -39,4 +39,7 @@ ENDinterface(regexp)
 /* prototypes */
 PROTOTYPEObj(regexp);
 
+/* the name of our library binary */
+#define LM_REGEXP_FILENAME "lmregexp"
+
 #endif /* #ifndef INCLUDED_REGEXP_H */
diff --git a/stringbuf.c b/stringbuf.c
index 8745c291..f1063745 100755
--- a/stringbuf.c
+++ b/stringbuf.c
@@ -709,7 +709,7 @@ int rsCStrSzStrMatchRegex(cstr_t *pCS1, uchar *psz)
 
 	BEGINfunc
 
-	if(objUse(regexp, "lmregexp") == RS_RET_OK) {
+	if(objUse(regexp, LM_REGEXP_FILENAME) == RS_RET_OK) {
 		regexp.regcomp(&preq, (char*) rsCStrGetSzStr(pCS1), 0);
 		ret = regexp.regexec(&preq, (char*) psz, 0, NULL, 0);
 		regexp.regfree(&preq);
diff --git a/syslogd.c b/syslogd.c
index 62c44a96..2eec6619 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -2910,7 +2910,7 @@ static rsRetVal InitGlobalClasses(void)
 	CHKiRet(strInit());
 
 	/* TODO: the dependency on net shall go away! -- rgerhards, 2008-03-07 */
-	CHKiRet(objUse(net, "net"));
+	CHKiRet(objUse(net, LM_NET_FILENAME));
 
 finalize_it:
 	RETiRet;
diff --git a/tcpsrv.c b/tcpsrv.c
index 222334a8..8b0d6d81 100644
--- a/tcpsrv.c
+++ b/tcpsrv.c
@@ -837,7 +837,7 @@ CODESTARTmodInit
 
 	/* request objects we use */
 	CHKiRet(objUse(errmsg, CORE_COMPONENT));
-	CHKiRet(objUse(net, "net"));
+	CHKiRet(objUse(net, LM_NET_FILENAME));
 ENDmodInit
 
 /* vim:set ai:
diff --git a/tcpsrv.h b/tcpsrv.h
index 810e75cd..fb9f4d21 100644
--- a/tcpsrv.h
+++ b/tcpsrv.h
@@ -78,5 +78,7 @@ ENDinterface(tcpsrv)
 /* prototypes */
 PROTOTYPEObj(tcpsrv);
 
+/* the name of our library binary */
+#define LM_TCPSRV_FILENAME "lmtcpsrv"
 
 #endif /* #ifndef INCLUDED_TCPSRV_H */
diff --git a/template.c b/template.c
index 67be4140..847b1265 100644
--- a/template.c
+++ b/template.c
@@ -627,7 +627,7 @@ static int do_Parameter(unsigned char **pp, struct template *pTpl)
 
 				/* Now i compile the regex */
 				/* Remember that the re is an attribute of the Template entry */
-				if((iRetLocal = objUse(regexp, "lmregexp")) == RS_RET_OK) {
+				if((iRetLocal = objUse(regexp, LM_REGEXP_FILENAME)) == RS_RET_OK) {
 					if(regexp.regcomp(&(pTpe->data.field.re), (char*) regex_char, 0) != 0) {
 						dbgprintf("error: can not compile regex: '%s'\n", regex_char);
 						pTpe->data.field.has_regex = 2;
@@ -636,7 +636,7 @@ static int do_Parameter(unsigned char **pp, struct template *pTpl)
 					/* regexp object could not be loaded */
 					dbgprintf("error %d trying to load regexp library - this may be desired and thus OK",
 						  iRetLocal);
-					errmsg.LogError(NO_ERRCODE, "regexp libraray could not be loaded (error %d), regexp"
+					errmsg.LogError(NO_ERRCODE, "regexp library could not be loaded (error %d), regexp"
 						       "ignored", iRetLocal);
 					pTpe->data.field.has_regex = 2;
 				}