diff options
author | Jeremy Allison <jra@samba.org> | 2008-12-30 18:24:39 -0800 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2008-12-30 18:24:39 -0800 |
commit | 9eab2bfaf1a2f07451d0d40e9dc3323b0573a143 (patch) | |
tree | ea64f10190d3561a42c6c602660a1b372cef2966 /source3 | |
parent | a66c034c8e3da47bf492efb631a737581cc4b0d6 (diff) | |
download | samba-9eab2bfaf1a2f07451d0d40e9dc3323b0573a143.tar.gz samba-9eab2bfaf1a2f07451d0d40e9dc3323b0573a143.tar.bz2 samba-9eab2bfaf1a2f07451d0d40e9dc3323b0573a143.zip |
Fix more "ignore return value" warnings from gcc 4.3.
Jeremy
Diffstat (limited to 'source3')
-rw-r--r-- | source3/libads/kerberos_verify.c | 31 | ||||
-rw-r--r-- | source3/web/cgi.c | 4 | ||||
-rw-r--r-- | source3/web/neg_lang.c | 3 | ||||
-rw-r--r-- | source3/web/swat.c | 8 |
4 files changed, 31 insertions, 15 deletions
diff --git a/source3/libads/kerberos_verify.c b/source3/libads/kerberos_verify.c index c667181642..de3fdeb9de 100644 --- a/source3/libads/kerberos_verify.c +++ b/source3/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/source3/web/cgi.c b/source3/web/cgi.c index 49e83717c3..40f9ee6966 100644 --- a/source3/web/cgi.c +++ b/source3/web/cgi.c @@ -498,7 +498,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/source3/web/neg_lang.c b/source3/web/neg_lang.c index 491ca9eedd..ae33dfc4ad 100644 --- a/source3/web/neg_lang.c +++ b/source3/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/source3/web/swat.c b/source3/web/swat.c index b729e3b241..060f024581 100644 --- a/source3/web/swat.c +++ b/source3/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); @@ -1253,8 +1255,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.")); |