From 14594c7b85e661aa8370103089fb817f2842d892 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 8 Apr 2006 02:44:37 +0000 Subject: r14977: more IBM checker fixes (This used to be commit cd106509b664e9ca53419a62550b256b7e5bde3c) --- source4/auth/credentials/credentials_files.c | 1 + source4/lib/socket_wrapper/socket_wrapper.c | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'source4') diff --git a/source4/auth/credentials/credentials_files.c b/source4/auth/credentials/credentials_files.c index 6afd5ea828..a268fe369e 100644 --- a/source4/auth/credentials/credentials_files.c +++ b/source4/auth/credentials/credentials_files.c @@ -52,6 +52,7 @@ BOOL cli_credentials_parse_password_fd(struct cli_credentials *credentials, *++p = '\0'; /* advance p, and null-terminate pass */ break; } + /* fall through */ case 0: if (p - pass) { *p = '\0'; /* null-terminate it, just in case... */ diff --git a/source4/lib/socket_wrapper/socket_wrapper.c b/source4/lib/socket_wrapper/socket_wrapper.c index f28343d6c4..6e6711834b 100644 --- a/source4/lib/socket_wrapper/socket_wrapper.c +++ b/source4/lib/socket_wrapper/socket_wrapper.c @@ -672,11 +672,7 @@ _PUBLIC_ int swrap_setsockopt(int s, int level, int optname, const void *o case AF_UNIX: return real_setsockopt(s, level, optname, optval, optlen); case AF_INET: - /* Silence some warnings */ -#ifdef TCP_NODELAY - if (optname == TCP_NODELAY) - return 0; -#endif + return 0; default: errno = ENOPROTOOPT; return -1; -- cgit