svn commit: samba r14977 - in branches/SAMBA_4_0/source: auth/credentials lib/socket_wrapper

[tridge at samba.org]

Author: tridge
Date: 2006-04-08 02:44:37 +0000 (Sat, 08 Apr 2006)
New Revision: 14977

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14977

Log:

more IBM checker fixes

Modified:
   branches/SAMBA_4_0/source/auth/credentials/credentials_files.c
   branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.c


Changeset:
Modified: branches/SAMBA_4_0/source/auth/credentials/credentials_files.c
===================================================================
--- branches/SAMBA_4_0/source/auth/credentials/credentials_files.c	2006-04-08 02:40:15 UTC (rev 14976)
+++ branches/SAMBA_4_0/source/auth/credentials/credentials_files.c	2006-04-08 02:44:37 UTC (rev 14977)
@@ -52,6 +52,7 @@
 				*++p = '\0'; /* advance p, and null-terminate pass */
 				break;
 			}
+			/* fall through */
 		case 0:
 			if (p - pass) {
 				*p = '\0'; /* null-terminate it, just in case... */

Modified: branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.c
===================================================================
--- branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.c	2006-04-08 02:40:15 UTC (rev 14976)
+++ branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.c	2006-04-08 02:44:37 UTC (rev 14977)
@@ -672,11 +672,7 @@
 	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;