[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  02dcf05 heimdal: fixed -Werror=format error in com_err
      from  b93e6ef s3:smbd: add a optional_support helper variable to reply_tcon_and_X()

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 02dcf059149174beab3528d201fd36e313ba5ee5
Author: Andrew Tridgell <tridge at samba.org>
Date:   Thu Aug 2 14:59:37 2012 +1000

    heimdal: fixed -Werror=format error in com_err
    
    This needs to be merged upstream
    
    Autobuild-User(master): Andrew Tridgell <tridge at samba.org>
    Autobuild-Date(master): Thu Aug  2 08:59:24 CEST 2012 on sn-devel-104

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

Summary of changes:
 source4/heimdal/lib/com_err/error.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/heimdal/lib/com_err/error.c b/source4/heimdal/lib/com_err/error.c
index 6864e87..bf046da 100644
--- a/source4/heimdal/lib/com_err/error.c
+++ b/source4/heimdal/lib/com_err/error.c
@@ -65,7 +65,7 @@ com_right_r(struct et_list *list, long code, char *str, size_t len)
 	    const char *msg = p->table->msgs[code - p->table->base];
 #ifdef LIBINTL
 	    char domain[12 + 20];
-	    snprintf(domain, sizeof(domain), "heim_com_err%d", p->table->base);
+	    snprintf(domain, sizeof(domain), "heim_com_err%ld", p->table->base);
 #endif
 	    strlcpy(str, dgettext(domain, msg), len);
 	    return str;


-- 
Samba Shared Repository