diff options
| author | Andrew Tridgell <tridge@samba.org> | 2006-04-08 02:44:37 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:00:49 -0500 |
| commit | 14594c7b85e661aa8370103089fb817f2842d892 (patch) | |
| tree | 7e4478928b42ec67fd736b133055efb97783c18a /source4 | |
| parent | 12e8cea33ffdc2384cfa01ec401eb72a7093726c (diff) | |
| download | samba-14594c7b85e661aa8370103089fb817f2842d892.tar.gz samba-14594c7b85e661aa8370103089fb817f2842d892.tar.bz2 samba-14594c7b85e661aa8370103089fb817f2842d892.zip | |
r14977: more IBM checker fixes
(This used to be commit cd106509b664e9ca53419a62550b256b7e5bde3c)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/auth/credentials/credentials_files.c | 1 | ||||
| -rw-r--r-- | source4/lib/socket_wrapper/socket_wrapper.c | 6 |
2 files changed, 2 insertions, 5 deletions
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; |