[SCM] Samba Shared Repository - branch v3-4-test updated

Karolin Seeger kseeger at samba.org
Tue Aug 9 05:27:08 MDT 2011


The branch, v3-4-test has been updated
       via  b941edf s3/swat: use strlcat instead of strncat to fix build on old Linux distros
      from  ac5d8c0 s3:web/swat: use strtoll() instead of atoi/atol/atoll

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


- Log -----------------------------------------------------------------
commit b941edf9c20bd6a92aec2a62be5b830db1194ce8
Author: Björn Jacke <bj at sernet.de>
Date:   Thu Aug 4 16:25:08 2011 +0200

    s3/swat: use strlcat instead of strncat to fix build on old Linux distros
    
    SLES 9's glibc for example had weird macros where the use of strncat resulted
    in the use of strcat which we don't allow.
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User: Björn Jacke <bj at sernet.de>
    Autobuild-Date: Thu Aug  4 17:50:24 CEST 2011 on sn-devel-104
    (cherry picked from commit d3b4d75364210e2d2a4a1cd806f28b0021f22909)
    
    Fix bug #8362 (build issue on old glibc systems).
    (cherry picked from commit 87fa72a5202fe3780d4a61289bf755027cd078f4)
    (cherry picked from commit 552ccc6588b0744ae9b3731b1406749baea03d5a)

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

Summary of changes:
 source3/web/swat.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/web/swat.c b/source3/web/swat.c
index 85bc6bc..bfa003e 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -168,7 +168,7 @@ void get_xsrf_token(const char *username, const char *pass,
 		char tmp[3];
 
 		snprintf(tmp, sizeof(tmp), "%02x", token[i]);
-		strncat(token_str, tmp, sizeof(tmp));
+		strlcat(token_str, tmp, sizeof(tmp));
 	}
 }
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list