[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4756-g16bc030

[Jeremy Allison]

The branch, v3-3-test has been updated
       via  16bc03070785009b06ee7a1bfea0c54e23bab470 (commit)
      from  6d5b415c5a0d7e0b7aae2f20ee7989ca58ec2f81 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit 16bc03070785009b06ee7a1bfea0c54e23bab470
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Dec 30 17:52:08 2008 -0800

    Fix more "ignore return value" warnings from gcc 4.3.
    Jeremy

-----------------------------------------------------------------------

Summary of changes:
 source/libads/kerberos_verify.c |   31 ++++++++++++++++++++++---------
 source/smbd/server.c            |    2 ++
 source/web/cgi.c                |    4 +++-
 source/web/neg_lang.c           |    3 +--
 source/web/swat.c               |    8 +++++---
 5 files changed, 33 insertions(+), 15 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/libads/kerberos_verify.c b/source/libads/kerberos_verify.c
index c667181..de3fdeb 100644
--- a/source/libads/kerberos_verify.c
+++ b/source/libads/kerberos_verify.c
@@ -69,13 +69,27 @@ static bool ads_keytab_verify_ticket(krb5_context context,
 	my_fqdn[0] = '\0';
 	name_to_fqdn(my_fqdn, global_myname());
 
-	asprintf(&valid_princ_formats[0], "%s$@%s", my_name, lp_realm());
-	asprintf(&valid_princ_formats[1], "host/%s@%s", my_name, lp_realm());
-	asprintf(&valid_princ_formats[2], "host/%s@%s", my_fqdn, lp_realm());
-	asprintf(&valid_princ_formats[3], "host/%s.%s@%s", my_name, lp_realm(), lp_realm());
-	asprintf(&valid_princ_formats[4], "cifs/%s@%s", my_name, lp_realm());
-	asprintf(&valid_princ_formats[5], "cifs/%s@%s", my_fqdn, lp_realm());
-	asprintf(&valid_princ_formats[6], "cifs/%s.%s@%s", my_name, lp_realm(), lp_realm());
+	if (asprintf(&valid_princ_formats[0], "%s$@%s", my_name, lp_realm()) == -1) {
+		goto out;
+	}
+	if (asprintf(&valid_princ_formats[1], "host/%s@%s", my_name, lp_realm()) == -1) {
+		goto out;
+	}
+	if (asprintf(&valid_princ_formats[2], "host/%s@%s", my_fqdn, lp_realm()) == -1) {
+		goto out;
+	}
+	if (asprintf(&valid_princ_formats[3], "host/%s.%s@%s", my_name, lp_realm(), lp_realm()) == -1) {
+		goto out;
+	}
+	if (asprintf(&valid_princ_formats[4], "cifs/%s@%s", my_name, lp_realm()) == -1) {
+		goto out;
+	}
+	if (asprintf(&valid_princ_formats[5], "cifs/%s@%s", my_fqdn, lp_realm()) == -1) {
+		goto out;
+	}
+	if (asprintf(&valid_princ_formats[6], "cifs/%s.%s@%s", my_name, lp_realm(), lp_realm()) == -1) {
+		goto out;
+	}
 
 	ZERO_STRUCT(kt_entry);
 	ZERO_STRUCT(kt_cursor);
@@ -375,8 +389,7 @@ NTSTATUS ads_verify_ticket(TALLOC_CTX *mem_ctx,
 		krb5_auth_con_setflags( context, auth_context, flags );
 	}
 
-	asprintf(&host_princ_s, "%s$", global_myname());
-	if (!host_princ_s) {
+	if (asprintf(&host_princ_s, "%s$", global_myname()) == -1) {
 		goto out;
 	}
 
diff --git a/source/smbd/server.c b/source/smbd/server.c
index c04ae6f..4f47517 100644
--- a/source/smbd/server.c
+++ b/source/smbd/server.c
@@ -59,6 +59,7 @@ int get_client_fd(void)
 	return server_fd;
 }
 
+#ifdef CLUSTER_SUPPORT
 static int client_get_tcp_info(struct sockaddr_storage *server,
 			       struct sockaddr_storage *client)
 {
@@ -76,6 +77,7 @@ static int client_get_tcp_info(struct sockaddr_storage *server,
 	}
 	return 0;
 }
+#endif
 
 struct event_context *smbd_event_context(void)
 {
diff --git a/source/web/cgi.c b/source/web/cgi.c
index bcb4ccd..015f9d1 100644
--- a/source/web/cgi.c
+++ b/source/web/cgi.c
@@ -497,7 +497,9 @@ static void cgi_download(char *file)
 
 	printf("Content-Length: %d\r\n\r\n", (int)st.st_size);
 	while ((l=read(fd,buf,sizeof(buf)))>0) {
-		fwrite(buf, 1, l, stdout);
+		if (fwrite(buf, 1, l, stdout) != l) {
+			break;
+		}
 	}
 	close(fd);
 	exit(0);
diff --git a/source/web/neg_lang.c b/source/web/neg_lang.c
index 8241100..f46eb0d 100644
--- a/source/web/neg_lang.c
+++ b/source/web/neg_lang.c
@@ -32,8 +32,7 @@ int web_open(const char *fname, int flags, mode_t mode)
 	char *lang = lang_tdb_current();
 	int fd;
 	if (lang) {
-		asprintf(&p, "lang/%s/%s", lang, fname);
-		if (p) {
+		if (asprintf(&p, "lang/%s/%s", lang, fname) != -1) {
 			fd = sys_open(p, flags, mode);
 			free(p);
 			if (fd != -1) {
diff --git a/source/web/swat.c b/source/web/swat.c
index 1502c5b..c5bafb1 100644
--- a/source/web/swat.c
+++ b/source/web/swat.c
@@ -156,7 +156,9 @@ static int include_html(const char *fname)
 	}
 
 	while ((ret = read(fd, buf, sizeof(buf))) > 0) {
-		write(1, buf, ret);
+		if (write(1, buf, ret) == -1) {
+			break;
+		}
 	}
 
 	close(fd);
@@ -1252,8 +1254,8 @@ static void printers_page(void)
         printf("<H2>%s</H2>\n", _("Printer Parameters"));
  
         printf("<H3>%s</H3>\n", _("Important Note:"));
-        printf(_("Printer names marked with [*] in the Choose Printer drop-down box "));
-        printf(_("are autoloaded printers from "));
+        printf("%s",_("Printer names marked with [*] in the Choose Printer drop-down box "));
+        printf("%s",_("are autoloaded printers from "));
         printf("<A HREF=\"/swat/help/smb.conf.5.html#printcapname\" target=\"docs\">%s</A>\n", _("Printcap Name"));
         printf("%s\n", _("Attempting to delete these printers from SWAT will have no effect."));
 


-- 
Samba Shared Repository