Merge from HEAD - make Samba compile with -Wwrite-strings without additional

warnings.  (Adds a lot of const).

Andrew Bartlett

source/lib/util_sock.c

@@ -43,7 +43,7 @@ BOOL is_a_socket(int fd)
 enum SOCK_OPT_TYPES {OPT_BOOL,OPT_INT,OPT_ON};
 
 typedef struct smb_socket_option {
-	char *name;
+	const char *name;
 	int level;
 	int option;
 	int value;