diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-12-04 12:11:58 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-12-04 12:11:58 +0100 |
commit | 2dd15ac57327603307c0ae2f5f96fd1392d6f897 (patch) | |
tree | ed15becd6ebc0d6ce3e5ee5d38d7dc211ce5785e /runtime/net.c | |
parent | 56f338f1b4f5f6c428f7aa3fa3f82a13e63e49e7 (diff) | |
parent | d74b4fef35e8a2c3a58fe66720840ae2ee77a02d (diff) | |
download | rsyslog-2dd15ac57327603307c0ae2f5f96fd1392d6f897.tar.gz rsyslog-2dd15ac57327603307c0ae2f5f96fd1392d6f897.tar.xz rsyslog-2dd15ac57327603307c0ae2f5f96fd1392d6f897.zip |
Merge branch 'v3-stable' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'runtime/net.c')
-rw-r--r-- | runtime/net.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/runtime/net.c b/runtime/net.c index 096e0a1d..1472b4db 100644 --- a/runtime/net.c +++ b/runtime/net.c @@ -104,8 +104,10 @@ setAllowRoot(struct AllowedSenders **ppAllowRoot, uchar *pszType) *ppAllowRoot = pAllowedSenders_UDP; else if(!strcmp((char*)pszType, "TCP")) *ppAllowRoot = pAllowedSenders_TCP; +#ifdef USE_GSSAPI else if(!strcmp((char*)pszType, "GSS")) *ppAllowRoot = pAllowedSenders_GSS; +#endif else { dbgprintf("program error: invalid allowed sender ID '%s', denying...\n", pszType); ABORT_FINALIZE(RS_RET_CODE_ERR); /* everything is invalid for an invalid type */ |