[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  e8e3a68 Fix the build: net_serverid.c has 3 wrong format strings for 64bit vars
      from  0796a17 s3:lib/charcnv fix typo in pull_ascii_base_talloc()

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


- Log -----------------------------------------------------------------
commit e8e3a68729074c9dafb9a41df0ffa3a49c260772
Author: Guenter Kukkukk <kukks at samba.org>
Date:   Tue Mar 5 20:08:49 2013 +0100

    Fix the build: net_serverid.c has 3 wrong format strings for 64bit vars
    
    On two of my opensuse machines i get 3 errors, e.g.:
    ../source3/utils/net_serverid.c:333:3: error: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 5 has type ‘uint64_t’ [-Werror=format]
    cc1: some warnings being treated as errors
    
    Signed-off-by: Guenter Kukkukk <kukks at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Tue Mar  5 22:49:03 CET 2013 on sn-devel-104

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

Summary of changes:
 source3/utils/net_serverid.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/utils/net_serverid.c b/source3/utils/net_serverid.c
index 90448c1..cf2c33f 100644
--- a/source3/utils/net_serverid.c
+++ b/source3/utils/net_serverid.c
@@ -195,8 +195,9 @@ static int wipedbs_traverse_sessions(struct smbXsrv_session_global0 *session,
 	rec->val = tdb_data_talloc_copy(rec, tmp);
 
 	rec->desc = talloc_asprintf(
-		rec, "session[global: %u wire: %lu]",
-		session->session_global_id, session->session_wire_id);
+		rec, "session[global: %u wire: %llu]",
+		session->session_global_id,
+		(long long unsigned)session->session_wire_id);
 
 	if ((rec->key.dptr == NULL) || (rec->val.dptr == NULL) ||
 	    (rec->desc == NULL))
@@ -328,9 +329,10 @@ static int wipedbs_traverse_open(struct smbXsrv_open_global0 *open,
 	rec->val = tdb_data_talloc_copy(rec, tmp);
 
 	rec->desc = talloc_asprintf(
-		rec, "open[global: %u persistent: %lu volatile: %lu]",
-		open->open_global_id, open->open_persistent_id,
-		open->open_volatile_id);
+		rec, "open[global: %u persistent: %llu volatile: %llu]",
+		open->open_global_id,
+		(long long unsigned)open->open_persistent_id,
+		(long long unsigned)open->open_volatile_id);
 
 	if ((rec->key.dptr == NULL) || (rec->val.dptr == NULL) ||
 	    (rec->desc == NULL))


-- 
Samba Shared Repository