diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-02-26 17:41:46 +0000 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-02-26 17:41:46 +0000 |
| commit | 3ae3033800076fca0e9f5f491da2f420b610ffc2 (patch) | |
| tree | 97fdaf4488aa6c643119917f8d26591d848a1363 | |
| parent | 9868ee94534af14a5b8b5fea86a6579ac754cda3 (diff) | |
| download | rsyslog-3ae3033800076fca0e9f5f491da2f420b610ffc2.tar.gz rsyslog-3ae3033800076fca0e9f5f491da2f420b610ffc2.tar.xz rsyslog-3ae3033800076fca0e9f5f491da2f420b610ffc2.zip | |
- fixed wrong pointer in imgssapi config coding
- added $InputGSSServerMaxSessions config directive
| -rw-r--r-- | doc/imgssapi.html | 14 | ||||
| -rw-r--r-- | plugins/imgssapi/imgssapi.c | 2 |
2 files changed, 6 insertions, 10 deletions
diff --git a/doc/imgssapi.html b/doc/imgssapi.html index 09d89701..af15e59e 100644 --- a/doc/imgssapi.html +++ b/doc/imgssapi.html @@ -10,8 +10,7 @@ <p><b>Description</b>:</p> <p>Provides the ability to receive syslog messages from the network protected via Kerberos 5 encryption and authentication. This -module also contains the functionality found in <a href="imtcp.html">imtcp</a>, -which can not be used if imgssapi is used.</p> +module also accept plain tcp syslog messages on the same port if configured to do so. If you need just plain tcp, use <a href="imtcp.html">imtcp</a> instead.</p> <p><b>Configuration Directives</b>:</p> <ul> <li>InputGSSServerRun <port><br> @@ -22,19 +21,14 @@ The service name to use for the GSS server.</li> <li>$InputGSSServerPermitPlainTCP on|<span style="font-weight: bold;">off</span><br> Permits the server to receive plain tcp syslog (without GSS) on the same port</li> -<li>$InputTCPMaxSessions <number><br> +<li>$InputGSSServerMaxSessions <number><br> Sets the maximum number of sessions supported</li> </ul> <b>Caveats/Known Bugs:</b> <ul> <li>module always binds to all interfaces</li> -<li>only a single listener can be bound (one each for GSS and -plain TCP)</li> -<li>duplicates <a href="imtcp.html">imtcp</a> -functionality and thus conflicts with it. This will change in the -future. Unfortunately, that also means that your config files -probably need to be changed in the future when that -change happens.</li> +<li>only a single listener can be bound</li> + </ul> <p><b>Sample:</b></p> <p>This sets up a GSS server on port 1514 that also permits to diff --git a/plugins/imgssapi/imgssapi.c b/plugins/imgssapi/imgssapi.c index e3bd183c..01e4cdea 100644 --- a/plugins/imgssapi/imgssapi.c +++ b/plugins/imgssapi/imgssapi.c @@ -373,6 +373,8 @@ CODEmodInit_QueryRegCFSLineHdlr addGSSListener, NULL, STD_LOADABLE_MODULE_ID)); CHKiRet(omsdRegCFSLineHdlr((uchar *)"inputgssserverservicename", 0, eCmdHdlrGetWord, NULL, &gss_listen_service_name, STD_LOADABLE_MODULE_ID)); + CHKiRet(omsdRegCFSLineHdlr((uchar *)"inputgssservermaxsessions", 0, eCmdHdlrInt, + NULL, &iTCPSessMax, STD_LOADABLE_MODULE_ID)); CHKiRet(omsdRegCFSLineHdlr((uchar *)"resetconfigvariables", 1, eCmdHdlrCustomHandler, resetConfigVariables, NULL, STD_LOADABLE_MODULE_ID)); ENDmodInit |