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

[Jeremy Allison]

The branch, v3-3-test has been updated
       via  fc04faf9668bf0176ffd8d5c20e65aa83d63021b (commit)
      from  3643a1179df42d47c2913c7d5c6a4ec8d8b8eb9d (commit)

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


- Log -----------------------------------------------------------------
commit fc04faf9668bf0176ffd8d5c20e65aa83d63021b
Author: Jeremy Allison <jer...@jeremy-desktop.(none)>
Date:   Tue Dec 23 09:49:47 2008 -0800

    Fix another "format not a string literal and no format arguments" warning.
    Jeremy

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

Summary of changes:
 source/libnet/libnet_samsync_ldif.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/libnet/libnet_samsync_ldif.c 
b/source/libnet/libnet_samsync_ldif.c
index c72eadf..3068f8d 100644
--- a/source/libnet/libnet_samsync_ldif.c
+++ b/source/libnet/libnet_samsync_ldif.c
@@ -586,7 +586,7 @@ static NTSTATUS fetch_account_info_to_ldif(TALLOC_CTX 
*mem_ctx,
        uchar zero_buf[16];
        uint32 rid = 0, group_rid = 0, gidNumber = 0;
        time_t unix_time;
-       int i;
+       int i, ret;
 
        memset(zero_buf, '\0', sizeof(zero_buf));
 
@@ -660,7 +660,10 @@ static NTSTATUS fetch_account_info_to_ldif(TALLOC_CTX 
*mem_ctx,
                return NT_STATUS_UNSUCCESSFUL;
        }
        gidNumber = groupmap[i].gidNumber;
-       snprintf(sambaSID, sizeof(sambaSID), groupmap[i].sambaSID);
+       ret = snprintf(sambaSID, sizeof(sambaSID), "%s", groupmap[i].sambaSID);
+       if (ret < 0 || ret == sizeof(sambaSID)) {
+               return NT_STATUS_UNSUCCESSFUL;
+       }
 
        /* Set up sambaAcctFlags */
        flags = pdb_encode_acct_ctrl(r->acct_flags,


-- 
Samba Shared Repository