r14977: more IBM checker fixes

(This used to be commit cd106509b664e9ca53419a62550b256b7e5bde3c)

diff --git a/source4/auth/credentials/credentials_files.c b/source4/auth/credentials/credentials_files.c
index 6afd5ea828fb80e50809a68eafef6ef1f83587ce..a268fe369edd4b7b39c6f0e7d15e7be007189154 100644 (file)
--- 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 f28343d6c4657a4bb709494d3902dffbd8253b65..6e6711834be7d68243c1834ebd7825fd8cca7e9c 100644 (file)
--- 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;